Put junit.jar 4.8.2, antlr.jar 2.7.7 into make/lib, and use it as the default, if not specified otherwise in /home/sven/gluegen.properties

13 files changed, 23 insertions, 52 deletions

diff --git a/make/build-junit.xml b/make/build-junit.xml
index dc0506b..ad625ba 100644
--- a/make/build-junit.xml
+++ b/make/build-junit.xml
@@ -4,10 +4,6 @@
 
     <description>JUNIT Tests GlueGen</description>
 
-    <!-- On jpackage.org-compatible systems, antlr.jar can be found in /usr/share/java -->
-    <available property="antlr.jar" file="/usr/share/java/antlr.jar"
-              value="/usr/share/java/antlr.jar"/>
-
     <property name="gluegen.root" value=".." />
 
     <import file="gluegen-cpptasks.xml" />
@@ -53,8 +49,6 @@
         <property name="gluegen-rt.jar" location="${gluegen.root}/${rootrel.build}/gluegen-rt.jar" />
         <property name="gluegen.lib" value="${gluegen.root}/${rootrel.build}/obj" />
 
-        <property name="junit.jar" value="${gluegen.root}/make/lib/junit-4.5.jar" />
-
         <property name="gluegen-test.jar" location="${build_t}/gluegen-test.jar" />
 
         <path id="gluegen.classpath">
diff --git a/make/build.xml b/make/build.xml
index c49c714..722e601 100755
--- a/make/build.xml
+++ b/make/build.xml
@@ -22,10 +22,6 @@
   <!-- This is the version of GlueGen you are building -->
   <property name="gluegen_base_version" value="1.0-beta07"/>
 
-   <!-- On jpackage.org-compatible systems, antlr.jar can be found in /usr/share/java -->
-   <available property="antlr.jar" file="/usr/share/java/antlr.jar"
-              value="/usr/share/java/antlr.jar"/>
-
   <import file="gluegen-cpptasks.xml" />
 
   <condition property="rootrel.build" value="build">
@@ -653,7 +649,7 @@
 
       <javac destdir="${build}/test/build/classes" failonerror="false" source="1.5" srcdir="${gluegen.root}/test/junit" debug="true" debuglevel="lines,vars,source"
              includeAntRuntime="false">
-          <classpath path="${gluegen.root}/make/lib/junit-4.5.jar:${build}/classes:${build}/test/gensrc/java:${tools.jar}:${ant.core.lib}"/>
+          <classpath path="${junit.jar}:${build}/classes:${build}/test/gensrc/java:${tools.jar}:${ant.core.lib}"/>
       </javac>
 
       <junit forkmode="once" showoutput="true" fork="true">
@@ -671,7 +667,7 @@
               <formatter usefile="true" type="xml"/>
           </batchtest>
           <classpath>
-              <path path="${build}/test/build/classes:${build}/test/gensrc/java:${build}/classes:${antlr.jar}:${gluegen.root}/make/lib/junit-4.5.jar:${tools.jar}:${ant.core.lib}"/>
+              <path path="${build}/test/build/classes:${build}/test/gensrc/java:${build}/classes:${antlr.jar}:${junit.jar}:${tools.jar}:${ant.core.lib}"/>
           </classpath>
       </junit>
   </target>
diff --git a/make/gluegen-properties.xml b/make/gluegen-properties.xml
index 2afc533..ec3b988 100755
--- a/make/gluegen-properties.xml
+++ b/make/gluegen-properties.xml
@@ -35,17 +35,14 @@
     <!-- Load the user specified properties file that defines various host
       - specific paths.  The user will be notified if this is does not
       - exist. -->
-    <condition property="gluegen.user.properties.file"
-                 value="${user.home}/gluegen.properties">
-      <not>
-        <isset property="gluegen.user.properties.file" />
-      </not>
-    </condition>
+    <property name="gluegen.user.properties.file" value="${user.home}/gluegen.properties"/>
     <property name="gluegen.user.properties.file.set" value="${gluegen.user.properties.file}"/>
     <property file="${gluegen.user.properties.file.set}" />
     <echo message="Loaded ${gluegen.user.properties.file.set}." />
-    <fail message="antlr.jar was not specified in gluegen.properties. Please see README.txt for instructions" unless="antlr.jar"/>
+    <property name="antlr.jar" value="${gluegen.root}/make/lib/antlr.jar" />
+    <property name="junit.jar" value="${gluegen.root}/make/lib/junit.jar" />
     <echo message="antlr.jar=${antlr.jar}" />
+    <echo message="junit.jar=${junit.jar}" />
   </target>
 
 </project>
