Don't package aero files for non-Windows

RESOLVED FIXED

Status

()

Firefox
Theme
RESOLVED FIXED
10 years ago
4 years ago

People

(Reporter: Peter Weilbacher, Assigned: Peter Weilbacher)

Tracking

Trunk
x86
OS/2
Points:
---

Firefox Tracking Flags

(Not tracked)

Details

Attachments

(1 attachment)

(Assignee)

Description

10 years ago
The gnomestripe/pmstripe patch of bug 419319 already fixed this partly, but at least the files from browser/themes/winstripe/browser/jar.mn are unconditionally packaged into classic.jar. The aero lines should be moved to the bottom and bracketed with XP_WIN as in the jar.mn's below /toolkit/themes/winstripe/.
(Assignee)

Comment 1

10 years ago
Created attachment 309296 [details] [diff] [review]
this seems to work

OK, this seems to do what I want it to. Although I wonder why Reed didn't do that in bug 419319 where he did the same for the file in toolkit/...
Assignee: nobody → mozilla
Status: NEW → ASSIGNED
Attachment #309296 - Flags: review?(gavin.sharp)
Attachment #309296 - Flags: review?(gavin.sharp) → review+
We didn't do it because gnomestripe is a separate theme completely under browser/ instead of being an override on top of it. It didn't make sense to make it more complicated when gnomestripe wasn't even caring about it.
(Assignee)

Comment 3

10 years ago
Thanks Reed, I didn't realize that. As we don't override the stuff in browser/themes on OS/2 we need that for our packages.
(Assignee)

Updated

10 years ago
Attachment #309296 - Flags: approval1.9?
Comment on attachment 309296 [details] [diff] [review]
this seems to work

a1.9=beltzner
Attachment #309296 - Flags: approval1.9? → approval1.9+
(Assignee)

Comment 5

10 years ago
Checked in to trunk.
Status: ASSIGNED → RESOLVED
Last Resolved: 10 years ago
Resolution: --- → FIXED
(Assignee)

Comment 6

10 years ago
Hmm, backed this out again. It caused errors like this on the Windows tinderboxes:

make[6]: Entering directory `/e/builds/tinderbox/Fx-Trunk-Memtest/WINNT_5.2_Depend/mozilla/obj-fx-trunk/browser/themes/winstripe'
make[7]: Entering directory `/e/builds/tinderbox/Fx-Trunk-Memtest/WINNT_5.2_Depend/mozilla/obj-fx-trunk/browser/themes/winstripe/browser'
+++ making chrome /e/builds/tinderbox/Fx-Trunk-Memtest/WINNT_5.2_Depend/mozilla/obj-fx-trunk/browser/themes/winstripe/browser  => ../../../../dist/bin/chrome/classic.jar
Use of uninitialized value in substr at /usr/lib/perl5/5.6.1/File/Basename.pm line 171, <STDIN> line 153.
Use of uninitialized value in pattern match (m//) at /usr/lib/perl5/5.6.1/File/Basename.pm line 193, <STDIN> line 153.
error: can't open : Bad file number at /e/builds/tinderbox/Fx-Trunk-Memtest/WINNT_5.2_Depend/mozilla/config/make-jars.pl line 366, <STDIN> line 153.
+++ updating chrome 
make[7]: *** [libs] Error 9
make[7]: Leaving directory `/e/builds/tinderbox/Fx-Trunk-Memtest/WINNT_5.2_Depend/mozilla/obj-fx-trunk/browser/themes/winstripe/browser'

No idea how to solve that...
Status: RESOLVED → REOPENED
Resolution: FIXED → ---

Comment 7

10 years ago
Comment on attachment 309296 [details] [diff] [review]
this seems to work

>         icon.png
>         preview.png
>+#ifdef XP_WIN
>+classic.jar:
If you want to switch .jar file (which you don't) then you need a blank line.
(Assignee)

Comment 8

10 years ago
Ah yes, that would be the difference against the other patch from attachment 306823 [details] [diff] [review]. I think even though we don't want to switch the JAR file we need the classic.jar line because we need the % skin line afterwards. Will try more local testing (as far as I can on OS/2).
(Assignee)

Comment 9

10 years ago
OK, the trick with the empty line works, thanks for the hint Neil. I can't verify here if chrome registration of the skin works, so I left in the classic.jar line when I relanded this just now.
(Assignee)

Comment 10

10 years ago
OK, at least qm-win2k3-01 has cycled and they are still green, so this seems really fixed this time. :-)
Status: REOPENED → RESOLVED
Last Resolved: 10 years ago10 years ago
Resolution: --- → FIXED
You need to log in before you can comment on or make changes to this bug.