backout merge. a=backout
authorBobby Holley <bobbyholley@gmail.com>
Fri, 27 Aug 2010 09:06:58 -0700
changeset 51586 e579c7d6e686764e623c015f6f01a68e410b9e43
parent 51584 e225bc9577606d9b51a7bb6c7931836abce8fc82 (current diff)
parent 51585 ccd462cc196d6b1d526ab922df6e44cdf5f54314 (diff)
child 51587 cf4d7946e2e064b0e8cce517553d593814f9f09e
push idunknown
push userunknown
push dateunknown
reviewersbackout
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
backout merge. a=backout
--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -231,25 +231,21 @@ 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 && \
-  sed -i -e 's/^\#binary-component/binary-component/' components/components.manifest
+UNPACK_OMNIJAR	= unzip -o omni.jar && rm -f components/binary.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