1241203 - Port Bug 1240660 to c-c [Remove support for "+" prefixes in jar manifests]

Status: RESOLVED FIXED

(Thunderbird :: Build Config, defect)

Description

[Richard Marti (:Paenglab)]

Bug 1240660 removed the "+" prefix in jar.mn files. Not fixing this busts the builds.

This was generated with the following command from bug 1240660:
find -name jar.mn | xargs grep -l '^ *\*\?+' | xargs sed -i 's/^\( *\*\?\)+/\1 /'

Comment 1

[aleth [:aleth]]

According to aceman, there is nothing to do here.

Comment 2

[Richard Marti (:Paenglab)]

Attachment: jar.mn.patch

It also affects the im directory, so you are the best to review it.

Comment 3

[Richard Marti (:Paenglab)]

My build stopped at mail/components/compose/jar.mn

Comment 4

[aleth [:aleth]]

Comment on attachment 8710045 [details] [diff] [review]
jar.mn.patch

Review of attachment 8710045 [details] [diff] [review]:
-----------------------------------------------------------------

Thanks!

Comment 5

[aleth [:aleth]]

https://hg.mozilla.org/comm-central/rev/b5723697d212da88c9d358d46f1814e39800fd0f
Bug 1241203 - Port Bug 1240660 to c-c [Remove support for "+" prefixes in jar manifests]. r=aleth

Comment 6

[:aceman]

I do not understand this. Yes, I said I see no + signs in any of our jar.mn. That is still true. I do not see them even in the file that are patched here. And my tree is from before the patch here. What is going on? Is this platform dependent in any way?

Comment 7

[Richard Marti (:Paenglab)]

This isn't platform dependent. On my Kubuntu I see it too. Also dxr sees it: https://dxr.mozilla.org/comm-central/source/mail/components/compose/jar.mn#17 in front of the line.

Comment 8

[Justin Wood (:Callek)]

On a *just* cloned c-c I see no entries, but my cloned-a-while-ago comm-beta does:

callek@Centaurus:~/mozilla/hg$ grep "+" `find comm-central -name jar.mn `
callek@Centaurus:~/mozilla/hg$ grep "+" `find comm-beta -name jar.mn `
comm-beta/mail/base/jar.mn:*+  content/messenger/license.html                  (/mozilla/toolkit/content/license.html)
comm-beta/mail/components/compose/jar.mn:+   content/editor/editorOverlay.xul                               (content/editorOverlay.xul) 
comm-beta/im/content/jar.mn:*+	content/instantbird/license.html			(/mozilla/toolkit/content/license.html)

Comment 9

[Richard Marti (:Paenglab)]

(In reply to Justin Wood (:Callek) from comment #8)
> On a *just* cloned c-c I see no entries, but my cloned-a-while-ago comm-beta
> does

The patch already landed 1 hour ago.

Comment 10

[:aceman]

I tried to update now and get merge conflicts with this patch. My tree must be different to the official version. That is fishy.

$ hg pull
pulling from http://hg.mozilla.org/comm-central/
searching for changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 18 changes to 18 files
(run 'hg update' to get a working copy)

$ hg update
merging im/content/jar.mn
warning: conflicts during merge.
merging im/content/jar.mn incomplete! (edit conflicts, then use 'hg resolve --mark')
merging mail/components/compose/jar.mn
warning: conflicts during merge.
merging mail/components/compose/jar.mn incomplete! (edit conflicts, then use 'hg resolve --mark')
16 files updated, 0 files merged, 0 files removed, 2 files unresolved
use 'hg resolve' to retry unresolved file merges