Can now build Windows MSI packages using WiX.

src/Makefile

@@ -48,7 +48,7 @@ endif
 
 .PHONY: all unix jar gfdoc windows install install-gf \
         temp install-gfdoc install-editor \
-        today help clean
+        today help clean windows-msi
 
 all: unix gfdoc $(BUILD_JAR)
 
@@ -92,6 +92,7 @@ clean:
 	-rm -rf */*.o */*.hi *.o *.hi */*.ghi *.ghi *~ */*~
 	-rm -f GF/*.{o,hi,ghi} GF/*/*.{o,hi,ghi} GF/*/*/*.{o,hi,ghi}
 	-rm -f JavaGUI/*.class
+	-rm -f gf.wixobj
 
 distclean: clean
 	-rm -f JavaGUI/gf-java.jar jgf
@@ -99,6 +100,7 @@ distclean: clean
 	-rm -f config.status config.mk config.log
 	-rm -f *.tgz *.zip
 	-rm -rf $(DIST_DIR) $(BIN_DIST_DIR)
+	-rm -rf gf.msi
 
 ghci-nofud:
 	$(GHCI) $(GHCFLAGS)
@@ -201,6 +203,10 @@ grammar-dist:
 	gtar -zcf $(GRAMMAR_DIST_DIR).tgz $(GRAMMAR_DIST_DIR)
 	rm -rf $(GRAMMAR_DIST_DIR)
 
+windows-msi: 
+	candle -nologo gf.wxs
+	light -nologo gf.wixobj
+
 #
 # Installation
 #

src/configure.ac

@@ -4,9 +4,9 @@ AC_INIT([GF],[2.2],[aarne@cs.chalmers.se],[GF])
 
 AC_PREREQ(2.53)
 
-AC_REVISION($Revision: 1.19 $)
+AC_REVISION($Revision: 1.20 $)
 
-AC_CONFIG_FILES([config.mk jgf])
+AC_CONFIG_FILES([config.mk jgf gf.wxs])
 
 AC_CANONICAL_HOST
 

src/gf.wxs.in

@@ -0,0 +1,41 @@
+<?xml version="1.0"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
+  <Product Id="4717AF5D-52AC-4D13-85E6-D87278CE9BBC" UpgradeCode="0BB7BB08-1A79-4981-A03F-32B401B01010" Name="Grammatical Framework, version @PACKAGE_VERSION@" 
+Language="1033" 
+Version="2.2" Manufacturer="The GF Developers">
+    <Package Id="????????-????-????-????-????????????" 
+Description="Grammatical Framework, version @PACKAGE_VERSION@" Comments="This package contains the Grammatical Framework system, version @PACKAGE_VERSION@." 
+InstallerVersion="200" Compressed="yes" />
+
+    <Media Id="1" Cabinet="gf.cab" EmbedCab="yes" />
+
+    <Directory Id="TARGETDIR" Name="SourceDir">
+      <Directory Id="ProgramFilesFolder">
+        <Directory Id="INSTALLLOCATION" Name="GF-@PACKAGE_VERSION@">
+          <Directory Id="GFBinFolder" Name="bin">
+
+        <Component Id="GFBinary" Guid="E2A44A6C-0252-4346-85AE-BC6A16BFB0FC">
+            <File Id="GF" Name="gf.exe" 
+             LongName="gf.exe" DiskId="1" src="../bin/gf.exe"/>
+            <Shortcut Id="GFStartMenuLink" Directory="ProgramMenuDir" 
+                Name="GF-@PACKAGE_VERSION@" Advertise="yes"
+                WorkingDirectory='INSTALLDIR'
+                />
+        </Component>
+
+          </Directory>
+        </Directory>
+      </Directory>
+
+      <Directory Id="ProgramMenuFolder" Name="PMenu" LongName="Programs">
+        <Directory Id="ProgramMenuDir" Name='GF-@PACKAGE_VERSION@' />
+      </Directory>
+
+    </Directory>
+
+    <Feature Id="ProductFeature" Title="Feature Title" Level="1">
+      <ComponentRef Id="GFBinary" />
+    </Feature>
+
+  </Product>
+</Wix>