added support for building Windows installs with Bash/WSL

original commit: f6780ec692e89cf8f5d55734b351b840e9321333
This commit is contained in:
Bob Burger 2017-08-14 11:32:29 -04:00
parent 5c5bdcd841
commit 6c4c4d0b12
4 changed files with 20 additions and 3 deletions

2
LOG
View File

@ -564,3 +564,5 @@
- added support for Microsoft Visual Studio 2017 on Windows
BUILDING, c/Mf-a6nt, c/Mf-ta6nt, c/vs.bat,
mats/Mf-a6nt, mats/Mf-ta6nt, mats/ftype.ms
- added support for building Windows installs with Bash/WSL
wininstall/Makefile, candle.bat, light.bat

View File

@ -1,12 +1,11 @@
VERSION := 9.4.1
WIXBIN := $(shell cygpath "$(WIX)bin/")
WIXEXTENSIONS := -ext WixUIExtension
Chez\ Scheme.msi: product.wixobj a6nt.wixobj examples.wixobj i3nt.wixobj ta6nt.wixobj ti3nt.wixobj
"$(WIXBIN)light" -nologo $(WIXEXTENSIONS) product.wixobj a6nt.wixobj examples.wixobj i3nt.wixobj ta6nt.wixobj ti3nt.wixobj -sice:ICE64 -out "$@"
cmd.exe /c light.bat -nologo $(WIXEXTENSIONS) product.wixobj a6nt.wixobj examples.wixobj i3nt.wixobj ta6nt.wixobj ti3nt.wixobj -sice:ICE64 -out "$@"
%.wixobj: %.wxs
"$(WIXBIN)candle" -nologo -dVersion="$(VERSION)" $(WIXEXTENSIONS) $<
cmd.exe /c candle.bat -nologo -dVersion=$(VERSION) $(WIXEXTENSIONS) $<
.PHONY: workareas
workareas:

8
wininstall/candle.bat Executable file
View File

@ -0,0 +1,8 @@
@echo off
if exist "%WIX%bin\candle.exe" goto found
echo WiX must be installed.
exit 1
:found
"%WIX%bin\candle.exe" %*

8
wininstall/light.bat Executable file
View File

@ -0,0 +1,8 @@
@echo off
if exist "%WIX%bin\light.exe" goto found
echo WiX must be installed.
exit 1
:found
"%WIX%bin\light.exe" %*