db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject svn commit: r509739 - in /db/derby/code/trunk: java/engine/org/apache/derby/iapi/services/crypto/build.xml tools/ant/properties/compilepath.properties
Date Tue, 20 Feb 2007 20:25:12 GMT
Author: djd
Date: Tue Feb 20 12:25:11 2007
New Revision: 509739

URL: http://svn.apache.org/viewvc?view=rev&rev=509739
Log:
DERBY-1983 (partial) Add some comments to compilepath.propeties explaining the base and JSR169
compile paths.
Change one use of java13compile.classpath to java14compile.classpath.

Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/build.xml
    db/derby/code/trunk/tools/ant/properties/compilepath.properties

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/build.xml?view=diff&rev=509739&r1=509738&r2=509739
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/build.xml Tue Feb
20 12:25:11 2007
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 
-<project default="compile" basedir="../../../../../../../..">
+<project default="compile_crypto" basedir="../../../../../../../..">
 
 <!-- Set Properties -->
   <!-- User settings -->
@@ -35,8 +35,8 @@
 <!-- Targets -->
   <target name="compile_crypto">
     <javac
-      source="1.3"
-      target="1.3"
+      source="1.4"
+      target="1.4"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -48,8 +48,7 @@
       srcdir="${derby.engine.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <pathelement location="${jce1_2_1}"/>
-        <pathelement path="${java13compile.classpath}"/>
+         <pathelement path="${java14compile.classpath}"/>
       </classpath>
       <include name="${derby.dir}/iapi/services/crypto/*.java"/>
     </javac>

Modified: db/derby/code/trunk/tools/ant/properties/compilepath.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/ant/properties/compilepath.properties?view=diff&rev=509739&r1=509738&r2=509739
==============================================================================
--- db/derby/code/trunk/tools/ant/properties/compilepath.properties (original)
+++ db/derby/code/trunk/tools/ant/properties/compilepath.properties Tue Feb 20 12:25:11 2007
@@ -4,6 +4,14 @@
 
 empty=${javatools.dir}/empty.jar
 
+# jsr169compile.classpath
+# Set for an individual code line to enable the build
+# of JSR 169 (JDBC subset for J2ME/CDC/Foundation) classes.
+# When this is set compile.classpath can be left as-is
+# or set to the same value as jsr169compile.classpath
+# to ensure that the classes in the base set are also
+# suitable for J2ME/CDC/Foundation and thus do not rely on
+# JDK 1.3 methods/classes not in J2ME.
 
 # Java2 1.3 paths - for JDBC 2.0/JDK1.3
 # java13compile.classpath includes JDBC 2.0 and extensions.
@@ -21,7 +29,9 @@
 java14compile.classpath=${j14lib}/rt.jar;${j14lib}/jce.jar;${j14lib}/jsse.jar
 
 # base compile path
-
+# The lowest common denominator compile path for Derby.
+# Set to JDK 1.3 here but can also be set to the value
+# of jsr169compile.classpath for a code line (see above)
 compile.classpath=${java13compile.classpath}
 
 j16lib=${jdk16}/jre/lib



Mime
View raw message