diff options
| -rw-r--r-- | build.xml | 10 | ||||
| -rw-r--r-- | nbproject/project.properties | 26 |
2 files changed, 21 insertions, 15 deletions
@@ -5,6 +5,12 @@ <description>Builds, tests, and runs the project JOCL.</description> + <condition property="rootrel.build" value="build"> + <not> + <isset property="rootrel.build"/> + </not> + </condition> + <import file="nbproject/build-impl.xml"/> <property name="gluegen.root" value="../gluegen" /> @@ -243,7 +249,7 @@ windowtitle="${javadoc.windowtitle}"> <arg line="${javadoc.additionalparam} -J-Dnativetaglet.mapping=${basedir}/resources/native-taglet.properties"/> - <taglet name="net.highteq.nativetaglet.NativeTaglet" path="${gluegen.root}/build/gluegen.jar:/home/jogamp/NetBeansProjects/JOGL/jocl/"/> + <taglet name="net.highteq.nativetaglet.NativeTaglet" path="${gluegen.root}/${rootrel.build}/gluegen.jar:/home/jogamp/NetBeansProjects/JOGL/jocl/"/> <classpath> <pathelement path="${javac.classpath}"/> @@ -263,4 +269,4 @@ </javadoc> </target> -</project>
\ No newline at end of file +</project> diff --git a/nbproject/project.properties b/nbproject/project.properties index d85b9790..cee9ac9c 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -5,10 +5,10 @@ javac.processorpath=\ ${javac.classpath} application.title=JOCL application.vendor=Michael Bien -build.classes.dir=${build.dir}/classes build.classes.excludes=**/*.java,**/*.form,**/*.c # This directory is removed when the project is cleaned: -build.dir=build +build.dir=${rootrel.build} +build.classes.dir=${build.dir}/classes build.generated.dir=${build.dir}/generated build.generated.sources.dir=${build.dir}/generated-sources # Only compile against the classpath explicitly listed here: @@ -32,11 +32,11 @@ file.reference.junit-4.8.1.jar=lib/junit_4/junit-4.8.1.jar #default value, overwrite this or pass it as -D ant property if required gluegen.root=../gluegen jogl.root=../jogl -file.reference.gluegen-rt.jar=${gluegen.root}/build/gluegen-rt.jar -file.reference.gluegen.jar=${gluegen.root}/build/gluegen.jar -file.reference.jogl.all.jar=${jogl.root}/build/jogl/jogl.all.jar -file.reference.nativewindow.all.jar=${jogl.root}/build/nativewindow/nativewindow.all.jar -file.reference.newt.all.jar=${jogl.root}/build/newt/newt.all.jar +file.reference.gluegen-rt.jar=${gluegen.root}/${rootrel.build}/gluegen-rt.jar +file.reference.gluegen.jar=${gluegen.root}/${rootrel.build}/gluegen.jar +file.reference.jogl.all.jar=${jogl.root}/${rootrel.build}/jogl/jogl.all.jar +file.reference.nativewindow.all.jar=${jogl.root}/${rootrel.build}/nativewindow/nativewindow.all.jar +file.reference.newt.all.jar=${jogl.root}/${rootrel.build}/newt/newt.all.jar includes=** jar.compress=false @@ -83,16 +83,16 @@ run.classpath=\ # (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value # or test-sys-prop.name=value to set system properties for unit tests): run.jvmargs=-Xmx256m -Djava.library.path=\ - "${basedir}/build/natives/jocl${path.separator}\ - ${gluegen.root}/build/obj" + "${basedir}/${rootrel.build}/natives/jocl${path.separator}\ + ${gluegen.root}/${rootrel.build}/obj" run.test.classpath=\ ${javac.test.classpath}:\ ${build.test.classes.dir} source.encoding=UTF-8 -source.reference.gluegen-rt.jar=${gluegen.root}/src/java:${gluegen.root}/build/gensrc/java -source.reference.jogl.all.jar=${jogl.root}/build/jogl/classes -source.reference.nativewindow.all.jar=${jogl.root}/build/nativewindow/gensrc/classes/ -source.reference.newt.all.jar=${jogl.root}/build/newt/classes +source.reference.gluegen-rt.jar=${gluegen.root}/src/java:${gluegen.root}/${rootrel.build}/gensrc/java +source.reference.jogl.all.jar=${jogl.root}/${rootrel.build}/jogl/classes +source.reference.nativewindow.all.jar=${jogl.root}/${rootrel.build}/nativewindow/gensrc/classes/ +source.reference.newt.all.jar=${jogl.root}/${rootrel.build}/newt/classes src.dir=src src.java.dir=gensrc/java src.native.dir=gensrc/native |