From f8d4738a436c32c7c71e975b2dfd5559f9ebc73a Mon Sep 17 00:00:00 2001 From: aarne Date: Fri, 27 Jun 2008 16:48:28 +0000 Subject: [PATCH] added api/Combinators for Eng --- download/gfc | 25 ++++++++++++++ download/index.html | 80 ++++++++++++++++++++++++++------------------- download/index.txt | 49 ++++++++++++++++----------- src/Makefile | 3 -- src/gfc.in | 6 ++-- 5 files changed, 104 insertions(+), 59 deletions(-) create mode 100644 download/gfc diff --git a/download/gfc b/download/gfc new file mode 100644 index 000000000..7c1d30515 --- /dev/null +++ b/download/gfc @@ -0,0 +1,25 @@ +#!/bin/sh + +prefix="/usr/local" + +case "i386-apple-darwin9.3.0" in + *-cygwin) + prefix=`cygpath -w "$prefix"`;; +esac + +exec_prefix="${prefix}" +GF_BIN_DIR="${exec_prefix}/bin" +GF_DATA_DIR="${prefix}/share/GF-3.0-beta" + +GFBIN="$GF_BIN_DIR/gf" + +if [ ! -x "${GFBIN}" ]; then + GFBIN=`which gf` +fi + +if [ ! -x "${GFBIN}" ]; then + echo "gf not found." + exit 1 +fi + +exec $GFBIN --batch "$@" diff --git a/download/index.html b/download/index.html index 83081dd03..a065aa239 100644 --- a/download/index.html +++ b/download/index.html @@ -13,27 +13,46 @@ GF darcs repository

Latest release

-

-GF 3.0 beta Linux binary (Intel, Ubuntu) -

-

-GF 3.0 beta MacOS X binary (Intel Mac with Leopard) -

-

-GF 3.0 beta Windows binary -

-

-GF 3.0 beta sources -

-

-GF libraries v 1.4 (compiled resource grammar libraries) -

+ +

Old releases

-

-GF 2.9 download page -

+ +

Installation instructions

+To install a binary, just uncompress it and copy to a place that is on your path, +for instance, in /usr/local/bin. +

+

+If you want to use GF as a batch compiler, put the following script in the +same place as the GF binary. If it is not /usr/local/bin, change +the prefix variable in the script. +

+ + +

+The Mac OS X binary (Intel) requires Readline from +Mac Ports. To install, see above item. +

+

+The Windows binary is easiest if you have +Cygwin. To install, see above item. +

+

To compile and install from source: 

@@ -45,27 +64,20 @@ To compile and install from source:
     make install

-To install a binary, +To install the libraries, unpack them in the place to which your +GF_LIB_PATH points. 

-    tar xvfz BINARY-PACKAGE.tgz
-    cd GF-...
-    ./configure
-    make install
+    cd $GF_LIB_PATH
+    gtar xvfz gf-lib-1.4.tgz

-You may need sudo make install. -If you cannot write in /usr/local/, you can change the target directory -by ./configure --prefix=MYDIR. -

-

-The Mac OS X binary (Intel) requires Readline from -Mac Ports. To install, see above item. -

-

-The Windows binary is easiest if you have -Cygwin. To install, see above item. +If this variable hasn't been defined, it is useful define it, e.g.

+
+    export GF_LIB_PATH=/usr/local/lib/gf/
+
+

