mozilla-2.0: changeset 63466:ff616f6ced1835adf3a50ad2eda5034f8693b732

Bug 660427 - Update (re)packaging code to deal with extracting the installer vs just the zip. rs=Callek (via email) for bringing this change onto the SeaMonkey-specific relbranch and moving tags to that changeset COMM20_053111_RELBRANCH SEAMONKEY_2_1_BUILD1 SEAMONKEY_2_1_RELEASE SEAMONKEY_2_1rc2_BUILD2 SEAMONKEY_2_1rc2_RELEASE

author	Robert Kaiser <kairo@kairo.at>
	Fri, 03 Jun 2011 03:35:41 +0200
branch	COMM20_053111_RELBRANCH
changeset 63466	ff616f6ced1835adf3a50ad2eda5034f8693b732
parent 63454	2b19de271abb0b22b31d5990b3512e30d704d19c
child 63467	1e650d481bd057d6c04ef20eb3ab7b0233d41ad2
push id	90
push user	kairo@kairo.at
push date	Fri, 03 Jun 2011 01:43:03 +0000
reviewers	Callek
bugs	660427
milestone	2.0.1

--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -148,17 +148,17 @@ INNER_MAKE_PACKAGE	= rm -f app.7z && \
     -m2=LZMA:d19 -m3=LZMA:d19 -mb0:1 -mb0s1:2 -mb0s2:3 && \
   mv core $(MOZ_PKG_DIR) && \
   (if [ -d optional ]; then mv optional/* $(MOZ_PKG_DIR); rm -rf optional; fi;) && \
   cat $(SFX_HEADER) app.7z > $(PACKAGE) && \
   chmod 0755 $(PACKAGE)
 INNER_UNMAKE_PACKAGE	= $(CYGWIN_WRAPPER) 7z x $(UNPACKAGE) && \
   rm -f ../optional_file_list.txt && \
   mv core $(MOZ_PKG_DIR) && \
-  (if [ -d optional ]; then ls -1 optional > ../optional_file_list.txt; mv optional/* $(MOZ_PKG_DIR); fi;)
+  (if [ -d optional ]; then ls -1 optional > ../optional_file_list.txt; cp -rp optional/* $(MOZ_PKG_DIR); rm -rf optional; fi;)
 endif
 ifeq ($(MOZ_PKG_FORMAT),APK)
 
 # we have custom stuff for Android
 MOZ_OMNIJAR =
 
 JAVA_CLASSPATH = $(ANDROID_SDK)/android.jar
 include $(topsrcdir)/config/android-common.mk