Closed
Bug 443351
Opened 16 years ago
Closed 16 years ago
Move all of Thunderbird's unofficial/nightly branding items into mail/branding/nightly
Categories
(Thunderbird :: Build Config, defect, P3)
Thunderbird
Build Config
Tracking
(Not tracked)
RESOLVED
FIXED
Thunderbird 3
People
(Reporter: standard8, Assigned: standard8)
References
Details
Attachments
(5 files)
6.23 KB,
patch
|
mkmelin
:
review+
|
Details | Diff | Splinter Review |
627 bytes,
patch
|
Details | Diff | Splinter Review | |
9.38 KB,
patch
|
mkmelin
:
review+
|
Details | Diff | Splinter Review |
3.98 KB,
patch
|
mkmelin
:
review+
|
Details | Diff | Splinter Review |
2.38 KB,
patch
|
mkmelin
:
review+
|
Details | Diff | Splinter Review |
Currently, all of Thunderbird's unofficial branding is spread around mail/ I'd like to centralise all of that (or at least as much as possible) into the mail/branding/nightly directory that I just created. I'll be doing this after the switch to hg as that will mean we can preserve history etc a lot easier.
Assignee | ||
Updated•16 years ago
|
Priority: -- → P3
Updated•16 years ago
|
Summary: Move all of Thunderbird's unoffiical/nightly branding items into mail/branding/nightly → Move all of Thunderbird's unofficial/nightly branding items into mail/branding/nightly
Assignee | ||
Comment 1•16 years ago
|
||
Note to self: tidy up MOZ_BRANDING_DIRECTORY defines once this is implemented.
Assignee | ||
Comment 2•16 years ago
|
||
Part 1 of this reorganisation. Does some simple changes first (when I refer to nightly I mean mail/branding/nightly): - Moves thunderbird-branding.js to nightly - Moves the content for unofficial branding to nightly - Renames both about-thunderbird.png to about.png. This is what we put it into the jar.mn so I see no reason to call it anything different in the repository - Moves processing of the official-branding content files from other-licenses/branding/thunderbird/content to other-licenses/branding/thunderbird. This means we don't need to go into another directory. I didn't want to do it for the locales stuff because that needs to go into another/separate directory so that we can have it just do the locale repackaging when we're doing l10n builds. - Drops other-licenses/branding/thunderbird/content/contents.rdf - old file no longer required.
Attachment #330919 -
Flags: review?(mkmelin+mozilla)
Comment 3•16 years ago
|
||
Comment on attachment 330919 [details] [diff] [review] [checked in] Part 1 - mainly content files r=mkmelin
Attachment #330919 -
Flags: review?(mkmelin+mozilla) → review+
Updated•16 years ago
|
Target Milestone: --- → Thunderbird 3
Assignee | ||
Updated•16 years ago
|
Attachment #330919 -
Attachment description: Part 1 - mainly content files → [checked in] Part 1 - mainly content files
Assignee | ||
Comment 4•16 years ago
|
||
I missed a adding a new jar.mn in the first patch of this bug, I've checked it in as it was causing missing images.
Assignee | ||
Comment 5•16 years ago
|
||
(In reply to comment #2) > Created an attachment (id=330919) [details] > Part 1 - mainly content files changeset id: 9:cfc7ac2a4400 (In reply to comment #4) > Created an attachment (id=331405) [details] > Missing jar.mn file from part 1 changeset id: 22:cb21c611b57c
Assignee | ||
Updated•16 years ago
|
Attachment #331405 -
Attachment description: Missing jar.mn file from part 1 → [checked in] Missing jar.mn file from part 1
Assignee | ||
Comment 6•16 years ago
|
||
Assignee | ||
Comment 7•16 years ago
|
||
Comment on attachment 334868 [details] [diff] [review] [checked in] Part 2 - icons images and more. Requesting review, I've not found anyone to test this on windows for me yet. Though hopefully it should just work. The main aim of this patch is to move the icons and other branding resources in mail/app to the nightly branding directory. The secondary aim is to synchronise the way the two branding Makefile.in files are set up to copy the icon files.
Attachment #334868 -
Flags: review?(mkmelin+mozilla)
Comment 8•16 years ago
|
||
Comment on attachment 334868 [details] [diff] [review] [checked in] Part 2 - icons images and more. Looks good; r=mkmelin
Attachment #334868 -
Flags: review?(mkmelin+mozilla) → review+
Assignee | ||
Comment 9•16 years ago
|
||
Comment on attachment 334868 [details] [diff] [review] [checked in] Part 2 - icons images and more. Checked in, changeset id: 170:2854814076ae
Attachment #334868 -
Attachment description: Part 2 - icons images and more. → [checked in] Part 2 - icons images and more.
Comment 10•16 years ago
|
||
Building Thunderbird with --enable-official-branding on Linux fails now with make[4]: Betrete Verzeichnis '/home/ilja/mozilla/comm-central/tb-build/other-licenses/branding/thunderbird' /usr/bin/perl /home/ilja/mozilla/comm-central/src/mozilla/build/autoconf/make-makefile -t /home/ilja/mozilla/comm-central/src -d ../../.. locales/Makefile creating other-licenses/branding/thunderbird/locales/Makefile make[5]: Betrete Verzeichnis '/home/ilja/mozilla/comm-central/tb-build/other-licenses/branding/thunderbird/locales' make[5]: Verlasse Verzeichnis '/home/ilja/mozilla/comm-central/tb-build/other-licenses/branding/thunderbird/locales' /home/ilja/mozilla/comm-central/tb-build/mozilla/config/nsinstall -D ../../../mozilla/dist/branding cp /home/ilja/mozilla/comm-central/src/other-licenses/branding/thunderbird/mozicon16.xpm ../../../mozilla/dist/branding/mozicon16.xpm cp /home/ilja/mozilla/comm-central/src/other-licenses/branding/thunderbird/mozicon50.xpm ../../../mozilla/dist/branding/mozicon50.xpm cp /home/ilja/mozilla/comm-central/src/other-licenses/branding/thunderbird/default.xpm ../../../mozilla/dist/branding/default.xpm /home/ilja/mozilla/comm-central/tb-build/mozilla/config/nsinstall -D ../../../mozilla/dist/mail/app/icons /home/ilja/mozilla/comm-central/tb-build/mozilla/config/nsinstall -D ../../../mozilla/dist/mail/app/icons/gtk cp /home/ilja/mozilla/comm-central/src/other-licenses/branding/thunderbird/mozicon50.xpm ../../../mail/app/icons/gtk/messengerWindow.xpm cp: reguläre Datei „../../../mail/app/icons/gtk/messengerWindow.xpm“ kann nicht angelegt werden: No such file or directory make[4]: *** [export] Fehler 1
Assignee | ||
Comment 11•16 years ago
|
||
(In reply to comment #10) > Building Thunderbird with --enable-official-branding on Linux fails now with Thanks for commenting. I'd prefer not to back it out just yet, especially as it doesn't hurt most of the trunk development. I should be able to come up with a fix for it tomorrow, I think I know how I want to fix it.
Assignee | ||
Comment 12•16 years ago
|
||
This patch will fix the breakage in the official branding. Sorry for the delay in posting it. In this patch I'm moving the unofficial branded icon for the main mail window into the mail/branding/nightly directory, and then we copy it via the appropriate makefile (unofficial/official) into the $(DIST)/branding directory. The mail/app/Makefile.in then comes along at the end and installs it into the right place along with the rest of the window icons (which aren't branded). This also provides us with more consistency as to where our official/unofficial branded files are.
Attachment #336477 -
Flags: review?(mkmelin+mozilla)
Comment 13•16 years ago
|
||
Comment on attachment 336477 [details] [diff] [review] [checked in] Fix official branding breakage Looks reasonable. r=me
Attachment #336477 -
Flags: review?(mkmelin+mozilla) → review+
Assignee | ||
Comment 14•16 years ago
|
||
Comment on attachment 336477 [details] [diff] [review] [checked in] Fix official branding breakage Checked in, changeset id: 249:78b3d6c649f7
Attachment #336477 -
Attachment description: Fix official branding breakage → [checked in] Fix official branding breakage
Assignee | ||
Comment 15•16 years ago
|
||
Some more tidy up. Now we've got everything in just two directories, we can simplify some ifdefs. I'm not sure if installer repackaging on windows for l10n is currently broken with unofficial branding, but if it is, then this patch will fix it by correcting the directory we export from. At some point I'd like to have MOZ_BRANDING_DIRECTORY revert to the mail/nightly/branding directory automatically, but that's not going to happen until after we get Sunbird into hg (as they will need similar changes). The symlink ifdef should go away once bug 432840 is fixed.
Attachment #336650 -
Flags: review?(mkmelin+mozilla)
Updated•16 years ago
|
Attachment #336650 -
Flags: review?(mkmelin+mozilla) → review+
Assignee | ||
Comment 16•16 years ago
|
||
Comment on attachment 336650 [details] [diff] [review] [checked in] Tidy mail/locales/Makefile.in and fix installer repacking for unofficial branding Checked in, changeset id: 255:bd65ac0df8c2
Attachment #336650 -
Attachment description: Tidy mail/locales/Makefile.in and fix installer repacking for unofficial branding → [checked in] Tidy mail/locales/Makefile.in and fix installer repacking for unofficial branding
Assignee | ||
Comment 17•16 years ago
|
||
now that bug 432840 is fixed, there is not really any more we can do on this bug. I'd like to redo how the configure options work, but for that we need to redo Sunbird's structure, which is best done once they have moved over to hg. So I'm going to call this bug fixed. I probably won't raise bugs for Sunbird until later/when I'm ready.
Status: NEW → RESOLVED
Closed: 16 years ago
Resolution: --- → FIXED
You need to log in
before you can comment on or make changes to this bug.
Description
•