db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davi...@apache.org
Subject svn commit: r376008 - in /db/derby/code/trunk: ./ java/client/ java/engine/org/apache/derby/iapi/jdbc/ java/engine/org/apache/derby/impl/jdbc/ java/engine/org/apache/derby/jdbc/ java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/
Date Wed, 08 Feb 2006 17:52:16 GMT
Author: davidvc
Date: Wed Feb  8 09:52:14 2006
New Revision: 376008

URL: http://svn.apache.org/viewcvs?rev=376008&view=rev
Log:
DERBY-932 - removed need for jdk16.java variable, and fixed ordering
of section 2.2 in BUILDING.txt in response to Dan's comment

Modified:
    db/derby/code/trunk/BUILDING.txt
    db/derby/code/trunk/java/client/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/jdbc/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/build.xml

Modified: db/derby/code/trunk/BUILDING.txt
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/BUILDING.txt?rev=376008&r1=376007&r2=376008&view=diff
==============================================================================
--- db/derby/code/trunk/BUILDING.txt (original)
+++ db/derby/code/trunk/BUILDING.txt Wed Feb  8 09:52:14 2006
@@ -16,9 +16,10 @@
 2.2.3 Download and install Java Development Kit release 1.3.x
 2.2.4 Download extensions for Java Development Kit release 1.3.x
 2.2.5 Download and install JUnit 3.8.*
-2.2.6 Download OSGi Service Platform release 3 (osgi.jar) (Optional)
-2.2.7 Download Jikes 1.14 (Optional)
-2.2.8 Download J2ME/CDC/FOundation 1.0 and JSR169 jars (Optional)
+2.2.6 Download Java Development Kit release 1.6.x (Optional)
+2.2.7 Download OSGi Service Platform release 3 (osgi.jar) (Optional)
+2.2.8 Download Jikes 1.14 (Optional)
+2.2.9 Download J2ME/CDC/FOundation 1.0 and JSR169 jars (Optional)
 
 3     Build instructions
 3.1   Set required environmental variables
@@ -163,26 +164,8 @@
     referred to as ${jdk13.dir} in the rest of this document.
 
 
-2.2.4 Optional - Download and install Java Development Kit (JDK) 
-  release 1.6.x
-
-Skip steps 1-2 of this section if you already have JDK 1.6.x 
-installed on your system.
 
-(1) Download JDK 1.6 (aka "Mustang")
-    This is currently under development, and is available as a
-    release candidate at http://download.java.net/jdk6/binaries/
-  
-
-(2) Install JDK 1.6 according to the instructions in any directory. 
-
-    Verify that bin/javac(.exe) exists under the JDK install directory.
-
-(3) The directory where you have installed JDK 1.6 will be 
-    referred to as ${jdk16.dir} in the rest of this document.
-
-
-2.2.5 Download extensions for Java Development Kit release 1.3.x
+2.2.4 Download extensions for Java Development Kit release 1.3.x
 
 (1) JDBC 2.0
 
@@ -209,7 +192,7 @@
 
 
 
-2.2.6 Download and install JUnit 3.8.*
+2.2.5 Download and install JUnit 3.8.*
 
 (1) JUnit is needed for some of Derby's tests. Download a JUnit 3.8.*
     zip file from www.junit.org.
@@ -223,6 +206,26 @@
     ${derby.source}/tools/java.
 
 
+2.2.6 Optional - Download and install Java Development Kit (JDK) 
+  release 1.6.x
+
+Skip steps 1-2 of this section if you already have JDK 1.6.x 
+installed on your system.
+
+(1) Download JDK 1.6 (aka "Mustang")
+    This is currently under development, and is available as a
+    release candidate at http://download.java.net/jdk6/binaries/
+  
+
+(2) Install JDK 1.6 according to the instructions in any directory. 
+
+    Verify that bin/javac(.exe) exists under the JDK install directory.
+
+(3) The directory where you have installed JDK 1.6 will be 
+    referred to as ${jdk16.dir} in the rest of this document.
+
+
+
 2.2.7 Download OSGi Service Platform release 3 (osgi.jar) (Optional)
 
 This is an optional section.
@@ -403,14 +406,6 @@
       This is only needed if you want to build the JDK 1.6-specific
       code (e.g. JDBC 4 classes)
 
-    - Optional - jdk16.javac
-
-      This is the full path to the JDK 1.6 javac executable.  JDK 1.6
-      features are built by "forking" off a separate javac task, and
-      Ant requires you to specify a full path to the compiler executable.
-      This can not be determined from the $jdk16 proerty because of the
-      platform-specific extension on executables (e.g. ".exe" on Windows
-      platforms).
 
     - java14compile.classpath - IBM JVMs only
 

Modified: db/derby/code/trunk/java/client/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/client/build.xml?rev=376008&r1=376007&r2=376008&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/build.xml (original)
+++ db/derby/code/trunk/java/client/build.xml Wed Feb  8 09:52:14 2006
@@ -55,7 +55,7 @@
 <target name="compile_jdbc4" if="jdk16">
     <javac
       fork="yes"
-      executable="${jdk16.javac}"
+      executable="${jdk16}/bin/javac"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/build.xml?rev=376008&r1=376007&r2=376008&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/build.xml Wed Feb  8 09:52:14
2006
@@ -119,7 +119,7 @@
   <target name="compile_jdbc4" if="jdk16">
       <javac
           fork="yes"
-          executable="${jdk16.javac}"
+          executable="${jdk16}/bin/javac"
           bootclasspath="${empty}"
           nowarn="on"
           debug="${debug}"

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/build.xml?rev=376008&r1=376007&r2=376008&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/build.xml Wed Feb  8 09:52:14
2006
@@ -139,7 +139,7 @@
 <target name="compile_jdbc4" if="jdk16">
     <javac
         fork="yes"
-        executable="${jdk16.javac}"
+        executable="${jdk16}/bin/javac"
         bootclasspath="${empty}"
         nowarn="on"
         debug="${debug}"

Modified: db/derby/code/trunk/java/engine/org/apache/derby/jdbc/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/jdbc/build.xml?rev=376008&r1=376007&r2=376008&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/jdbc/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/jdbc/build.xml Wed Feb  8 09:52:14 2006
@@ -149,7 +149,7 @@
   <target name="compile_jdbc4" if="jdk16">
     <javac
         fork="yes"
-        executable="${jdk16.javac}"
+        executable="${jdk16}/bin/javac"
         bootclasspath="${empty}"
         nowarn="on"
         debug="${debug}"

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/build.xml?rev=376008&r1=376007&r2=376008&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/build.xml
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/build.xml
Wed Feb  8 09:52:14 2006
@@ -33,7 +33,7 @@
     <target name="compile_jdbc4" if="jdk16" depends="copyfiles">
         <javac
             fork="yes"
-            executable="${jdk16.javac}"
+            executable="${jdk16}/bin/javac"
             bootclasspath="${empty}"
             nowarn="on"
             debug="${debug}"



Mime
View raw message