db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fuzzylo...@apache.org
Subject svn commit: r492393 - in /db/derby/code/trunk: ./ java/engine/org/apache/derby/impl/sql/compile/ java/engine/org/apache/derby/jdbc/ java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/compatibility/ tools/ant/properties/
Date Thu, 04 Jan 2007 03:01:47 GMT
Author: fuzzylogic
Date: Wed Jan  3 19:01:45 2007
New Revision: 492393

URL: http://svn.apache.org/viewvc?view=rev&rev=492393
Log:
DERBY-1673: Remove mention of jikes in build instructions, buildfiles, and code.

Removed:
    db/derby/code/trunk/tools/ant/properties/jikes.properties
Modified:
    db/derby/code/trunk/BUILDING.txt
    db/derby/code/trunk/RELEASE-NOTES.html
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromTable.java
    db/derby/code/trunk/java/engine/org/apache/derby/jdbc/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/compatibility/build.xml

Modified: db/derby/code/trunk/BUILDING.txt
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/BUILDING.txt?view=diff&rev=492393&r1=492392&r2=492393
==============================================================================
--- db/derby/code/trunk/BUILDING.txt (original)
+++ db/derby/code/trunk/BUILDING.txt Wed Jan  3 19:01:45 2007
@@ -33,8 +33,7 @@
 2.2.5 Download and install JUnit 3.8.*
 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)
+2.2.8 Download J2ME/CDC/Foundation 1.0 and JSR169 jars (Optional)
 
 3     Build instructions
 3.1   Set required environmental variables
@@ -276,23 +275,7 @@
 ${derby.source}/tools/java/osgi.jar
 
 
-2.2.8 Download and Install Jikes 1.14 (Optional)
-
-This is an optional section.
-
-Jikes is an open source java compiler that improves compile 
-speed over standard java compiler. If you would like to have 
-improved compile speed, you can proceed to install Jikes. 
-Jikes 1.14 is the required version for derby builds.
-
-Jikes 1.14 can be downloaded from:
-    http://jikes.sourceforge.net/
-     
-Install Jikes 1.14 in any directory. This directory will be 
-referred to as the ${jikes.dir} directory in the rest of this 
-document. 
-
-2.2.9 Download J2ME/CDC/Foundation and JSR 169 jars
+2.2.8 Download J2ME/CDC/Foundation and JSR 169 jars
 
 This is an optional section.
 
@@ -327,13 +310,7 @@
 (2) Modify the PATH environment variable to include the 
     directory ${ant.dir}/bin in its list. This makes the "ant" 
     command line script available, which will be used to 
-    actually perform the build. Also, if you opted to install
-    jikes in section 2.2.8 of this document, add ${jikes.dir} 
-    to the PATH as well. For example:
-
-     setenv PATH ${ant.dir}/bin:${jikes.dir}:$PATH -- On unix(csh)
-     export PATH=${ant.dir}/bin:${jikes.dir}:$PATH -- On unix(ksh)
-     set PATH=${ant.dir}\bin;${jikes.dir};%PATH%   -- On Windows
+    actually perform the build. 
 
 (3) Create environment variable JAVA_HOME  to point to the 
     directory where you have installed JDK 1.4.x. For example:
@@ -444,14 +421,9 @@
       
     - build.compiler
 
-      This variable defines if standard java compiler or jikes is 
-      used for build. The default value of this variable is set to 
-      use standard java compiler for build. If you opted to install
-      jikes in section 2.2.8 of this document, you can give your 
-      option to use jikes for build by overwriting default value of 
-      this variable by setting it as following: 
-   
-          build.compiler=jikes
+      This variable defines the java compiler to be used for build. 
+      The default value of this variable is set to use the standard java 
+      compiler for build. 
 
     - proceed
 

Modified: db/derby/code/trunk/RELEASE-NOTES.html
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/RELEASE-NOTES.html?view=diff&rev=492393&r1=492392&r2=492393
==============================================================================
--- db/derby/code/trunk/RELEASE-NOTES.html (original)
+++ db/derby/code/trunk/RELEASE-NOTES.html Wed Jan  3 19:01:45 2007
@@ -244,9 +244,7 @@
 the JDBC4 support. Attach here the output of "java -version" run
 from your 1.6 installation.</li>
 <li><b>OSGi</b> - Say here whether you used osgi.jar to build org.apache.derby.osgi.EmbeddedActivator.</li>
-<li><b>Compiler</b> - Say which compiler you used. This could be a
-version of jikes. Or it could be javac (together with the output of
-the corresponding "java -version").</li>
+<li><b>Compiler</b> - Say which compiler you used. </li>
 <li><b>JSR 169</b> - Say whether you built the J2ME support and if so,
 which toolkit you used for this (e.g., java.sun.com/j2me or IBM WCTME 5.7).</li>
 </ul>

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromTable.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromTable.java?view=diff&rev=492393&r1=492392&r2=492393
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromTable.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromTable.java Wed Jan
 3 19:01:45 2007
