1076370 - Modify file structure of Firefox.app broke repacks.

Status: RESOLVED FIXED

(Toolkit Graveyard :: Build Config, defect)

Description

[Axel Hecht [:Pike]]

Seems that this broke l10n repacks.

make ident


in browser/locales/Makefile.in tries to find application.ini in the wrong spot, at least.

http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/2014-10-01-03-02-05-mozilla-central-l10n/mozilla-central-macosx64-l10n-nightly-de-bm86-build1-build3565.txt.gz is an example log

Comment 1

[Stephen A Pohl [:spohl]]

Looking into it.

Comment 2

[Robert Strong (they/them - no direct email)]

Stephen, I'll take care of this one to free you up for the other ones.

Comment 3

[Robert Strong (they/them - no direct email)]

Attachment: patch rev1

Hi Joel, I missed this change for l10n packaging and Mac V2 signing. I also fixed a couple of typos I landed.

Pushed to oak
https://hg.mozilla.org/projects/oak/rev/eafb515f6ab6

Comment 4

[Robert Strong (they/them - no direct email)]

The oak l10n repacks are succeeding with this patch
http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/2014-10-01-20-49-50-oak-l10n/

Comment 5

[Joel Maher ( :jmaher ) (UTC -8)]

Comment on attachment 8498620 [details] [diff] [review]
patch rev1

Review of attachment 8498620 [details] [diff] [review]:
-----------------------------------------------------------------

looks good to me!  I am not a domain expert of l10n.mk files, but from what I know of the other changes required, this seems like the right thing to do.

::: toolkit/locales/l10n.mk
@@ +114,5 @@
>  	$(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/l10n-repack.py $(STAGEDIST) $(DIST)/xpi-stage/locale-$(AB_CD) \
>  		$(if $(filter omni,$(MOZ_PACKAGER_FORMAT)),$(if $(NON_OMNIJAR_FILES),--non-resource $(NON_OMNIJAR_FILES)))
>  ifneq (en,$(AB))
>  ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
> +	mv $(STAGEDIST)/en.lproj $(STAGEDIST)/$(AB).lproj

so much nicer looking.

Comment 6

[Robert Strong (they/them - no direct email)]

Pushed to mozilla-inbound
https://hg.mozilla.org/integration/mozilla-inbound/rev/ddbbf2820441

Comment 7

[Ed Morley [:emorley]]

https://hg.mozilla.org/mozilla-central/rev/ddbbf2820441

Comment 8

[Robert Strong (they/them - no direct email)]

Landed on aurora in the Mac V2 signing combined patch in bug 1047584