diff options
| -rwxr-xr-x | tools/jackpotc/bttf | 8 | ||||
| -rwxr-xr-x | tools/jackpotc/setup | 15 | ||||
| -rw-r--r-- | tools/jackpotc/test/oldgears/nbproject/project.properties | 12 |
3 files changed, 30 insertions, 5 deletions
diff --git a/tools/jackpotc/bttf b/tools/jackpotc/bttf index 51472c568..b1aed8c72 100755 --- a/tools/jackpotc/bttf +++ b/tools/jackpotc/bttf @@ -1,8 +1,12 @@ #!/bin/bash SRC="./test/oldgears/src/" -LIBS="./test/oldgears/lib/jogl.jar:./test/oldgears/lib/jogl.all.jar:./test/oldgears/lib/jogl.awt.jar" +LIBS="./test/oldgears/lib/old/jogl.jar:./test/oldgears/lib/new/jogl.all.jar:./test/oldgears/lib/new/jogl.awt.jar" OUTPUT="./test/oldgears/build" +FILESET=`find $SRC -type f -name "*.java"` echo "Back to the Future" mkdir $OUTPUT -./lib/jackpotc -sourcepath $SRC -cp $LIBS -d $OUTPUT -Ajackpot30_extra_hints=./jogl1Tojogl2.hint `find $SRC -type f -name "*.java"` +./lib/jackpotc -sourcepath $SRC -cp $LIBS -d $OUTPUT -Ajackpot30_extra_hints=./jogl1Tojogl2.hint $FILESET + +echo "patching..." +patch -o ${OUTPUT}/Patched.java $FILESET ${OUTPUT}/META-INF/upgrade/upgrade.diff diff --git a/tools/jackpotc/setup b/tools/jackpotc/setup index f1ccc57ed..c68e5a9b9 100755 --- a/tools/jackpotc/setup +++ b/tools/jackpotc/setup @@ -3,3 +3,18 @@ mkdir lib cd ./lib wget http://bitbucket.org/jlahoda/jackpot30/downloads/jackpotc.zip unzip -oj jackpotc.zip + +cd ../test +mkdir oldgears/lib +mkdir oldgears/lib/new +mkdir oldgears/lib/old +cd oldgears/lib/new + +#TOCO temporary location +wget http://people.fh-landshut.de/~mbien/jogamp/ref/new/jogl.all.jar +wget http://people.fh-landshut.de/~mbien/jogamp/ref/new/jogl.awt.jar +wget http://people.fh-landshut.de/~mbien/jogamp/ref/new/gluegen-rt.jar + +cd ../old +wget http://people.fh-landshut.de/~mbien/jogamp/ref/old/jogl.jar +wget http://people.fh-landshut.de/~mbien/jogamp/ref/old/gluegen-rt.jar diff --git a/tools/jackpotc/test/oldgears/nbproject/project.properties b/tools/jackpotc/test/oldgears/nbproject/project.properties index afae06360..956bfe6ba 100644 --- a/tools/jackpotc/test/oldgears/nbproject/project.properties +++ b/tools/jackpotc/test/oldgears/nbproject/project.properties @@ -1,5 +1,9 @@ application.title=oldgears -application.vendor=mbien +application.vendor=the jogamp guy +annotation.processing.enabled=true +annotation.processing.enabled.in.editor=false +annotation.processing.run.all.processors=true + build.classes.dir=${build.dir}/classes build.classes.excludes=**/*.java,**/*.form # This directory is removed when the project is cleaned: @@ -22,8 +26,8 @@ dist.jar=${dist.dir}/oldgears.jar dist.javadoc.dir=${dist.dir}/javadoc endorsed.classpath= excludes= -file.reference.gluegen-rt.jar=lib/gluegen-rt.jar -file.reference.jogl.jar=lib/jogl.jar +file.reference.gluegen-rt.jar=lib/old/gluegen-rt.jar +file.reference.jogl.jar=lib/old/jogl.jar includes=** jar.compress=false javac.classpath=\ @@ -32,6 +36,8 @@ javac.classpath=\ # Space-separated list of extra javac options javac.compilerargs= javac.deprecation=false +javac.processorpath=\ + ${javac.classpath} javac.source=1.5 javac.target=1.5 javac.test.classpath=\ |