542696 - Consolidate xulrunner and fennec debs

Status: VERIFIED FIXED

(Firefox for Android Graveyard :: General, defect)

Description

[Aki Sasaki [:aki] (he/him)]

We've been talking about this for a while now.
Tracking here.

Comment 2

[Brad Lassey [:blassey] (use needinfo?)]

I filed bug 543060 to not require fennec be built on top of xulrunner at all, which is at least tangentially related.

to answer two of John's questions for bug 542555:
> - what should the new all-in-one deb file be called?

I'd imagine just fennec and we'd drop the dependency on xulrunner

> - make sure users on earlier two-deb installations are upgraded correctly

should be seemless, although users may wind up with an extra/leftover xulrunner install unless they run apt-get autoremove. (the application manager may be smart and do that auto-magically.... I don't know)

Comment 3

[Aakash Desai [:aakashd]]

I filed 542319 to update the nightly version.

Comment 4

[Mark Finkle (:mfinkle) (use needinfo?)]

Attachment: patch

This patch moves the xulrunner binary files into the fennec deb. The xulrunner dependency is removed from the debian package.

I also update the default version of mobile-browser to 1.1a2pre

I tested the deb and it upgrades from Firefox 1.0.0 to Firefox 1.1a2pre, however it does not remove the /opt/mozilla/xulrunner-1.9.2.1 folder and files.

A | apt-get autoremove | does find the unused xulrunner files and removes them.

Comment 5

[Brad Lassey [:blassey] (use needinfo?)]

Comment on attachment 426081 [details] [diff] [review]
patch

>-deb: $(PP_DEB_FILES) $(DIST)/branding/$(MOZ_APP_NAME)_scalable.png \
>+deb: $(PP_DEB_FILES) $(DIST)/branding/$(MOZ_APP_NAME)_scalable.png $(MOZILLA_VERSION).$(MOZ_APP_NAME).conf \
nit, wrap this so its less than 80 chars

>+	rm $(DEBDESTDIR)/$(installdir)/xulrunner/xpidl
do you know why NO_PKG_FILES isn't taking care of this? My only worry  is that we're packaging other extra files

Comment 6

[Brad Lassey [:blassey] (use needinfo?)]

oh, one other question. Do we want to preserve the ability to have separate xulrunner and fennec debs? This patch obviously doesn't.

Comment 7

[Mark Finkle (:mfinkle) (use needinfo?)]

(In reply to comment #5)
> (From update of attachment 426081 [details] [diff] [review])
> >-deb: $(PP_DEB_FILES) $(DIST)/branding/$(MOZ_APP_NAME)_scalable.png \
> >+deb: $(PP_DEB_FILES) $(DIST)/branding/$(MOZ_APP_NAME)_scalable.png $(MOZILLA_VERSION).$(MOZ_APP_NAME).conf \
> nit, wrap this so its less than 80 chars

sure, but DEATH TO 80 CHAR LIMTS! I feel better

> >+	rm $(DEBDESTDIR)/$(installdir)/xulrunner/xpidl
> do you know why NO_PKG_FILES isn't taking care of this? My only worry  is that
> we're packaging other extra files

It's not in the list:
http://mxr.mozilla.org/mozilla-central/source/xulrunner/installer/Makefile.in#47
http://mxr.mozilla.org/mozilla-central/source/toolkit/mozapps/installer/packager.mk#245

But, Firefox adds them:
http://mxr.mozilla.org/mozilla-central/source/browser/installer/Makefile.in#46

I'll try adding what FF does

Comment 8

[Mark Finkle (:mfinkle) (use needinfo?)]

(In reply to comment #6)
> oh, one other question. Do we want to preserve the ability to have separate
> xulrunner and fennec debs? This patch obviously doesn't.

We can easily add that back if we need to.

Comment 9

[Mark Finkle (:mfinkle) (use needinfo?)]

Attachment: patch 2

Patch addresses review comments:
* Uses NO_PKG_FILES during the xulrunner repack to remove unwanted files
* Tested with mybrowser xul app on N900. It ran fine using a xulrunner-stub to find the fennec/xulrunner

Comment 10

[Mark Finkle (:mfinkle) (use needinfo?)]

pushed:
http://hg.mozilla.org/mobile-browser/rev/fd2a78968403

Comment 11

[Aakash Desai [:aakashd]]

verified FIXED on builds (via dpkg and app manager update on the 1.9.2_multi catalog):

Mozilla/5.0 (X11; U; Linux armv7l; Nokia N900; en-US; rv:1.9.2.2pre) Gecko/20100211 Namoroka/3.6.2pre Fennec/1.0pre

We really need to update our installation testcases in litmus and send out another blogpost about how to get nightly builds now.

Comment 12

[Aakash Desai [:aakashd]]

wrong build id:

Mozilla/5.0 (X11; U; Linux armv7l; Nokia N900; en-US; rv:1.9.2.2pre)
Gecko/20100211 Namoroka/3.6.2pre Fennec/1.1a2pre

Comment 13

[LonelyBob]

Changed testcase 7595 so that only a Fennec deb is downloaded, instead of both xulrunner and fennec debs, 
https://litmus.mozilla.org/show_test.cgi?id=7595