From 09e2eda1b29d48b7974fadfe235659ac99f7920e Mon Sep 17 00:00:00 2001 From: bringert Date: Thu, 19 May 2005 14:19:13 +0000 Subject: [PATCH] Can now build Windows MSI packages using WiX. --- src/Makefile | 8 +++++++- src/configure.ac | 4 ++-- src/gf.wxs.in | 41 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+), 3 deletions(-) create mode 100644 src/gf.wxs.in diff --git a/src/Makefile b/src/Makefile index 30e4be8b6..eecb0f6df 100644 --- a/src/Makefile +++ b/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 # diff --git a/src/configure.ac b/src/configure.ac index 56c910976..81fae5e51 100644 --- a/src/configure.ac +++ b/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 diff --git a/src/gf.wxs.in b/src/gf.wxs.in new file mode 100644 index 000000000..941a7f2cb --- /dev/null +++ b/src/gf.wxs.in @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file