Skip to content

Commit 94b29d5

Browse files
authored
Separate stage for windows exe installer and build tarballs on… (#35098)
* Separate build stage for windows exe installer Also build tarballs on Windows platform * Update build instructions
1 parent b061930 commit 94b29d5

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

Makefile

+3-4
Original file line numberDiff line numberDiff line change
@@ -465,16 +465,15 @@ endif
465465
ifeq ($(OS), Darwin)
466466
-cat $(JULIAHOME)/contrib/mac/startup.jl >> $(DESTDIR)$(prefix)/etc/julia/startup.jl
467467
endif
468-
469468
ifeq ($(OS), WINNT)
470469
cd $(BUILDROOT)/julia-$(JULIA_COMMIT)/bin && rm -f llvm* llc.exe lli.exe opt.exe LTO.dll bugpoint.exe macho-dump.exe
470+
endif
471+
cd $(BUILDROOT) && $(TAR) zcvf $(JULIA_BINARYDIST_FILENAME).tar.gz julia-$(JULIA_COMMIT)
471472

473+
exe:
472474
# run Inno Setup to compile installer; /O flag specifies where to place installer and /F flag the installer name
473475
$(call spawn,$(JULIAHOME)/dist-extras/inno/iscc.exe /DAppVersion=$(JULIA_VERSION) /DAppSourceFiles="$(call cygpath_w,$(BUILDROOT)/julia-$(JULIA_COMMIT))" /DAppHomeFiles="$(call cygpath_w,$(JULIAHOME))" /F"$(JULIA_BINARYDIST_FILENAME)" /O"$(call cygpath_w,$(BUILDROOT))" $(call cygpath_w,$(JULIAHOME)/contrib/windows/build-installer.iss))
474476
chmod a+x "$(BUILDROOT)/$(JULIA_BINARYDIST_FILENAME).exe"
475-
else
476-
cd $(BUILDROOT) && $(TAR) zcvf $(JULIA_BINARYDIST_FILENAME).tar.gz julia-$(JULIA_COMMIT)
477-
endif
478477

479478
app:
480479
$(MAKE) -C contrib/mac/app

doc/build/windows.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,7 @@ make -j4 win-extras julia-ui-release
196196
export WINEDEBUG=-all # suppress wine fixme's
197197
# this last step may need to be run interactively
198198
make -j4 binary-dist
199+
make -j4 exe
199200
SCRIPT
200201

201202
Vagrant.configure("2") do |config|
@@ -235,7 +236,7 @@ Then run the build:
235236
2. `echo override XC_HOST = i686-w64-mingw32 >> Make.user`
236237
3. `make`
237238
4. `make win-extras` (Necessary before running `make binary-dist`)
238-
5. `make binary-dist`
239+
5. `make binary-dist` then `make exe` to create the Windows installer.
239240
6. move the `julia-*.exe` installer to the target machine
240241

241242
If you are building for 64-bit windows, the steps are essentially the same.
@@ -267,8 +268,7 @@ just run `vagrant up` from that folder.
267268
Compiling using one of the options above creates a basic Julia build, but not some
268269
extra components that are included if you run the full Julia binary installer.
269270
If you need these components, the easiest way to get them is to build the installer
270-
yourself using ```make win-extras``` followed by ```make binary-dist```, and then
271-
running the resulting installer.
271+
yourself using ```make win-extras``` followed by ```make binary-dist``` and ```make exe```. Then running the resulting installer.
272272

273273

274274
## Windows Build Debugging

0 commit comments

Comments
 (0)