added api/Combinators for Eng

5 files changed, 98 insertions, 53 deletions

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,26 +13,45 @@
 <A HREF="../doc/darcs.html">GF darcs repository</A>
 </P>
 <H2>Latest release</H2>
+<UL>
+<LI><A HREF="gf-3.0beta-linux.gz">GF 3.0 beta Linux binary</A> (Intel, Ubuntu)
+<P></P>
+<LI><A HREF="gf-3.0beta-mac.gz">GF 3.0 beta MacOS X binary</A> (Intel Mac with Leopard)
+<P></P>
+<LI><A HREF="gf-3.0beta-mac.exe">GF 3.0 beta Windows binary</A>
+<P></P>
+<LI><A HREF="gf-3.0beta.tgz">GF 3.0 beta sources</A>
+<P></P>
+<LI><A HREF="gf-lib-1.4.tgz">GF libraries v 1.4</A> (compiled resource grammar libraries)
+</UL>
+
+<H2>Old releases</H2>
+<UL>
+<LI><A HREF="../../GF2/download/index.html">GF 2.9 download page</A>
+</UL>
+
+<H2>Installation instructions</H2>
 <P>
-<A HREF="gf-3.0beta-linux.gz">GF 3.0 beta Linux binary</A> (Intel, Ubuntu)
-</P>
-<P>
-<A HREF="gf-3.0beta-mac.gz">GF 3.0 beta MacOS X binary</A> (Intel Mac with Leopard)
+To install a binary, just uncompress it and copy to a place that is on your path,
+for instance, in <CODE>/usr/local/bin</CODE>.
 </P>
 <P>
-<A HREF="gf-3.0beta-mac.exe">GF 3.0 beta Windows binary</A>
+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 <I>not</I> <CODE>/usr/local/bin</CODE>, change
+the <CODE>prefix</CODE> variable in the script.
 </P>
+<UL>
+<LI><A HREF="./gfc">gfc script for patch compiler</A>
+</UL>
+
 <P>
-<A HREF="gf-3.0beta.tgz">GF 3.0 beta sources</A>
+The Mac OS X binary (Intel) requires Readline from
+<A HREF="http://www.macports.org/">Mac Ports</A>. To install, see above item.
 </P>
 <P>
-<A HREF="gf-lib-1.4.tgz">GF libraries v 1.4</A> (compiled resource grammar libraries)
+The Windows binary is easiest if you have
+<A HREF="http://www.cygwin.com/">Cygwin</A>. To install, see above item.
 </P>
-<H2>Old releases</H2>
-<P>
-<A HREF="../../GF2/download/index.html">GF 2.9 download page</A>
-</P>
-<H2>Installation instructions</H2>
 <P>
 To compile and install from source: 
 </P>
@@ -45,27 +64,20 @@ To compile and install from source:
     make install
 </PRE>
 <P>
-To install a binary,
+To install the libraries, unpack them in the place to which your
+<CODE>GF_LIB_PATH</CODE> points.
 </P>
 <PRE>
-    tar xvfz BINARY-PACKAGE.tgz
-    cd GF-...
-    ./configure
-    make install
+    cd $GF_LIB_PATH
+    gtar xvfz gf-lib-1.4.tgz
 </PRE>
 <P>
-You may need <CODE>sudo make install</CODE>. 
-If you cannot write in <CODE>/usr/local/</CODE>, you can change the target directory
-by <CODE>./configure --prefix=MYDIR</CODE>.
-</P>
-<P>
-The Mac OS X binary (Intel) requires Readline from
-<A HREF="http://www.macports.org/">Mac Ports</A>. To install, see above item.
-</P>
-<P>
-The Windows binary is easiest if you have
-<A HREF="http://www.cygwin.com/">Cygwin</A>. To install, see above item.
+If this variable hasn't been defined, it is useful define it, e.g.
 </P>
+<PRE>
+    export GF_LIB_PATH=/usr/local/lib/gf/
+</PRE>
+<P></P>
 
 <!-- html code generated by txt2tags 2.4 (http://txt2tags.sf.net) -->
 <!-- cmdline: txt2tags -thtml download/index.txt -->
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