Closed Bug 524885 Opened 10 years ago Closed 10 years ago

Get the deb installer to use branding

Categories

(Firefox for Android Graveyard :: General, defect)

ARM
Maemo
defect
Not set

Tracking

(Not tracked)

VERIFIED FIXED
fennec1.0b5

People

(Reporter: mfinkle, Assigned: mfinkle)

Details

Attachments

(1 file, 2 obsolete files)

Attached patch patch (obsolete) — Splinter Review
Fennec has nightly and official branding resources. Some of the deb package creation uses resources in the installer folder.

This patch:
* Adds official branding resources
* Adds a uuencoded file for nightly and official branding
* Removes an unused icon_base64.in resource
Attachment #408775 - Flags: review?(bugmail)
Comment on attachment 408775 [details] [diff] [review]
patch


>+	cat $(DIST)/branding/fennec_maemo_icon26.txt >> debian/control

this adds a dependency that the icon is at the end of the control file, which isn't horrible but we can do the same thing with a processor replacement

you can do this with something along the lines of:
BASE64_ICON=`cat $(DIST)/branding/fennec_maemo_icon26.txt`



>-deb: debian/control debian/$(MOZ_APP_NAME).service debian/$(MOZ_APP_NAME).links debian/$(MOZ_APP_NAME).desktop \
>-	debian/$(MOZ_APP_NAME)_scalable.png debian/$(MOZ_APP_NAME)_26x26.png debian/$(MOZ_APP_NAME)_40x40.png
>+deb: debian/control debian/$(MOZ_APP_NAME).service debian/$(MOZ_APP_NAME).links debian/$(MOZ_APP_NAME).desktop

let's keep the dependency on the icon files and just change their paths
Attachment #408775 - Flags: review?(bugmail) → review-
Attached patch patch 2 (obsolete) — Splinter Review
With the two review changes:
* dependencies are back, but pointing to the dist/branding folder
* using the preprocessor to insert the icon data
Assignee: nobody → mark.finkle
Attachment #408775 - Attachment is obsolete: true
Attachment #408783 - Flags: review?(bugmail)
Attached patch patch 3Splinter Review
Uses #includesubst mechanism
Attachment #408783 - Attachment is obsolete: true
Attachment #408788 - Flags: review?(bugmail)
Attachment #408783 - Flags: review?(bugmail)
Attachment #408788 - Flags: review?(bugmail) → review+
pushed:
https://hg.mozilla.org/mobile-browser/rev/62d95db0e0d5
Status: NEW → RESOLVED
Closed: 10 years ago
Resolution: --- → FIXED
Target Milestone: --- → B5
verified FIXED on builds:
Mozilla/5.0 (X11; U; Linux armv7l; Nokia N900; en-US; rv:1.9.2b2pre) Gecko/20091102 Namoroka/3.6b2pre Fennec/1.0b5

and

Mozilla/5.0 (X11; U; Linux armv6l; Nokia N8xx; en-US; rv:1.9.2b2pre) Gecko/20091102 Namoroka/3.6b2pre Fennec/1.0b5
Status: RESOLVED → VERIFIED
Flags: in-litmus?
LItmus testcase https://litmus.mozilla.org/show_test.cgi?id=7595 takes care of branding on nightly builds which should cover regression testing for the time being until branding gets finalized for future major releases.
Flags: in-litmus? → in-litmus+
Component: Linux/Maemo → General
OS: Linux → Linux (embedded)
QA Contact: maemo-linux → general
Hardware: x86 → ARM
You need to log in before you can comment on or make changes to this bug.