1230991 - Remove duplication of theme files in xpi

Status: RESOLVED FIXED

(Calendar :: General, defect)

Description

[Richard Marti (:Paenglab)]

MakeMyDay gave me a list from build/mozilla/toolkit/mozapps/installer/find-dupes.py with duplicate files in all three platform directories.

Comment 1

[Richard Marti (:Paenglab)]

Attachment: fileMove.patch

This patch moves the duplicate files to the shared directory in XPI. I touched only the css files which are the same on all three platforms. Files which are the same in only two platforms are not touched because mostly it is because OS X has different styles.

I also leaved the PNG untouched because they are for the invitation and will probably be in near future removed or changed with the itip refresh.

I also removed calendar/resources/jar.mn because this look never to be touched. I tested this with changing to nonexistant files and never got a error. I tried the same with the moz.build file at the same position and it seems it's also never used. I leaved it there because it's a file for the new build system and I don't know enough if this can really be deleted. If it's used it seems for me not up to date because Linux is not respected in this file.

Or should I remove also this file?

Comment 2

[[:MakeMyDay]]

Comment on attachment 8696511 [details] [diff] [review]
fileMove.patch

Thanks for digging into this.

f+ only, because I'm not sure about removing calendar/resources/jar.mn. Did you build with that patch?

Philipp, are there any objections to remove the jar.mn?

Comment 3

[Philipp Kewisch [:Fallen] [:📆][:🧩]]

Comment on attachment 8696511 [details] [diff] [review]
fileMove.patch

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

Nope, fine with me. r=philipp

Comment 4

[Richard Marti (:Paenglab)]

Attachment: fileMove.patch

Updated the reviewer in commit message

Philipp, do we want this also in 4.7 for ESR?

And what about the calendar/resources/moz.build, does this need any cleanup? The DEFINES['THEME'] is missing Linux but it seems still working on Linux. Should this be removed, because not used,  or Linux added?

I set checkin-needed. moz.build can be fixed in a new bug.

Comment 5

[Philipp Kewisch [:Fallen] [:📆][:🧩]]

Comment on attachment 8700284 [details] [diff] [review]
fileMove.patch

This is not a user visible change, just some backend cleanup, right? In that case I don't think we need to backport this.

Comment 6

[aleth [:aleth]]

https://hg.mozilla.org/comm-central/rev/7e2cd0643242976e131b495c618be921980287bf
Bug 1230991 - Move common files from platform directories to common. r=Fallen

Comment 7

[Philipp Kewisch [:Fallen] [:📆][:🧩]]

Backported to releases/comm-aurora changeset 9f6e321843df