Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Bug 660427 - Update (re)packaging code to deal with extracting the in…

…staller vs just the zip. r=khuey

This patch does fixups needed for SeaMonkey for the optional/ case.
rs/a=KaiRo for relbranch landing/creation

--HG--
branch : SEAMONKEY_2_2b1_RELBRANCH
  • Loading branch information...
commit 052e945a24b83903aca06497b9cdb56200ef92e2 1 parent 540213a
@Callek Callek authored
Showing with 5 additions and 1 deletion.
  1. +5 −1 toolkit/mozapps/installer/packager.mk
View
6 toolkit/mozapps/installer/packager.mk
@@ -136,13 +136,17 @@ ifeq ($(MOZ_PKG_FORMAT),SFX7Z)
PKG_SUFFIX = .exe
INNER_MAKE_PACKAGE = rm -f app.7z && \
mv $(MOZ_PKG_DIR) core && \
+ (if [ -f ../optional_file_list.txt ]; then mkdir optional; xargs -I {} -a ../optional_file_list.txt mv -t optional/ core/{}; fi;) && \
$(CYGWIN_WRAPPER) 7z a -r -t7z app.7z -mx -m0=BCJ2 -m1=LZMA:d24 \
-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) core && \
- mv core $(MOZ_PKG_DIR)
+ rm -f ../optional_file_list.txt && \
+ mv core $(MOZ_PKG_DIR) && \
+ (if [ -d optional ]; then ls -1 optional > ../optional_file_list.txt; cp -rp optional/* $(MOZ_PKG_DIR); rm -rf optional; fi;)
endif
#Create an RPM file
Please sign in to comment.
Something went wrong with that request. Please try again.