From c6e8dab10dbd286643794dd62a16c368a38eb2a9 Mon Sep 17 00:00:00 2001 From: Michael Wu Date: Fri, 3 Sep 2010 14:56:04 +1200 Subject: [PATCH] Bug 589175 - Comment out binary-component entries, r=bsmedberg a=blocking2.0 --- toolkit/mozapps/installer/packager.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk index c5b6d7c5b405..01814fbcc579 100644 --- a/toolkit/mozapps/installer/packager.mk +++ b/toolkit/mozapps/installer/packager.mk @@ -237,12 +237,18 @@ NON_OMNIJAR_FILES = \ PACK_OMNIJAR = \ rm -f omni.jar components/binary.manifest && \ grep -h '^binary-component' components/*.manifest > binary.manifest ; \ + sed -e 's/^binary-component/\#binary-component/' components/components.manifest > components.manifest && \ + mv components.manifest components && \ find . | xargs touch -t 201001010000 && \ zip -r9mX omni.jar $(OMNIJAR_FILES) -x $(NON_OMNIJAR_FILES) && \ $(OPTIMIZE_JARS_CMD) $(DIST)/jarlog/ ./ ./ && \ mv binary.manifest components && \ printf "manifest components/binary.manifest\n" > chrome.manifest -UNPACK_OMNIJAR = unzip -o omni.jar && rm -f components/binary.manifest +UNPACK_OMNIJAR = \ + unzip -o omni.jar && \ + rm -f components/binary.manifest && \ + sed -e 's/^\#binary-component/binary-component/' components/components.manifest > components.manifest && \ + mv components.manifest components MAKE_PACKAGE = (cd $(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH) && $(PACK_OMNIJAR)) && $(INNER_MAKE_PACKAGE) UNMAKE_PACKAGE = $(INNER_UNMAKE_PACKAGE) && (cd $(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH) && $(UNPACK_OMNIJAR))