move

diff --git a/bin/javacc b/bin/javacc
index 494d03d75654c47743814bc574ccb41244ee7b43..c82465c5c40e6be4e16f1b912aee860c7c59d094 100755 (executable)
--- a/bin/javacc
+++ b/bin/javacc
@@ -1,7 +1,7 @@
 #!/bin/sh
-
-cd "$@"/org/gnunet/seaspider/parser
-javacc -STATIC=false C.out.jj
+MYDIR=`dirname $0` 
+JAVACC_JAR=`echo ${MYDIR}/../contrib/javacc.jar`
+java -jar $JAVACC_JAR -STATIC=false $1
 echo 'package org.gnunet.monkey.parser;' > PACKAGE
 for n in *.java
 do
@@ -9,6 +9,7 @@ do
  mv PACKAGE $n
  echo 'package org.gnunet.monkey.parser;' > PACKAGE
 done
-
+mkdir -p org/gnunet/monkey/parser/
+mv *.java org/gnunet/monkey/parser
 rm -f PACKAGE
                

diff --git a/bin/javacc.jar b/bin/javacc.jar
deleted file mode 100644 (file)
index 2550727..0000000
Binary files a/bin/javacc.jar and /dev/null differ

diff --git a/bin/jtb b/bin/jtb
index 11fa581d2fb8c94d778aadf0e4c758234c119e0f..d2fb2c635ce241bea31e5dbc605675109b1e5651 100755 (executable)
--- a/bin/jtb
+++ b/bin/jtb
@@ -1,11 +1,7 @@
 #!/bin/sh
-
 MYDIR=`dirname $0`
 JTB_JAR=`echo ${MYDIR}/../contrib/jtb.jar`
-cd "$@"
-if [ -d "org/gnunet/seaspider/parser" ]; then
-       mkdir -p org/gnunet/seaspider/parser
-fi     
-cd org/gnunet/seaspider/parser 
-java -jar $JTB_JAR -printer -jd -np org.gnunet.seaspider.parser.nodes -vp org.gnunet.seaspider.parser.visitors -o C.out.jj "$@/C.jj"
-
+java -jar $JTB_JAR -printer -jd -np org.gnunet.seaspider.parser.nodes -vp org.gnunet.seaspider.parser.visitors -o C.out.jj "$1"
+rm -rf org/gnunet/seaspider/parser/
+mkdir -p org/gnunet/seaspider/parser/
+mv nodes visitors org/gnunet/seaspider/parser/

diff --git a/contrib/javacc.jar b/contrib/javacc.jar
new file mode 100644 (file)
index 0000000..2550727
Binary files /dev/null and b/contrib/javacc.jar differ