diff --git a/download/index.txt b/download/index.txt index 1c9273dcd..87bfc4c64 100644 --- a/download/index.txt +++ b/download/index.txt @@ -7,24 +7,40 @@ Grammatical Framework Download and Installation ==Latest release== -[GF 3.0 beta Linux binary gf-3.0beta-linux.gz] (Intel, Ubuntu) +- [GF 3.0 beta Linux binary gf-3.0beta-linux.gz] (Intel, Ubuntu) -[GF 3.0 beta MacOS X binary gf-3.0beta-mac.gz] (Intel Mac with Leopard) +- [GF 3.0 beta MacOS X binary gf-3.0beta-mac.gz] (Intel Mac with Leopard) -[GF 3.0 beta Windows binary gf-3.0beta-mac.exe] +- [GF 3.0 beta Windows binary gf-3.0beta-mac.exe] -[GF 3.0 beta sources gf-3.0beta.tgz] +- [GF 3.0 beta sources gf-3.0beta.tgz] -[GF libraries v 1.4 gf-lib-1.4.tgz] (compiled resource grammar libraries) +- [GF libraries v 1.4 gf-lib-1.4.tgz] (compiled resource grammar libraries) ==Old releases== -[GF 2.9 download page ../../GF2/download/index.html] +- [GF 2.9 download page ../../GF2/download/index.html] ==Installation instructions== +To install a binary, just uncompress it and copy to a place that is on your path, +for instance, in ``/usr/local/bin``. + +If you want to use GF as a batch compiler, put the following script in the +same place as the GF binary. If it is //not// ``/usr/local/bin``, change +the ``prefix`` variable in the script. + +- [gfc script for patch compiler ./gfc] + + +The Mac OS X binary (Intel) requires Readline from +[Mac Ports http://www.macports.org/]. To install, see above item. + +The Windows binary is easiest if you have +[Cygwin http://www.cygwin.com/]. To install, see above item. + To compile and install from source: ``` tar xvfz gf-3.0beta.tgz @@ -34,20 +50,15 @@ To compile and install from source: make make install ``` -To install a binary, +To install the libraries, unpack them in the place to which your +``GF_LIB_PATH`` points. ``` - tar xvfz BINARY-PACKAGE.tgz - cd GF-... - ./configure - make install + cd $GF_LIB_PATH + gtar xvfz gf-lib-1.4.tgz +``` +If this variable hasn't been defined, it is useful define it, e.g. +``` + export GF_LIB_PATH=/usr/local/lib/gf/ ``` -You may need ``sudo make install``. -If you cannot write in ``/usr/local/``, you can change the target directory -by ``./configure --prefix=MYDIR``. -The Mac OS X binary (Intel) requires Readline from -[Mac Ports http://www.macports.org/]. To install, see above item. - -The Windows binary is easiest if you have -[Cygwin http://www.cygwin.com/]. To install, see above item. diff --git a/src/Makefile b/src/Makefile index eb645642b..e64c738ea 100644 --- a/src/Makefile +++ b/src/Makefile @@ -209,10 +209,7 @@ binary-dist: ./configure --host="$(host)" --build="$(build)" $(MAKE) all $(INSTALL) ../bin/$(GF_EXE) tools/$(GF_DOC_EXE) $(BIN_DIST_DIR) - $(INSTALL) -m 0644 JavaGUI/gf-java.jar $(BIN_DIST_DIR) - $(INSTALL) -m 0644 $(GFEDITOR)/gfeditor.jar $(BIN_DIST_DIR) $(INSTALL) configure config.guess config.sub install-sh $(BIN_DIST_DIR) - $(INSTALL) -m 0644 config.mk.in jgf.in gfeditor.in $(BIN_DIST_DIR) $(INSTALL) -m 0644 ../README ../LICENSE $(BIN_DIST_DIR) $(INSTALL) -m 0644 INSTALL.binary $(BIN_DIST_DIR)/INSTALL $(INSTALL) -m 0644 Makefile.binary $(BIN_DIST_DIR)/Makefile diff --git a/src/gfc.in b/src/gfc.in index 05addb2cb..9edd00ff0 100644 --- a/src/gfc.in +++ b/src/gfc.in @@ -11,14 +11,14 @@ exec_prefix="@exec_prefix@" GF_BIN_DIR="@bindir@" GF_DATA_DIR="@datadir@/GF-@PACKAGE_VERSION@" -GFBIN="$GF_BIN_DIR/gf3" +GFBIN="$GF_BIN_DIR/gf" if [ ! -x "${GFBIN}" ]; then - GFBIN=`which gf3` + GFBIN=`which gf` fi if [ ! -x "${GFBIN}" ]; then - echo "gf3 not found." + echo "gf not found." exit 1 fi