Skip to content

Commit

Permalink
Upgrade and use NSIS for compression instead of extra 7z stage (Julia…
Browse files Browse the repository at this point in the history
…Lang#31879)

Upgrade and use NSIS for compression instead of extra 7z stage
  • Loading branch information
staticfloat authored May 2, 2019
2 parents 1707e13 + 57ccd38 commit b118e68
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 43 deletions.
13 changes: 4 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@ ifeq ($(DARWIN_FRAMEWORK),1)
endif

distclean:
-rm -fr $(BUILDROOT)/julia-*.tar.gz $(BUILDROOT)/julia*.exe $(BUILDROOT)/julia-*.7z $(BUILDROOT)/julia-$(JULIA_COMMIT)
-rm -fr $(BUILDROOT)/julia-*.tar.gz $(BUILDROOT)/julia*.exe $(BUILDROOT)/julia-$(JULIA_COMMIT)

binary-dist: distclean
ifeq ($(USE_SYSTEM_BLAS),0)
Expand Down Expand Up @@ -463,13 +463,8 @@ ifeq ($(OS), WINNT)

# build nsis package
cd $(BUILDROOT) && $(call spawn,$(JULIAHOME)/dist-extras/nsis/makensis.exe) -NOCD -DVersion=$(JULIA_VERSION) -DArch=$(ARCH) -DCommit=$(JULIA_COMMIT) -DMUI_ICON="$(call cygpath_w,$(JULIAHOME)/contrib/windows/julia.ico)" $(call cygpath_w,$(JULIAHOME)/contrib/windows/build-installer.nsi) | iconv -f latin1

# compress nsis installer and combine with 7zip self-extracting header
cd $(BUILDROOT) && $(JULIAHOME)/dist-extras/7z a -mx9 "julia-install-$(JULIA_COMMIT)-$(ARCH).7z" julia-installer.exe
cd $(BUILDROOT) && cat $(JULIAHOME)/contrib/windows/7zS.sfx $(JULIAHOME)/contrib/windows/7zSFX-config.txt "julia-install-$(JULIA_COMMIT)-$(ARCH).7z" > "$(JULIA_BINARYDIST_FILENAME).exe"
mv "$(BUILDROOT)/julia-installer.exe" "$(BUILDROOT)/$(JULIA_BINARYDIST_FILENAME).exe"
chmod a+x "$(BUILDROOT)/$(JULIA_BINARYDIST_FILENAME).exe"
-rm -f $(BUILDROOT)/julia-install-$(JULIA_COMMIT)-$(ARCH).7z
-rm -f $(BUILDROOT)/julia-installer.exe
else
cd $(BUILDROOT) && $(TAR) zcvf $(JULIA_BINARYDIST_FILENAME).tar.gz julia-$(JULIA_COMMIT)
endif
Expand Down Expand Up @@ -612,10 +607,10 @@ else
endif
cd $(JULIAHOME)/dist-extras && \
$(JLDOWNLOAD) http://downloads.sourceforge.net/sevenzip/7z1900-extra.7z && \
$(JLDOWNLOAD) https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/unsis/nsis-2.46.5-Unicode-setup.exe && \
$(JLDOWNLOAD) https://sourceforge.net/projects/nsis/files/NSIS%203/3.04/nsis-3.04-setup.exe && \
chmod a+x 7z.exe && \
chmod a+x 7z.dll && \
$(call spawn,./7z.exe) x -y -onsis nsis-2.46.5-Unicode-setup.exe && \
$(call spawn,./7z.exe) x -y -onsis nsis-3.04-setup.exe && \
chmod a+x ./nsis/makensis.exe

# various statistics about the build that may interest the user
Expand Down
Binary file removed contrib/windows/7zS.sfx
Binary file not shown.
4 changes: 0 additions & 4 deletions contrib/windows/7zSFX-config.txt

This file was deleted.

27 changes: 0 additions & 27 deletions contrib/windows/7zSFX-manifest.xml

This file was deleted.

5 changes: 2 additions & 3 deletions contrib/windows/build-installer.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@

Name "The Julia Language"
OutFile "julia-installer.exe"
SetCompress off
SetCompressor /SOLID lzma
SetCompressorDictSize 64
CRCCheck on
SetDataBlockOptimize on
ShowInstDetails show
Expand Down Expand Up @@ -153,5 +154,3 @@ FunctionEnd
Function ShowInstallFolder
ExecShell "open" $INSTDIR
FunctionEnd


0 comments on commit b118e68

Please sign in to comment.