added support for building Windows installs with Bash/WSL

phlummox-mirrors · Aug 14, 2017 · f6780ec · f6780ec
1 parent 89885b7
commit f6780ec
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 3 deletions.
diff --git a/LOG b/LOG
@@ -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
diff --git a/wininstall/Makefile b/wininstall/Makefile
@@ -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:

diff --git a/wininstall/candle.bat b/wininstall/candle.bat
@@ -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" %*
diff --git a/wininstall/light.bat b/wininstall/light.bat
@@ -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" %*