diff --git a/make/gluegen.properties b/make/gluegen.properties
index 2f319bc..29b3351 100755
--- a/make/gluegen.properties
+++ b/make/gluegen.properties
@@ -9,17 +9,18 @@
 #
 ###############################################################################
 #
-# The required antlr.jar property that is the full path to the antlr.jar
-# including the name of the jar
+# You may include a custom antlr.jar file in the antlr.jar property.
 #
 # Windows
-antlr.jar=C:/JOGL/lib/antlr-2.7.2.jar
+# antlr.jar=C:/JOGL/lib/antlr-2.7.7.jar
 # Linux / Solaris / ..
 # antlr.jar=/home/sven/projects/JOGL/lib/antlr-2.7.7.jar
 # Mac OS X
-# antlr.jar=/JOGL/lib/antlr-2.7.2.jar
+# antlr.jar=/JOGL/lib/antlr-2.7.7.jar
 
-junit.jar=/home/sven/projects/JOGL/lib/junit-4.5.jar
+# You may include a custom junit.jar file in the junit.jar property.
+#
+# junit.jar=/home/sven/projects/JOGL/lib/junit.jar
 
 # If you are building the native code for the GlueGen run-time library
 # on Windows and have the Microsoft Visual C++ compilers installed,
diff --git a/make/lib/antlr.jar b/make/lib/antlr.jar
new file mode 100644
index 0000000..42f25e5
--- /dev/null
+++ b/make/lib/antlr.jar
diff --git a/make/lib/antlr.txt b/make/lib/antlr.txt
new file mode 100644
index 0000000..74b17b3
--- /dev/null
+++ b/make/lib/antlr.txt
@@ -0,0 +1 @@
+version 2.7.7
diff --git a/make/lib/junit-4.5.jar b/make/lib/junit-4.5.jar
deleted file mode 100644
index 7339216..0000000
--- a/make/lib/junit-4.5.jar
+++ /dev/null
diff --git a/make/lib/junit.jar b/make/lib/junit.jar
new file mode 100644
index 0000000..5b4bb84
--- /dev/null
+++ b/make/lib/junit.jar
diff --git a/make/lib/junit.txt b/make/lib/junit.txt
new file mode 100644
index 0000000..c7b67bc
--- /dev/null
+++ b/make/lib/junit.txt
@@ -0,0 +1 @@
+version 4.8.2
diff --git a/make/validate-properties.xml b/make/validate-properties.xml
index 195fb2a..42fd16f 100755
--- a/make/validate-properties.xml
+++ b/make/validate-properties.xml
@@ -5,25 +5,6 @@
   -->
 <project name="Configuration validator" default="validate">
 
-    <!-- ================================================================== -->
-    <!-- 
-       - Ensure that "antlr.jar" is set.
-      -->
-    <target name="antlr.jar.validate" unless="antlr.jar">
-        <fail>
-        
-    ********************************************************************
-    ** The property "antlr.jar" was not set in the GlueGen properties **
-    ** file                                                           **
-    ** "${user.properties.file}"                  **
-    ** (or this file was not found).                                  **
-    **                                                                **
-    ** Please set "antlr.jar" to to the full path of the ANTLR jar    **
-    ** including the jar itself.                                      **
-    ********************************************************************
-        </fail>
-    </target>
-
     <!-- 
        - Make sure that gluegen.jar is not on the CLASSPATH; this can cause
        - builds to fail since if this Java process has the jar file open
@@ -45,7 +26,7 @@
     <!-- 
        - Validate the required properties 
       -->
-    <target name="validate" depends="antlr.jar.validate, java.class.path.validate" 
+    <target name="validate" depends="java.class.path.validate" 
             description="Validate required properties" />
 
 </project>
diff --git a/nbproject/ide-file-targets.xml b/nbproject/ide-file-targets.xml
index 46dc184..343f527 100644
--- a/nbproject/ide-file-targets.xml
+++ b/nbproject/ide-file-targets.xml
@@ -5,21 +5,21 @@
     <target name="compile-test">
         <mkdir dir="build/test/build/classes"/>
         <javac debug="true" debuglevel="lines,vars,source" destdir="build/test/build/classes" failonerror="false" source="1.5" srcdir="test/junit">
