423277 - xulrunner+linux basic embedding profile packaging update

Status: RESOLVED INCOMPLETE

(Firefox Build System :: General, defect)

Description

[Doug Turner (:dougt)]

make package should package up the 'right' stuff for linux/basic.  This bug is specific to the xulrunner basic embedding profile on linux.

Comment 1

[Doug Turner (:dougt)]

Attachment: installer makefile. sets package manifest on gtk2

this shouldn't change anything except on the basic embedding profile on gtk2.

Comment 2

[Doug Turner (:dougt)]

Attachment: First draft of the installer package list

this needs to be in : xulrunner/installer/gtk2/packages-basic.


Not sure about why I need ./run-mozilla.sh.  Without it, running ./xulrunner doesn't work.

Comment 3

[Doug Turner (:dougt)]

Attachment: file listing of dist/xulrunner

these are all of the files in dist/xulrunner after running make package.


It would be cool to rename "browser.xpt" to something else -- like "xulrunner.xpt"

Comment 4

[Benjamin Smedberg]

Comment on attachment 309772 [details] [diff] [review]
installer makefile.  sets package manifest on gtk2

You set MOZ_PKG_MANIFEST = MOZ_PKG_MANIFEST_P, which will cause you to preprocess packages-basic back into the srcdir.

Also, why do you need PREF_DIR? Firefox needs it because FF+XR is different, but XR shouldn't need any special defines there.

New code should use preprocessor.py, not preprocessor.pl

Comment 5

[Doug Turner (:dougt)]

Attachment: patch to Makefile.in (addresses bsmedberg comments)

Comment 6

[Benjamin Smedberg]

Comment on attachment 309984 [details] [diff] [review]
patch to Makefile.in (addresses bsmedberg comments)

Does this work? You don't seem to be setting MOZ_PKG_MANIFEST anywhere.

Comment 7

[Doug Turner (:dougt)]

Attachment: cleaner patch

sure it worked ;-)  but this is probably cleaner.  I removed the *_P variable.

Comment 8

[Benjamin Smedberg]

Comment on attachment 313630 [details] [diff] [review]
cleaner patch

>Index: Makefile.in

>+ifdef MOZ_EMBEDDING_LEVEL_BASIC
>+ifdef MOZ_ENABLE_GTK2
>+MOZ_PKG_MANIFEST = $(srcdir)/gtk2/packages-basic
>+endif
>+endif

With this patch, packager.mk will use packages-basic from the srcdir without any preprocessing. I don't think you want that. What you do want, I think, is

MOZ_PKG_MANIFEST = packages-basic

>+ifdef MOZ_PKG_MANIFEST
>+DEFINES += -DAB_CD=$(AB_CD) -DMOZ_APP_NAME=$(MOZ_APP_NAME)
>+
>+$(MOZ_PKG_MANIFEST):
>+	$(PERL) $(topsrcdir)/config/preprocessor.py $(DEFINES) $(ACDEFINES) $< > $@
>+endif

This target still doesn't make sense: you wrote $< in a rule which has no prerequisites. I think you want:

$(MOZ_PKG_MANIFEST):
	$(PERL) $(topsrcdir)/config/preprocessor.py $(DEFINES) $(ACDEFINES) $(srcdir)/gtk2/packages-basic > $@

Comment 9

[Doug Turner (:dougt)]

how will:
MOZ_PKG_MANIFEST = packages-basic

pull from the right subdirectory?

eventually, we want something like:

srcdir/mac/packages-basic
srcdir/gtk2/packages-basic
srcdir/qt/packages-basic

as there are different bits that are platform specific.

Comment 10

[Benjamin Smedberg]

There are two steps:

1) preprocess the platform-specific manifest into the objdir.
2) tell packager.mk where the manifest is in the objdir

MOZ_PKG_MANIFEST is the latter step

you have to write a custom rule to do #1, and you can use any magic you want for that part.

Comment 11

[Doug Turner (:dougt)]

Attachment: patch v.2

Comment 12

[Doug Turner (:dougt)]

Attachment: package list

Comment 13

[Doug Turner (:dougt)]

Comment on attachment 314168 [details] [diff] [review]
patch v.2

should be using python, not perl.

Comment 14

[Doug Turner (:dougt)]

Attachment: patch v.3

Comment 15

[Doug Turner (:dougt)]

Attachment: packages-basic file

Comment 16

[Benjamin Smedberg]

Comment on attachment 314672 [details] [diff] [review]
patch v.3

>Index: xulrunner/installer/Makefile.in

>+$(MOZ_PKG_MANIFEST): packages-basic
>+	$(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) $(srcdir)/gtk2/packages-basic > $@

The dependency doesn't make sense. You should have:

$(MOZ_PKG_MANIFEST): gtk2/packages-basic
	$(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) $< > $@

r=me with that change

Comment 17

[Damon Sicore (:damons)]

This shouldn't block 1.9.  Not something we'll reject, but won't block the release.  Re-nom if you disagree and state why.

Comment 18

[Doug Turner (:dougt)]

would like to land this patch somewhere, doesn't effect firefox dev.

Comment 19

[Damon Sicore (:damons)]

Feel free to request approval.  :)

Comment 20

[Doug Turner (:dougt)]

per mobile call, i am not sure we are interested in a basic profile at the moment.  

Comment 21

[Doug Turner (:dougt)]

over to default.

Comment 22

[Gregory Szorc [:gps]]

I'm going to say this is no longer relevant.