summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2010-11-08 05:50:50 +0100
committerSven Gothel <[email protected]>2010-11-08 05:50:50 +0100
commit08a74fb5d45f29f4d77a2713d1ebca4343519eb0 (patch)
treed543c60bcb9b45cb31de253b7b33bbc950b25c55
parent2c6ec665b1a755bbb7538a0c20075d5f640d57c9 (diff)
Proper antlr.jar in NB projects.xml (2nd try)
-rwxr-xr-xmake/build.xml2
-rwxr-xr-xnbproject/project.xml8
2 files changed, 5 insertions, 5 deletions
diff --git a/make/build.xml b/make/build.xml
index 61a1e8c..7bc63c6 100755
--- a/make/build.xml
+++ b/make/build.xml
@@ -422,7 +422,7 @@
excludes="com/jogamp/gluegen/runtime/** com/jogamp/gluegen/test/**" />
</copy>
- <!-- bootclasspath="${javac.bootclasspath-cdc.jar}"-->
+ <!-- bootclasspath="${javac.bootclasspath-cdc.jar}"-->
<javac destdir="${classes-cdc}"
source="1.4"
debug="true"
diff --git a/nbproject/project.xml b/nbproject/project.xml
index d328bc3..81ca39e 100755
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -224,20 +224,20 @@
<java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/2">
<compilation-unit>
<package-root>src/java</package-root>
- <classpath mode="compile">build/classes:${jdk.home}/lib/tools.jar:/usr/share/ant/lib/ant.jar:/home/mbien/netbeans68/java3/ant/lib/ant.jar:lib/antlr.jar</classpath>
+ <classpath mode="compile">build/classes:${jdk.home}/lib/tools.jar:/usr/share/ant/lib/ant.jar:/home/mbien/netbeans68/java3/ant/lib/ant.jar:make/lib/antlr.jar</classpath>
<built-to>build/classes</built-to>
<source-level>1.5</source-level>
</compilation-unit>
<compilation-unit>
<package-root>build/gensrc/java</package-root>
- <classpath mode="compile">build/classes:lib/antlr-3.2.jar:${jdk.home}/lib/tools.jar:${ant.core.lib}</classpath>
+ <classpath mode="compile">build/classes:make/lib/antlr.jar:${jdk.home}/lib/tools.jar:${ant.core.lib}</classpath>
<built-to>build/classes</built-to>
<source-level>1.5</source-level>
</compilation-unit>
<compilation-unit>
<package-root>test/junit</package-root>
<unit-tests/>
- <classpath mode="compile">build/classes:build/test/build/classes:lib/antlr-3.2.jar:${jdk.home}/lib/tools.jar:${ant.core.lib}:make/lib/junit.jar</classpath>
+ <classpath mode="compile">build/classes:build/test/build/classes:make/lib/antlr.jar:${jdk.home}/lib/tools.jar:${ant.core.lib}:make/lib/junit.jar</classpath>
<built-to>build/classes</built-to>
<source-level>1.5</source-level>
</compilation-unit>
@@ -253,7 +253,7 @@
<compilation-unit>
<package-root>src/junit</package-root>
<unit-tests/>
- <classpath mode="compile">build/classes:build/test/build/classes:lib/antlr-3.2.jar:${jdk.home}/lib/tools.jar:${ant.core.lib}:make/lib/junit.jar</classpath>
+ <classpath mode="compile">build/classes:build/test/build/classes:make/lib/antlr.jar:${jdk.home}/lib/tools.jar:${ant.core.lib}:make/lib/junit.jar</classpath>
<source-level>1.5</source-level>
</compilation-unit>
</java-data>