-            <classpath path="build/test/build/classes:build/classes:build/test/gensrc/java:lib/antlr-3.2.jar:make/lib/junit-4.5.jar:${jdk.home}/lib/tools.jar:${ant.core.lib}"/>
+            <classpath path="build/test/build/classes:build/classes:build/test/gensrc/java:lib/antlr-3.2.jar:make/lib/junit.jar:${jdk.home}/lib/tools.jar:${ant.core.lib}"/>
         </javac>
     </target>
     <target name="compile-selected-files-in-junit">
         <fail unless="files">Must set property 'files'</fail>
         <mkdir dir="build/test/build/classes"/>
         <javac debug="true" debuglevel="lines,vars,source" destdir="build/test/build/classes" includes="${files}" source="1.5" srcdir="test/junit">
-            <classpath path="build/test/build/classes:build/classes:build/test/gensrc/java:lib/antlr-3.2.jar:make/lib/junit-4.5.jar:${jdk.home}/lib/tools.jar:${ant.core.lib}"/>
+            <classpath path="build/test/build/classes:build/classes:build/test/gensrc/java:lib/antlr-3.2.jar:make/lib/junit.jar:${jdk.home}/lib/tools.jar:${ant.core.lib}"/>
         </javac>
     </target>
     <target depends="compile-test" name="run-selected-file-in-junit">
         <fail unless="run.class">Must set property 'run.class'</fail>
         <java classname="${run.class}" failonerror="true" fork="true">
             <classpath>
-                <path path="build/test/build/classes:build/classes:lib/antlr-3.2.jar:make/lib/junit-4.5.jar:${jdk.home}/lib/tools.jar:${ant.core.lib}"/>
+                <path path="build/test/build/classes:build/classes:lib/antlr-3.2.jar:make/lib/junit.jar:${jdk.home}/lib/tools.jar:${ant.core.lib}"/>
             </classpath>
         </java>
     </target>
@@ -29,7 +29,7 @@
             <test name="${run.class}"/>
             <jvmarg value="-Djava.library.path=${basedir}/build/test/build/natives"/>
             <classpath>
-                <path path="build/test/build/classes:build/test/gensrc/java:build/classes:lib/antlr-3.2.jar:make/lib/junit-4.5.jar:${jdk.home}/lib/tools.jar:${ant.core.lib}"/>
+                <path path="build/test/build/classes:build/test/gensrc/java:build/classes:lib/antlr-3.2.jar:make/lib/junit.jar:${jdk.home}/lib/tools.jar:${ant.core.lib}"/>
             </classpath>
             <formatter type="brief" usefile="false"/>
         </junit>
@@ -37,7 +37,7 @@
     <target depends="compile-test" name="debug-selected-file-in-junit">
         <fail unless="run.class">Must set property 'debug.class'</fail>
         <path id="cp">
-            <path path="build/test/build/classes:build/test/gensrc/java:build/classes:lib/antlr-3.2.jar:make/lib/junit-4.5.jar:${jdk.home}/lib/tools.jar:${ant.core.lib}"/>
+            <path path="build/test/build/classes:build/test/gensrc/java:build/classes:lib/antlr-3.2.jar:make/lib/junit.jar:${jdk.home}/lib/tools.jar:${ant.core.lib}"/>
         </path>
         <nbjpdastart addressproperty="jpda.address" name="GlueGen" transport="dt_socket">
             <classpath refid="cp"/>
diff --git a/nbproject/project.xml b/nbproject/project.xml
index 66a1c6c..181c1d4 100755
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -237,7 +237,7 @@
             <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-4.5.jar</classpath>
+                <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>
                 <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-4.5.jar</classpath>
+                <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>
                 <source-level>1.5</source-level>
             </compilation-unit>
         </java-data>
diff --git a/test/junit/com/sun/gluegen/build.xml b/test/junit/com/sun/gluegen/build.xml
index 4889ab1..6622e0c 100644
--- a/test/junit/com/sun/gluegen/build.xml
+++ b/test/junit/com/sun/gluegen/build.xml
@@ -31,7 +31,7 @@
 
         <javac destdir="${build.dir.java}" source="1.5" failonerror="true" debug="true" debuglevel="lines,vars,source">
             <src path="${src.dir}"/>
-            <classpath path="${gluegen.root}/${rootrel.build}/classes:${src.dir}:${gluegen.root}/${rootrel.build}/antlr-3.2.jar:${gluegen.root}/make/lib/junit-4.5.jar:${tools.jar}:${ant.core.lib}"/>
+            <classpath path="${gluegen.root}/${rootrel.build}/classes:${src.dir}:${gluegen.root}/${rootrel.build}/antlr-3.2.jar:${gluegen.root}/make/lib/junit.jar:${tools.jar}:${ant.core.lib}"/>
         </javac>
 
         <echo message=" - - - java files compiled - - - "/>