diff options
| author | bringert <unknown> | 2005-05-19 17:56:30 +0000 |
|---|---|---|
| committer | bringert <unknown> | 2005-05-19 17:56:30 +0000 |
| commit | f0e3d46b33d493bd1eb6d7bd699bf8a1843f0261 (patch) | |
| tree | 160ad9df764861948f26e3cdf70009f217ddb806 | |
| parent | 138ac2dece6cbd62b93127ce87e630781ef0188a (diff) | |
Added jgf.bat. Set GF_HOME variable and use it in jgf.bat.
| -rw-r--r-- | src/Makefile | 11 | ||||
| -rw-r--r-- | src/gf.wxs.in | 2 | ||||
| -rw-r--r-- | src/jgf.bat | 1 |
3 files changed, 8 insertions, 6 deletions
diff --git a/src/Makefile b/src/Makefile index 6667bfbe8..f8665cde6 100644 --- a/src/Makefile +++ b/src/Makefile @@ -21,6 +21,8 @@ GRAMMAR_DIST_DIR=GF-grammars-$(PACKAGE_VERSION) SNAPSHOT_DIR=GF-$(shell date +%Y%m%d) +MSI_FILE=gf-$(subst .,_,$(PACKAGE_VERSION)).msi + # use the temporary binary file name 'gf-bin' to not clash with directory 'GF' # on case insensitive file systems (such as FAT) GF_EXE=gf$(EXEEXT) @@ -99,7 +101,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 + -rm -rf gf.wxs *.msi ghci-nofud: $(GHCI) $(GHCFLAGS) @@ -202,12 +204,9 @@ grammar-dist: gtar -zcf $(GRAMMAR_DIST_DIR).tgz $(GRAMMAR_DIST_DIR) rm -rf $(GRAMMAR_DIST_DIR) -jgf.bat: - echo 'java -jar gf-java.jar gf.exe' > jgf.bat - -windows-msi: jgf.bat +windows-msi: candle -nologo gf.wxs - light -nologo gf.wixobj + light -nologo -o $(MSI_FILE) gf.wixobj # # Installation diff --git a/src/gf.wxs.in b/src/gf.wxs.in index 760ed2f26..56d6bd66f 100644 --- a/src/gf.wxs.in +++ b/src/gf.wxs.in @@ -27,6 +27,8 @@ </Component> <Component Id="GFEditor" Guid="39F885F7-BC49-4CBC-9DCD-569C95AA3364"> + <Environment Id="GFHomeEnv" Name="GF_HOME" Action="create" Part="all" Permanent="no" + Value="[INSTALLDIR]" /> <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" diff --git a/src/jgf.bat b/src/jgf.bat new file mode 100644 index 000000000..d56a638d5 --- /dev/null +++ b/src/jgf.bat @@ -0,0 +1 @@ +java -jar "%GF_HOME%\gf-java.jar" "%GF_HOME%\gf.exe" %* |