summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/Makefile8
-rw-r--r--src/ReleaseProcedure3
-rw-r--r--src/config.mk.in8
-rw-r--r--src/configure.ac16
-rw-r--r--src/gf.wxs.in56
-rw-r--r--src/jgf.in2
6 files changed, 64 insertions, 29 deletions
diff --git a/src/Makefile b/src/Makefile
index eecb0f6df..6667bfbe8 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -89,8 +89,7 @@ shell:
$(GHMAKE) $(GHCFLAGS) $(GHCOPTFLAGS) GF/Shell.hs
clean:
- -rm -rf */*.o */*.hi *.o *.hi */*.ghi *.ghi *~ */*~
- -rm -f GF/*.{o,hi,ghi} GF/*/*.{o,hi,ghi} GF/*/*/*.{o,hi,ghi}
+ find . '(' -name '*~' -o -name '*.hi' -o -name '*.ghi' -o -name '*.o' ')' -exec rm -f '{}' ';'
-rm -f JavaGUI/*.class
-rm -f gf.wixobj
@@ -203,7 +202,10 @@ grammar-dist:
gtar -zcf $(GRAMMAR_DIST_DIR).tgz $(GRAMMAR_DIST_DIR)
rm -rf $(GRAMMAR_DIST_DIR)
-windows-msi:
+jgf.bat:
+ echo 'java -jar gf-java.jar gf.exe' > jgf.bat
+
+windows-msi: jgf.bat
candle -nologo gf.wxs
light -nologo gf.wixobj
diff --git a/src/ReleaseProcedure b/src/ReleaseProcedure
index 93c967b92..24a350ec8 100644
--- a/src/ReleaseProcedure
+++ b/src/ReleaseProcedure
@@ -97,7 +97,8 @@ buildarchtranslate: i686: i586
15. Build a Windows package:
- ???
+ $ cd src
+ $ ./configure && make all windows-msi
16. Add new GF package release to SourceForge:
diff --git a/src/config.mk.in b/src/config.mk.in
index cf2b6d794..dc04386ca 100644
--- a/src/config.mk.in
+++ b/src/config.mk.in
@@ -19,13 +19,13 @@ EXEEXT = @EXEEXT@
INSTALL = @INSTALL@
-GHC = @GHC@
-GHCI = @GHCI@
+GHC = "@GHC@"
+GHCI = "@GHCI@"
READLINE = @READLINE@
ENABLE_JAVA = @ENABLE_JAVA@
-JAVAC = @JAVAC@
-JAR = @JAR@
+JAVAC = "@JAVAC@"
+JAR = "@JAR@"
diff --git a/src/configure.ac b/src/configure.ac
index 81fae5e51..3bfd9c978 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -4,7 +4,7 @@ AC_INIT([GF],[2.2],[aarne@cs.chalmers.se],[GF])
AC_PREREQ(2.53)
-AC_REVISION($Revision: 1.20 $)
+AC_REVISION($Revision: 1.21 $)
AC_CONFIG_FILES([config.mk jgf gf.wxs])
@@ -38,6 +38,11 @@ AC_ARG_WITH(ghc,
GHCI=$(dirname $GHC)/ghci
+GHC_VERSION=`$GHC --version | sed -e 's/.*version //'`
+AC_MSG_CHECKING([GHC version])
+AC_MSG_RESULT($GHC_VERSION)
+
+
AC_SUBST(GHC)
AC_SUBST(GHCI)
@@ -56,7 +61,14 @@ AC_ARG_WITH(readline,
else
READLINE="$withval"
fi],
- [READLINE="readline"])
+ [if test "$GHC_VERSION" = "6.4" && test "$host_os" = "cygwin"; then
+ AC_MSG_WARN([There are problems with readline on 6.4 for Windows,
+ disabling readline support.
+ Use --with-readline to override.])
+ READLINE="no"
+ else
+ READLINE="readline"
+ fi])
case $READLINE in
readline)
diff --git a/src/gf.wxs.in b/src/gf.wxs.in
index 941a7f2cb..760ed2f26 100644
--- a/src/gf.wxs.in
+++ b/src/gf.wxs.in
@@ -1,40 +1,60 @@
<?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">
+ <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" />
+ 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 Id="ProgramFilesFolder">
+ <Directory Id="INSTALLDIR" Name="GF-@PACKAGE_VERSION@">
+
+ <Component Id="GFBinary" Guid="E2A44A6C-0252-4346-85AE-BC6A16BFB0FC">
+ <File Id="GFEXE" Name="gf.exe" DiskId="1" src="../bin/gf.exe" />
+ <Shortcut Id="GFStartMenu" Directory="GFProgramMenuDir"
+ Name="GF" Target="[!GFEXE]" />
+ </Component>
+
+ <Component Id="GFDocBinary" Guid="BDCA6F34-EE0A-4E72-8D00-CB7CAF3CEAEA">
+ <File Id="GFDocEXE" Name="gfdoc.exe" DiskId="1" src="tools/gfdoc.exe" />
+ </Component>
+
+ <Component Id="GFEditor" Guid="39F885F7-BC49-4CBC-9DCD-569C95AA3364">
+ <File Id="GFEditorBat" Name="jgf.bat" DiskId="1" src="jgf.bat" />
+ <File Id="GFEditorJar" Name="gf-java.jar" DiskId="1" src="JavaGUI/gf-java.jar" />
+ <Shortcut Id="GFEditorStartMenu" Directory="GFProgramMenuDir"
+ Name="GFEditor" LongName="GF Editor" Target="[!GFEditorBat]"
+ WorkingDirectory="INSTALLDIR" />
+ </Component>
+
+ <Directory Id="GFDocDir" Name="doc">
+ <Component Id="GFDoc" Guid="23BEEBBF-F9AB-459F-B8D2-8414BB47834A">
+ <File Id="GFReadme" Name="README.txt" DiskId="1" src="../README" />
+ <File Id="GFLicenee" Name="LICENSE.txt" DiskId="1" src="../LICENSE" />
+ </Component>
</Directory>
+
</Directory>
</Directory>
<Directory Id="ProgramMenuFolder" Name="PMenu" LongName="Programs">
- <Directory Id="ProgramMenuDir" Name='GF-@PACKAGE_VERSION@' />
+ <Directory Id="GFProgramMenuDir" Name='GF-@PACKAGE_VERSION@' />
</Directory>
</Directory>
<Feature Id="ProductFeature" Title="Feature Title" Level="1">
<ComponentRef Id="GFBinary" />
+ <ComponentRef Id="GFDocBinary" />
+ <ComponentRef Id="GFEditor" />
+ <ComponentRef Id="GFDoc" />
</Feature>
</Product>
diff --git a/src/jgf.in b/src/jgf.in
index 4bd2c24f8..b82e1fd73 100644
--- a/src/jgf.in
+++ b/src/jgf.in
@@ -5,7 +5,7 @@ exec_prefix=@exec_prefix@
GF_BIN_DIR=@bindir@
GF_DATA_DIR=@datadir@/GF-@PACKAGE_VERSION@
-JAVA=@JAVA@
+JAVA="@JAVA@"
GF=$GF_BIN_DIR/gf
JARFILE=$GF_DATA_DIR/gf-java.jar
generated by cgit v1.2.3 (git 2.39.1) at 2026-05-20 06:39:54 +0000