You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by fu...@apache.org on 2005/01/26 01:50:23 UTC
svn commit: r126451 - in incubator/derby/code/trunk: . java/engine/org/apache/derby/iapi java/engine/org/apache/derby/iapi/services java/engine/org/apache/derby/iapi/services/crypto java/engine/org/apache/derby/impl java/engine/org/apache/derby/jdbc
Author: fuzzylogic
Date: Tue Jan 25 16:50:21 2005
New Revision: 126451
URL: http://svn.apache.org/viewcvs?view=rev&rev=126451
Log:
Build file changes for gump
Modified:
incubator/derby/code/trunk/build.xml
incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/build.xml
incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/build.xml
incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/build.xml
incubator/derby/code/trunk/java/engine/org/apache/derby/impl/build.xml
incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/build.xml
Modified: incubator/derby/code/trunk/build.xml
Url: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/build.xml?view=diff&rev=126451&p1=incubator/derby/code/trunk/build.xml&r1=126450&p2=incubator/derby/code/trunk/build.xml&r2=126451
==============================================================================
--- incubator/derby/code/trunk/build.xml (original)
+++ incubator/derby/code/trunk/build.xml Tue Jan 25 16:50:21 2005
@@ -1047,4 +1047,36 @@
</target>
+ <target name="gump_split_1" depends="insane,init,state,parsers">
+ <ant dir="${derby.engine.src.dir}" target="engine_169"/>
+ <ant dir="${derby.engine.dir}/iapi" target="compile_iapi_error"/>
+ <ant dir="${derby.engine.dir}/iapi/jdbc" target="compile_iapi_jdbc_jsr169"/>
+ <ant dir="${derby.engine.dir}/iapi/jdbc" target="compile_iapi_jdbc_stmt"/>
+ </target>
+
+ <target name="gump_split_2">
+ <ant dir="${derby.engine.dir}/iapi/jdbc" target="compile_iapi_jdbc_jdbc2"/>
+ </target>
+
+ <target name="gump_split_3">
+ <ant dir="${derby.engine.dir}/iapi" target="compile_iapi_jdbc"/>
+ <ant dir="${derby.engine.dir}/impl" target="compile"/>
+ <ant dir="${derby.engine.dir}/impl/jdbc" target="compile_jsr169"/>
+ </target>
+
+ <target name="gump_split_4">
+ <ant dir="${derby.engine.dir}/impl/jdbc" target="compile_jdbc2"/>
+ </target>
+
+ <target name="gump_split_5">
+ <ant dir="${derby.engine.dir}/impl"/>
+ <ant dir="${derby.engine.dir}/jdbc" target="compile_jsr169"/>
+ </target>
+
+ <target name="gump_split_6">
+ <ant dir="${derby.engine.dir}/jdbc" target="compile_jdbc2"/>
+ </target>
+
+ <target name="gump_split_7" depends="all,buildjars,javadoc"/>
+
</project>
Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/build.xml
Url: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/build.xml?view=diff&rev=126451&p1=incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/build.xml&r1=126450&p2=incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/build.xml&r2=126451
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/build.xml (original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/build.xml Tue Jan 25 16:50:21 2005
@@ -17,13 +17,12 @@
<property file="${properties.dir}/compilepath.properties"/>
<!-- Targets -->
- <target name="iapi" depends="compile_iapi_error"/>
+ <target name="iapi" depends="compile_iapi_error,compile_iapi_jdbc"/>
<target name="compile_iapi_error" depends="compile_iapi_error_jsr169" >
<ant dir="${derby.engine.dir}/iapi/services"/>
<ant dir="${derby.engine.dir}/iapi/store"/>
<ant dir="${derby.engine.dir}/iapi/sql"/>
- <ant dir="${derby.engine.dir}/iapi/jdbc"/>
</target>
<target name="compile_iapi_error_jsr169">
@@ -51,6 +50,13 @@
<ant dir="${derby.engine.dir}/iapi/sql" target="compile_iapi_sql_jsr169" />
<ant dir="${derby.engine.dir}/iapi/db"/>
<ant dir="${derby.engine.dir}/iapi/jdbc" target="compile_iapi_jdbc_jsr169" />
+
+ </target>
+
+ <target name="compile_iapi_jdbc">
+
+ <ant dir="${derby.engine.dir}/iapi/jdbc"/>
+
</target>
</project>
Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/build.xml
Url: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/build.xml?view=diff&rev=126451&p1=incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/build.xml&r1=126450&p2=incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/build.xml&r2=126451
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/build.xml (original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/build.xml Tue Jan 25 16:50:21 2005
@@ -42,11 +42,11 @@
<ant dir="${derby.engine.dir}/iapi/services/io"/>
</target>
- <target name="compile_jdbc2" depends="compile_iapi_services_jsr169">
- <ant dir="${derby.engine.dir}/iapi/services/crypto" target="compile_jdbc2"/>
+ <target name="compile_crypto" depends="compile_iapi_services_jsr169">
+ <ant dir="${derby.engine.dir}/iapi/services/crypto" target="compile_crypto"/>
</target>
- <target name="compile_jdbc3" depends="compile_jdbc2">
+ <target name="compile_jdbc3" depends="compile_crypto">
</target>
</project>
Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/build.xml
Url: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/build.xml?view=diff&rev=126451&p1=incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/build.xml&r1=126450&p2=incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/build.xml&r2=126451
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/build.xml (original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/build.xml Tue Jan 25 16:50:21 2005
@@ -17,7 +17,7 @@
<property file="${properties.dir}/compilepath.properties"/>
<!-- Targets -->
- <target name="compile_jdbc2">
+ <target name="compile_crypto">
<javac
bootclasspath="${empty}"
nowarn="on"
@@ -31,7 +31,7 @@
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: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/build.xml
Url: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/engine/org/apache/derby/impl/build.xml?view=diff&rev=126451&p1=incubator/derby/code/trunk/java/engine/org/apache/derby/impl/build.xml&r1=126450&p2=incubator/derby/code/trunk/java/engine/org/apache/derby/impl/build.xml&r2=126451
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/build.xml (original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/build.xml Tue Jan 25 16:50:21 2005
@@ -17,15 +17,18 @@
<property file="${properties.dir}/compilepath.properties"/>
<!-- Targets -->
- <target name="iapi" depends="compile"/>
+ <target name="iapi" depends="compile,compile_impl_jdbc"/>
<target name="compile" depends="compile_impl_169">
<ant dir="${derby.engine.dir}/impl/services"/>
<ant dir="${derby.engine.dir}/impl/io"/>
<ant dir="${derby.engine.dir}/impl/store"/>
<ant dir="${derby.engine.dir}/impl/db"/>
- <ant dir="${derby.engine.dir}/impl/jdbc"/>
<ant dir="${derby.engine.dir}/impl/load"/>
+ </target>
+
+ <target name="compile_impl_jdbc">
+ <ant dir="${derby.engine.dir}/impl/jdbc"/>
</target>
<target name="compile_impl_169">
Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/build.xml
Url: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/build.xml?view=diff&rev=126451&p1=incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/build.xml&r1=126450&p2=incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/build.xml&r2=126451
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/build.xml (original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/build.xml Tue Jan 25 16:50:21 2005
@@ -17,7 +17,7 @@
<property file="${properties.dir}/compilepath.properties"/>
<!-- Targets -->
- <target name="jdbc" depends="compile_jdbc"/>
+ <target name="jdbc" depends="compile_jdbc2,compile_jdbc3"/>
<!-- build targets which need jdbc2.0 libs in the end-->
<!-- first build all non-special (non jdbc2.0) targets-->
@@ -40,7 +40,8 @@
</javac>
</target>
- <target name="compile_jdbc" depends="compile_jsr169">
+ <target name="compile_jdbc2" depends="compile_jsr169">
+
<javac
bootclasspath="${empty}"
nowarn="on"
@@ -63,6 +64,11 @@
<include name="${derby.dir}/jdbc/Driver20.java"/>
</javac>
+
+ </target>
+
+ <target name="compile_jdbc3">
+
<javac
bootclasspath="${empty}"
nowarn="on"