[GNUnet-SVN] r13371 - in gnunet: bin contrib

[gnunet]

Author: grothoff
Date: 2010-10-22 16:16:59 +0200 (Fri, 22 Oct 2010)
New Revision: 13371

Added:
   gnunet/contrib/javacc.jar
Removed:
   gnunet/bin/javacc.jar
Modified:
   gnunet/bin/javacc
   gnunet/bin/jtb
Log:
move

Modified: gnunet/bin/javacc
===================================================================
--- gnunet/bin/javacc   2010-10-22 14:14:33 UTC (rev 13370)
+++ gnunet/bin/javacc   2010-10-22 14:16:59 UTC (rev 13371)
@@ -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 @@
  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
                

Deleted: gnunet/bin/javacc.jar
===================================================================
(Binary files differ)

Modified: gnunet/bin/jtb
===================================================================
--- gnunet/bin/jtb      2010-10-22 14:14:33 UTC (rev 13370)
+++ gnunet/bin/jtb      2010-10-22 14:16:59 UTC (rev 13371)
@@ -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/

Copied: gnunet/contrib/javacc.jar (from rev 13370, gnunet/bin/javacc.jar)
===================================================================
(Binary files differ)