wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 811557. r=bbondy

Browse Source
This commit is contained in:
Robert Strong 2013-06-05 00:33:26 -07:00
parent 6653c9cf7e
commit 0943477823
4 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
browser/installer/windows/Makefile.in
View File

@ -24,6 +24,7 @@ INSTALLER_FILES = \
nsis/uninstaller.nsi \
nsis/stub.nsi \
nsis/shared.nsh \
stub.tag \
$(NULL)
ifdef MOZ_MAINTENANCE_SERVICE

7
browser/installer/windows/nsis/stub.nsi
View File

@ -13,8 +13,7 @@
!verbose 3
SetDatablockOptimize on
SetCompress force
SetCompressor /FINAL /SOLID lzma
SetCompress off
CRCCheck on
RequestExecutionLevel user
@ -239,10 +238,10 @@ Var ControlRightPX
!insertmacro UnloadUAC
VIAddVersionKey "FileDescription" "${BrandShortName} Stub Installer"
VIAddVersionKey "OriginalFilename" "stub.exe"
VIAddVersionKey "OriginalFilename" "setup-stub.exe"
Name "$BrandFullName"
OutFile "stub.exe"
OutFile "setup-stub.exe"
icon "setup.ico"
XPStyle on
BrandingText " "

4
browser/installer/windows/stub.tag Normal file
View File

@ -0,0 +1,4 @@
;!@Install@!UTF-8!
Title="Mozilla Firefox"
RunProgram="setup-stub.exe"
;!@InstallEnd@!

8
toolkit/mozapps/installer/windows/nsis/makensis.mk
View File

@ -45,6 +45,12 @@ $(CONFIG_DIR)/setup.exe::
cd $(CONFIG_DIR) && $(MAKENSISU) installer.nsi
ifdef MOZ_STUB_INSTALLER
cd $(CONFIG_DIR) && $(MAKENSISU) stub.nsi
ifdef MOZ_EXTERNAL_SIGNING_FORMAT
$(MOZ_SIGN_CMD) $(foreach f,$(MOZ_EXTERNAL_SIGNING_FORMAT),-f $(f)) $(CONFIG_DIR)/setup-stub.exe
endif
$(MAKE) $(CONFIG_DIR)/7zSD.sfx
cd $(CONFIG_DIR) && $(CYGWIN_WRAPPER) 7z a -t7z $(ABS_CONFIG_DIR)/stub.7z setup-stub.exe -mx -m0=BCJ2 -m1=LZMA:d21 -m2=LZMA:d17 -m3=LZMA:d17 -mb0:1 -mb0s1:2 -mb0s2:3
cat $(CONFIG_DIR)/7zSD.sfx $(CONFIG_DIR)/stub.tag $(CONFIG_DIR)/stub.7z > "$(CONFIG_DIR)/stub.exe"
ifdef MOZ_EXTERNAL_SIGNING_FORMAT
$(MOZ_SIGN_CMD) $(foreach f,$(MOZ_EXTERNAL_SIGNING_FORMAT),-f $(f)) $(CONFIG_DIR)/stub.exe
endif
@ -62,7 +68,7 @@ $(CONFIG_DIR)/7zSD.sfx:
installer::
$(INSTALL) $(CONFIG_DIR)/setup.exe $(DEPTH)/installer-stage
cd $(DEPTH)/installer-stage && $(CYGWIN_WRAPPER) 7z a -r -t7z $(ABS_CONFIG_DIR)/app.7z -mx -m0=BCJ2 -m1=LZMA:d24 -m2=LZMA:d19 -m3=LZMA:d19 -mb0:1 -mb0s1:2 -mb0s2:3
cd $(DEPTH)/installer-stage && $(CYGWIN_WRAPPER) 7z a -r -t7z $(ABS_CONFIG_DIR)/app.7z -mx -m0=BCJ2 -m1=LZMA:d24 -m2=LZMA:d19 -m3=LZMA:d19 -mb0:1 -mb0s1:2 -mb0s2:3
$(MAKE) $(CONFIG_DIR)/7zSD.sfx
$(NSINSTALL) -D $(DIST)/$(PKG_INST_PATH)
cat $(CONFIG_DIR)/7zSD.sfx $(CONFIG_DIR)/app.tag $(CONFIG_DIR)/app.7z > "$(DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe"