Bug 589175 - Comment out binary-component entries, r=bsmedberg a=blocking2.0
☠☠ backed out by ccd462cc196d ☠ ☠
authorMichael Wu <mwu@mozilla.com>
Fri, 27 Aug 2010 11:04:15 -0400
changeset 51571 9f8fc8a50525337c6aeb7dfaf79885b6b268c304
parent 51570 09804d63d3023a9e4ef446f6891fd505d0fecf81
child 51572 2914a4cdd7e2a120f143ec8c628c1d36d94057a6
child 51585 ccd462cc196d6b1d526ab922df6e44cdf5f54314
push id15359
push usereakhgari@mozilla.com
push dateFri, 27 Aug 2010 15:06:06 +0000
treeherdermozilla-central@9f8fc8a50525 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbsmedberg, blocking2
bugs589175
milestone2.0b5pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 589175 - Comment out binary-component entries, r=bsmedberg a=blocking2.0
toolkit/mozapps/installer/packager.mk
--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -231,21 +231,25 @@ NON_OMNIJAR_FILES = \
   chrome/icons/\* \
   res/cursors/\* \
   res/MainMenu.nib/\* \
   $(NULL)
 
 PACK_OMNIJAR	= \
   rm -f omni.jar components/binary.manifest && \
   grep -h '^binary-component' components/*.manifest > binary.manifest ; \
+  sed -i -e 's/^binary-component/\#binary-component/' components/components.manifest && \
   zip -r9m 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 -i -e 's/^\#binary-component/binary-component/' components/components.manifest
 
 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))
 else
 MAKE_PACKAGE	= $(INNER_MAKE_PACKAGE)
 UNMAKE_PACKAGE	= $(INNER_UNMAKE_PACKAGE)
 endif