GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-04-23 03:32:51 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed shell scripts for java apps to use windows paths instead of cygwin paths.

Browse Source
This commit is contained in:
bringert
2005-07-20 10:34:04 +00:00
parent c575a9b864
commit edab6db989
3 changed files with 39 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Makefile
View File

@@ -24,6 +24,8 @@ SNAPSHOT_DIR=GF-$(shell date +%Y%m%d)
MSI_FILE=gf-$(subst .,_,$(PACKAGE_VERSION)).msi MSI_FILE=gf-$(subst .,_,$(PACKAGE_VERSION)).msi
GF_DATA_DIR=$(datadir)/GF-$(PACKAGE_VERSION)
# use the temporary binary file name 'gf-bin' to not clash with directory 'GF' # use the temporary binary file name 'gf-bin' to not clash with directory 'GF'
# on case insensitive file systems (such as FAT) # on case insensitive file systems (such as FAT)
GF_EXE=gf$(EXEEXT) GF_EXE=gf$(EXEEXT)
@@ -232,11 +234,11 @@ install-gfdoc:
$(INSTALL) tools/$(GF_DOC_EXE) $(bindir) $(INSTALL) tools/$(GF_DOC_EXE) $(bindir)
install-editor: install-editor:
$(INSTALL) -d $(datadir)/GF-$(PACKAGE_VERSION) $(INSTALL) -d $(GF_DATA_DIR)
$(INSTALL) jgf $(bindir) $(INSTALL) jgf $(bindir)
$(INSTALL) -m 0644 JavaGUI/gf-java.jar $(datadir)/GF-$(PACKAGE_VERSION) $(INSTALL) -m 0644 JavaGUI/gf-java.jar $(GF_DATA_DIR)
$(INSTALL) gfeditor $(bindir) $(INSTALL) gfeditor $(bindir)
$(INSTALL) -m 0644 $(GFEDITOR)/gfeditor.jar $(datadir)/GF-$(PACKAGE_VERSION) $(INSTALL) -m 0644 $(GFEDITOR)/gfeditor.jar $(GF_DATA_DIR)
install-java: javac install-java: javac
-rm -f ../bin/JavaGUI -rm -f ../bin/JavaGUI
@@ -244,4 +246,3 @@ install-java: javac
@echo "PLEASE edit GFHOME in bin/jgf" @echo "PLEASE edit GFHOME in bin/jgf"
-rm -f ../bin/$(GFEDITOR) -rm -f ../bin/$(GFEDITOR)
ln -s ../src/$(GFEDITOR) ../bin ln -s ../src/$(GFEDITOR) ../bin

31
src/gfeditor.in
View File

@@ -1,26 +1,32 @@
#!/bin/sh #!/bin/sh
prefix=@prefix@ prefix="@prefix@"
exec_prefix=@exec_prefix@
GF_BIN_DIR=@bindir@ case "@host@" in
GF_DATA_DIR=@datadir@/GF-@PACKAGE_VERSION@ *-cygwin)
prefix=`cygpath -w "$prefix"`;;
esac
exec_prefix="@exec_prefix@"
GF_BIN_DIR="@bindir@"
GF_DATA_DIR="@datadir@/GF-@PACKAGE_VERSION@"
JAVA="@JAVA@" JAVA="@JAVA@"
GF=$GF_BIN_DIR/gf GF="$GF_BIN_DIR/gf"
JARFILE=$GF_DATA_DIR/gfeditor.jar JARFILE="$GF_DATA_DIR/gfeditor.jar"
if [ ! -x "${JAVA}" ]; then if [ ! -x "${JAVA}" ]; then
JAVA=`which java` JAVA=`which java`
fi fi
if [ ! -x "${JAVA}" ]; then if [ ! -x "${JAVA}" ]; then
echo "No Java VM found" echo "No Java VM found."
exit 1 exit 1
fi fi
if [ ! -f "${JARFILE}" ]; then if [ ! -r "${JARFILE}" ]; then
echo "JAR file ${JARFILE} not found" echo "Cannot read JAR file ${JARFILE}."
exit 1 exit 1
fi fi
@@ -29,11 +35,8 @@ if [ ! -x "${GF}" ]; then
fi fi
if [ ! -x "${GF}" ]; then if [ ! -x "${GF}" ]; then
echo "gf not found" echo "GF not found."
exit 1 exit 1
fi fi
COMMAND= ${JAVA} -jar ${JARFILE} -g $GF $* exec "${JAVA}" -jar "${JARFILE}" -g "${GF}" $*
echo ${COMMAND}
exec ${COMMAND}

31
src/jgf.in
View File

@@ -1,26 +1,32 @@
#!/bin/sh #!/bin/sh
prefix=@prefix@ prefix="@prefix@"
exec_prefix=@exec_prefix@
GF_BIN_DIR=@bindir@ case "@host@" in
GF_DATA_DIR=@datadir@/GF-@PACKAGE_VERSION@ *-cygwin)
prefix=`cygpath -w "$prefix"`;;
esac
exec_prefix="@exec_prefix@"
GF_BIN_DIR="@bindir@"
GF_DATA_DIR="@datadir@/GF-@PACKAGE_VERSION@"
JAVA="@JAVA@" JAVA="@JAVA@"
GF=$GF_BIN_DIR/gf GF="$GF_BIN_DIR/gf"
JARFILE=$GF_DATA_DIR/gf-java.jar JARFILE="$GF_DATA_DIR/gf-java.jar"
if [ ! -x "${JAVA}" ]; then if [ ! -x "${JAVA}" ]; then
JAVA=`which java` JAVA=`which java`
fi fi
if [ ! -x "${JAVA}" ]; then if [ ! -x "${JAVA}" ]; then
echo "No Java VM found" echo "No Java VM found."
exit 1 exit 1
fi fi
if [ ! -f "${JARFILE}" ]; then if [ ! -r "${JARFILE}" ]; then
echo "JAR file ${JARFILE} not found" echo "Cannot read JAR file ${JARFILE}."
exit 1 exit 1
fi fi
@@ -29,11 +35,8 @@ if [ ! -x "${GF}" ]; then
fi fi
if [ ! -x "${GF}" ]; then if [ ! -x "${GF}" ]; then
echo "gf not found" echo "GF not found."
exit 1 exit 1
fi fi
COMMAND= ${JAVA} -jar ${JARFILE} "$GF -java $*" exec "${JAVA}" -jar "${JARFILE}" "$GF -java $*"
echo ${COMMAND}
exec ${COMMAND}