From 7a2ef0bb0906f9efe3090418c4773ccb25f6efcb Mon Sep 17 00:00:00 2001 From: bjorn Date: Wed, 22 Oct 2008 13:29:57 +0000 Subject: [PATCH] Make GWT compilation easier. --- src/server/Makefile | 21 +++++++------------ src/server/gwt-client/Translate-compile | 4 ---- src/server/gwt-client/Translate-shell | 4 ---- .../gwt-client/Translate-shell-external | 4 ---- src/server/gwt/Translate-compile | 13 ++++++++++++ src/server/gwt/Translate-shell-external | 13 ++++++++++++ .../src/se/chalmers/cs/gf/gwt/PGF.gwt.xml | 0 .../chalmers/cs/gf/gwt/TranslateApp.gwt.xml | 0 .../cs/gf/gwt/client/CompletionOracle.java | 0 .../src/se/chalmers/cs/gf/gwt/client/PGF.java | 0 .../chalmers/cs/gf/gwt/client/PGFRequest.java | 0 .../cs/gf/gwt/client/TranslateApp.java | 0 .../chalmers/cs/gf/gwt/public/Translate.css | 0 .../chalmers/cs/gf/gwt/public/Translate.html | 0 14 files changed, 33 insertions(+), 26 deletions(-) delete mode 100644 src/server/gwt-client/Translate-compile delete mode 100644 src/server/gwt-client/Translate-shell delete mode 100644 src/server/gwt-client/Translate-shell-external create mode 100644 src/server/gwt/Translate-compile create mode 100644 src/server/gwt/Translate-shell-external rename src/server/{gwt-client => gwt}/src/se/chalmers/cs/gf/gwt/PGF.gwt.xml (100%) rename src/server/{gwt-client => gwt}/src/se/chalmers/cs/gf/gwt/TranslateApp.gwt.xml (100%) rename src/server/{gwt-client => gwt}/src/se/chalmers/cs/gf/gwt/client/CompletionOracle.java (100%) rename src/server/{gwt-client => gwt}/src/se/chalmers/cs/gf/gwt/client/PGF.java (100%) rename src/server/{gwt-client => gwt}/src/se/chalmers/cs/gf/gwt/client/PGFRequest.java (100%) rename src/server/{gwt-client => gwt}/src/se/chalmers/cs/gf/gwt/client/TranslateApp.java (100%) rename src/server/{gwt-client => gwt}/src/se/chalmers/cs/gf/gwt/public/Translate.css (100%) rename src/server/{gwt-client => gwt}/src/se/chalmers/cs/gf/gwt/public/Translate.html (100%) diff --git a/src/server/Makefile b/src/server/Makefile index 4ccf57182..1d4060391 100644 --- a/src/server/Makefile +++ b/src/server/Makefile @@ -1,13 +1,17 @@ GFCFLAGS = +RTS -K100M -RTS --cpu -.PHONY: pgf.fcgi run gf-gwt.jar +.PHONY: pgf.fcgi run gwt gf-gwt.jar pgf.fcgi: cabal install cp dist/build/pgf.fcgi/pgf.fcgi . gwt: - gwt-client/Translate-compile + gwt/Translate-compile + +gf-gwt.jar: gwt + jar -cf $@ -C gwt/src se + cp $@ ../../lib/java food.pgf: gfc --make --name=food ../../examples/tutorial/food/Food{Eng,Ita}.gf @@ -35,21 +39,10 @@ test.pgf: LangEng-parse.pgf LangGer-parse.pgf run: pgf.fcgi @echo '*********************************************' - @echo 'See http://localhost:41296/gwt-client/www/se.chalmers.cs.gf.gwt.TranslateApp/Translate.html' + @echo 'See http://localhost:41296/gwt/www/se.chalmers.cs.gf.gwt.TranslateApp/Translate.html' @echo '*********************************************' lighttpd -f lighttpd.conf -D -gwt-installball: pgf.fcgi gwt - rm -rf tmp/gwt-client - rm -f gf-server-installball.tar.gz - mkdir -p tmp/gwt-client - cp -pr gwt-client/www/se.chalmers.cs.gf.gwt_translate.Translate/* tmp/gwt-client - mv tmp/gwt-client/Translate.html tmp/gwt-client/index.html - (cd tmp && tar -zcf ../gwt-client-installball.tar.gz gwt-client) - -gf-gwt.jar: - jar -cf $@ -C gwt-client/src se - clean: cabal clean -rm -f pgf.fcgi \ No newline at end of file diff --git a/src/server/gwt-client/Translate-compile b/src/server/gwt-client/Translate-compile deleted file mode 100644 index 0880057c0..000000000 --- a/src/server/gwt-client/Translate-compile +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -APPDIR=`dirname $0`; -GWT_DIR="/Users/bringert/src/gwt-mac-1.5.2"; -java -XstartOnFirstThread -Xmx256M -cp "$APPDIR/src:$APPDIR/bin:$GWT_DIR/gwt-user.jar:$GWT_DIR/gwt-dev-mac.jar" com.google.gwt.dev.GWTCompiler -out "$APPDIR/www" "$@" se.chalmers.cs.gf.gwt.TranslateApp; diff --git a/src/server/gwt-client/Translate-shell b/src/server/gwt-client/Translate-shell deleted file mode 100644 index b6dd61ba1..000000000 --- a/src/server/gwt-client/Translate-shell +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -APPDIR=`dirname $0`; -GWT_DIR="/Users/bringert/src/gwt-mac-1.5.2"; -java -XstartOnFirstThread -Xmx256M -cp "$APPDIR/src:$APPDIR/bin:$GWT_DIR/gwt-user.jar:$GWT_DIR/gwt-dev-mac.jar" com.google.gwt.dev.GWTShell -out "$APPDIR/www" "$@" se.chalmers.cs.gf.gwt.TranslateApp/Translate.html; diff --git a/src/server/gwt-client/Translate-shell-external b/src/server/gwt-client/Translate-shell-external deleted file mode 100644 index 40d85a8a4..000000000 --- a/src/server/gwt-client/Translate-shell-external +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -APPDIR=`dirname $0`; -GWT_DIR="/Users/bringert/src/gwt-mac-1.5.2"; -java -XstartOnFirstThread -Xmx256M -cp "$APPDIR/src:$APPDIR/bin:$GWT_DIR/gwt-user.jar:$GWT_DIR/gwt-dev-mac.jar" com.google.gwt.dev.GWTShell -out "$APPDIR/www" -noserver "$@" http://localhost:41296/gwt-client/www/se.chalmers.cs.gf.gwt.TranslateApp/Translate.html; diff --git a/src/server/gwt/Translate-compile b/src/server/gwt/Translate-compile new file mode 100644 index 000000000..608f17e99 --- /dev/null +++ b/src/server/gwt/Translate-compile @@ -0,0 +1,13 @@ +#!/bin/sh + +APPDIR=`dirname $0`; + +if [ -z "$GWT_CLASSPATH" ]; then + echo 'ERROR: $GWT_CLASSPATH is not set' + echo 'Set $GWT_CLASSPATH to point to the GWT JAR files. For example:' + echo 'export GWT_DIR="/Users/bringert/src/gwt-mac-1.5.2"' + echo 'export GWT_CLASSPATH="$GWT_DIR/gwt-user.jar:$GWT_DIR/gwt-dev-mac.jar"' + exit 1 +fi + +java -XstartOnFirstThread -Xmx256M -cp "$APPDIR/src:$APPDIR/bin:$GWT_CLASSPATH" com.google.gwt.dev.GWTCompiler -out "$APPDIR/www" "$@" se.chalmers.cs.gf.gwt.TranslateApp; diff --git a/src/server/gwt/Translate-shell-external b/src/server/gwt/Translate-shell-external new file mode 100644 index 000000000..78a258ec5 --- /dev/null +++ b/src/server/gwt/Translate-shell-external @@ -0,0 +1,13 @@ +#!/bin/sh + +APPDIR=`dirname $0`; + +if [ -z "$GWT_CLASSPATH" ]; then + echo 'ERROR: $GWT_CLASSPATH is not set' + echo 'Set $GWT_CLASSPATH to point to the GWT JAR files. For example:' + echo 'export GWT_DIR="/Users/bringert/src/gwt-mac-1.5.2"' + echo 'export GWT_CLASSPATH="$GWT_DIR/gwt-user.jar:$GWT_DIR/gwt-dev-mac.jar"' + exit 1 +fi + +java -XstartOnFirstThread -Xmx256M -cp "$APPDIR/src:$APPDIR/bin:$GWT_CLASSPATH" com.google.gwt.dev.GWTShell -out "$APPDIR/www" -noserver "$@" http://localhost:41296/gwt/www/se.chalmers.cs.gf.gwt.TranslateApp/Translate.html; diff --git a/src/server/gwt-client/src/se/chalmers/cs/gf/gwt/PGF.gwt.xml b/src/server/gwt/src/se/chalmers/cs/gf/gwt/PGF.gwt.xml similarity index 100% rename from src/server/gwt-client/src/se/chalmers/cs/gf/gwt/PGF.gwt.xml rename to src/server/gwt/src/se/chalmers/cs/gf/gwt/PGF.gwt.xml diff --git a/src/server/gwt-client/src/se/chalmers/cs/gf/gwt/TranslateApp.gwt.xml b/src/server/gwt/src/se/chalmers/cs/gf/gwt/TranslateApp.gwt.xml similarity index 100% rename from src/server/gwt-client/src/se/chalmers/cs/gf/gwt/TranslateApp.gwt.xml rename to src/server/gwt/src/se/chalmers/cs/gf/gwt/TranslateApp.gwt.xml diff --git a/src/server/gwt-client/src/se/chalmers/cs/gf/gwt/client/CompletionOracle.java b/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/CompletionOracle.java similarity index 100% rename from src/server/gwt-client/src/se/chalmers/cs/gf/gwt/client/CompletionOracle.java rename to src/server/gwt/src/se/chalmers/cs/gf/gwt/client/CompletionOracle.java diff --git a/src/server/gwt-client/src/se/chalmers/cs/gf/gwt/client/PGF.java b/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/PGF.java similarity index 100% rename from src/server/gwt-client/src/se/chalmers/cs/gf/gwt/client/PGF.java rename to src/server/gwt/src/se/chalmers/cs/gf/gwt/client/PGF.java diff --git a/src/server/gwt-client/src/se/chalmers/cs/gf/gwt/client/PGFRequest.java b/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/PGFRequest.java similarity index 100% rename from src/server/gwt-client/src/se/chalmers/cs/gf/gwt/client/PGFRequest.java rename to src/server/gwt/src/se/chalmers/cs/gf/gwt/client/PGFRequest.java diff --git a/src/server/gwt-client/src/se/chalmers/cs/gf/gwt/client/TranslateApp.java b/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/TranslateApp.java similarity index 100% rename from src/server/gwt-client/src/se/chalmers/cs/gf/gwt/client/TranslateApp.java rename to src/server/gwt/src/se/chalmers/cs/gf/gwt/client/TranslateApp.java diff --git a/src/server/gwt-client/src/se/chalmers/cs/gf/gwt/public/Translate.css b/src/server/gwt/src/se/chalmers/cs/gf/gwt/public/Translate.css similarity index 100% rename from src/server/gwt-client/src/se/chalmers/cs/gf/gwt/public/Translate.css rename to src/server/gwt/src/se/chalmers/cs/gf/gwt/public/Translate.css diff --git a/src/server/gwt-client/src/se/chalmers/cs/gf/gwt/public/Translate.html b/src/server/gwt/src/se/chalmers/cs/gf/gwt/public/Translate.html similarity index 100% rename from src/server/gwt-client/src/se/chalmers/cs/gf/gwt/public/Translate.html rename to src/server/gwt/src/se/chalmers/cs/gf/gwt/public/Translate.html