@@ -844,10 +844,7 @@
             {
                 if (cd.isIndex() && ( ! isCoveringIndex(cd) ) )
                 {
-                    // workaround for a jikes bug. Can't directly reference a 
-                    // double with a value of 12.0 in this classfile. 
-                    double baseIndexUsage = 1.0;
-                    perRowUsage += ( baseIndexUsage + 11 );
+                    perRowUsage +=  12.0 ;
                 }
             }
         }

Modified: db/derby/code/trunk/java/engine/org/apache/derby/jdbc/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/jdbc/build.xml?view=diff&rev=492393&r1=492392&r2=492393
==============================================================================
--- 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 Jan  3 19:01:45 2007
@@ -80,45 +80,7 @@
 	    </javac>
 	  </target>
 	
-  <target name="compile_jdbc2" depends="checkjikessource,compile_jdbc2_gump,compile_jdbc2_nosource"/>
-
-  <target name="checkjikessource">
-    <condition property="jikes.source.set">
-      <isset property="jikes.source"/>
-    </condition>
-  </target>
-
-  <target name="compile_jdbc2_gump" depends="compile_jsr169" if="jikes.source.set">
-    <!-- add source argument to get around a problem compiling with -->
-    <!-- Jikes 1.22 in the gump nightly build.                      -->
-    <javac
-      source="${jikes.source}"
-      target="1.3"
-      bootclasspath="${empty}"
-      nowarn="on"
-      debug="${debug}"
-      depend="${depend}"
-      deprecation="${deprecation}"
-      optimize="${optimize}"
-      proceed="${proceed}"
-      verbose="${verbose}"
-      srcdir="${derby.engine.src.dir}"
-      destdir="${out.dir}">
-      <classpath>
-        <pathelement path="${java13compile.classpath}"/>
-      </classpath>
-      <include name="${derby.dir}/jdbc/EmbeddedDriver.java"/>
-      <include name="${derby.dir}/jdbc/ReferenceableDataSource.java"/>
-      <include name="${derby.dir}/jdbc/EmbeddedDataSource.java"/>
-      <include name="${derby.dir}/jdbc/EmbeddedConnectionPoolDataSource.java"/>
-      <include name="${derby.dir}/jdbc/EmbedPooledConnection.java"/>
-	  <include name="${derby.dir}/jdbc/Driver20.java"/>
-    </javac>
-  </target>
-
-  <target name="compile_jdbc2_nosource" depends="compile_jsr169" unless="jikes.source.set">
-    <!-- Do not use source attribute on javac to remain compatible with versions -->
-    <!-- of Jikes that do not have the source option.                            -->
+  <target name="compile_jdbc2" depends="compile_jsr169">
     <javac
       source="1.3"
       target="1.3"

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/compatibility/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/compatibility/build.xml?view=diff&rev=492393&r1=492392&r2=492393
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/compatibility/build.xml
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/compatibility/build.xml
Wed Jan  3 19:01:45 2007
@@ -56,15 +56,7 @@
  
   <target name="FTOtestsubdir" depends="compilex"/>
 
-  <target name="compilex" depends="checkjikessource,compilex_gump,compilex_nosource"/>
-
-  <target name="checkjikessource">
-    <condition property="jikes.source.set">
-      <isset property="jikes.source"/>
-    </condition>
-  </target>
-
-  <target name="compilex_nosource">
+  <target name="compilex">
     <javac
       source="1.3"
       target="1.3"
@@ -85,30 +77,6 @@
       <include name="${this.dir}/*.java"/>
     </javac>
   </target>
-
-  <!-- add source argument to get around a problem compiling with -->
-  <!-- Jikes 1.22 in the gump nightly build.                      -->
-  <target name="compilex_gump" if="jikes.source.set">
-    <javac
-      source="${jikes.source}"
-      target="1.3"
-      bootclasspath="${empty}"
-      nowarn="on"
-      debug="${debug}"
-      depend="${depend}"
-      deprecation="${deprecation}"
-      optimize="${optimize}"
-      proceed="${proceed}"
-      verbose="${verbose}" 
-      srcdir="${derby.testing.src.dir}"
-      destdir="${out.dir}">
-      <classpath>
-        <pathelement path="${java13compile.classpath}"/>
-	<pathelement path="${junit}"/>
-      </classpath>
-      <include name="${this.dir}/*.java"/>
-    </javac>
-  </target> 
 
 <!--             ============= End Targets ==============                -->
 



Mime
View raw message