db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kahat...@apache.org
Subject svn commit: r1222151 - in /db/derby/code/trunk/java/engine: build.xml org/apache/derby/iapi/build.xml org/apache/derby/iapi/sql/build.xml org/apache/derby/impl/build.xml org/apache/derby/jdbc/build.xml org/apache/derby/modules.properties
Date Thu, 22 Dec 2011 10:18:00 GMT
Author: kahatlen
Date: Thu Dec 22 10:18:00 2011
New Revision: 1222151

URL: http://svn.apache.org/viewvc?rev=1222151&view=rev
Log:
DERBY-4845: Improve the dependency tracking for our build targets

Build files should reflect that JSR-169 isn't optional. Simplifies the
scripts and removes some redundancies.

Modified:
    db/derby/code/trunk/java/engine/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/impl/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/jdbc/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/modules.properties

Modified: db/derby/code/trunk/java/engine/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/build.xml?rev=1222151&r1=1222150&r2=1222151&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/build.xml (original)
+++ db/derby/code/trunk/java/engine/build.xml Thu Dec 22 10:18:00 2011
@@ -50,14 +50,18 @@
 
 <!--             ============ Begin Targets ==============                -->
  
-  <target name="engine" depends="engine_j2se,engine_169,engine_169_opt"
+  <target name="engine"
           description="Build Derby engine">
-	</target>
-    <target name="engine_j2se" depends="engine_169"
-            description="Build Derby engine">
+    <ant dir="${derby.engine.dir}/iapi/reference"/>
+    <ant dir="${derby.engine.dir}/authentication"/>
+    <ant dir="${derby.engine.dir}/security"/>
+    <ant dir="${derby.engine.dir}/io"/>
+    <ant dir="${derby.engine.dir}/iapi"/>
+    <ant dir="${derby.engine.dir}/mbeans"/>
+    <ant dir="${derby.engine.dir}/database"/>
+
     <ant dir="${derby.engine.dir}/vti"/>
     <ant dir="${derby.engine.dir}/impl"/>
-    <ant dir="${derby.engine.dir}/iapi"/>
     <ant dir="${derby.engine.dir}/jdbc"/>
     <ant dir="${derby.engine.dir}/osgi"/>
     <ant dir="${derby.engine.dir}/catalog"/>   
@@ -68,51 +72,8 @@
           </fileset>
         </copy>
   </target>
-  
-  <target name="engine_169"
-          description="Build base JSR169 elements of Derby engine">
-    <ant dir="${derby.engine.dir}/iapi/reference"/>
-    <ant dir="${derby.engine.dir}/authentication"/>
-    <ant dir="${derby.engine.dir}/security"/> 
-    <ant dir="${derby.engine.dir}/io"/>
-     <ant dir="${derby.engine.dir}/iapi" target="compile_iapi_error_jsr169"/>
-    <ant dir="${derby.engine.dir}/mbeans"/>
-     <ant dir="${derby.engine.dir}/database"/>
-     <ant dir="${derby.engine.dir}/impl" target="compile_impl_169"/>
-
-
-  </target>
 	
-	<!-- optional JSR169 classes - optional because it requires a 
-	J2ME/CDC/Foundation/JSR169 build jar files.
-	jsr169compile.classpath
-	-->
-	  <target name="engine_169_opt"  depends="engine_j2se,J2ME_modules_edit"
-	          description="Build optional JSR169 elements of Derby engine"
-	  	      if="jsr169compile.classpath">
-	 <ant dir="${derby.engine.dir}/impl/jdbc" target="compile_jsr169_opt"/>
-     <ant dir="${derby.engine.dir}/jdbc" target="compile_jsr169_opt"/>
-	 
-	 </target>
 	
-	<target name="J2ME_modules_edit"  depends="checkJ2MEmoduleprops"
-		unless="modulesJ2ME.uptodate" if="jsr169compile.classpath">
-
-		<replaceregexp file="${out.dir}/${derby.dir}/modules.properties"
-		              match="^#J2ME_optional_(.*)"
-		              replace="\1"
-		              byline="true" />
-	<touch file="${out.dir}/${derby.dir}/modulesJ2ME.done"/>
-
-	</target> 	
-	
-	<target name="checkJ2MEmoduleprops">
-	  <condition property="modulesJ2ME.uptodate">
-	    <available file="${out.dir}/${derby.dir}/modulesJ2ME.done"/>
-	  </condition>
-	</target> 
-
-
 <!--             ============= End Targets ==============                -->
 
 <!--             ============= End Project ==============                -->

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/build.xml?rev=1222151&r1=1222150&r2=1222151&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/build.xml Thu Dec 22 10:18:00 2011
@@ -33,7 +33,7 @@
   <property file="${properties.dir}/compilepath.properties"/>
 
 <!-- Targets -->
-  <target name="iapi" depends="compile_iapi_error,compile_iapi_jdbc"/>
+  <target name="iapi" depends="compile_iapi_error"/>
 
   <target name="compile_iapi_error" depends="compile_iapi_error_jsr169" >
     <ant dir="${derby.engine.dir}/iapi/services"/>
@@ -82,16 +82,7 @@
     </javac>
     <ant dir="${derby.engine.dir}/iapi/types" />
     <ant dir="${derby.engine.dir}/iapi/util"/>
-    <ant dir="${derby.engine.dir}/iapi/services" target="compile_iapi_services_jsr169"
/>
-    <ant dir="${derby.engine.dir}/iapi/store" target="compile_iapi_store_jsr169"/>
-    <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>

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/build.xml?rev=1222151&r1=1222150&r2=1222151&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/build.xml Thu Dec 22 10:18:00
2011
@@ -34,7 +34,7 @@
 
 <!-- Targets -->
 
-  <target name="compile" depends="compile_iapi_sql_jdbc2"/>
+  <target name="compile" depends="compile_iapi_sql_jsr169"/>
 
   <target name="compile_iapi_sql_jsr169">
     <javac
@@ -57,8 +57,5 @@
     </javac>
   </target>
 
-  <target name="compile_iapi_sql_jdbc2" depends="compile_iapi_sql_jsr169">
-  </target>
-
 </project>
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/build.xml?rev=1222151&r1=1222150&r2=1222151&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/build.xml Thu Dec 22 10:18:00 2011
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 
-<project default="iapi" basedir="../../../../../..">
+<project default="compile_impl" basedir="../../../../../..">
 
 <!-- Set Properties -->
   <!-- User settings -->
@@ -33,23 +33,13 @@
   <property file="${properties.dir}/compilepath.properties"/>
 
 <!-- Targets -->
-  <target name="iapi" depends="compile,compile_impl_jdbc"/>
-
-  <target name="compile" depends="compile_impl_169">
+  <target name="compile_impl">
     <ant dir="${derby.engine.dir}/impl/services"/>
     <ant dir="${derby.engine.dir}/impl/io"/>
     <ant dir="${derby.engine.dir}/impl/sql"/>
     <ant dir="${derby.engine.dir}/impl/store"/>
     <ant dir="${derby.engine.dir}/impl/db"/>
     <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">
-    <ant dir="${derby.engine.dir}/impl/services" target="compile_impl_services_169"/>
-    <ant dir="${derby.engine.dir}/impl/io" target="compile_impl_io_169"/>
-  </target>
 </project>

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?rev=1222151&r1=1222150&r2=1222151&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 Thu Dec 22 10:18:00 2011
@@ -56,29 +56,10 @@
       </classpath>
       <include name="${derby.dir}/jdbc/InternalDriver.java"/>
       <include name="${derby.dir}/jdbc/EmbeddedSimpleDataSource.java"/>
+      <include name="${derby.dir}/jdbc/Driver169.java"/>
     </javac>
  
   </target>
-	  <target name="compile_jsr169_opt">
-	    <javac
-	      source="1.4"
-	      target="1.4"
-	      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="${jsr169compile.classpath}"/>
-	      </classpath>
-	      <include name="${derby.dir}/jdbc/Driver169.java"/>
-	    </javac>
-	  </target>
 	
   <target name="compile_jdbc2" depends="compile_jsr169">
     <javac

Modified: db/derby/code/trunk/java/engine/org/apache/derby/modules.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/modules.properties?rev=1222151&r1=1222150&r2=1222151&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/modules.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/modules.properties Thu Dec 22 10:18:00
2011
@@ -368,11 +368,9 @@ cloudscape.config.mgmt.jmx=derby
 derby.module.mgmt.null=org.apache.derby.impl.services.jmxnone.NoManagementService
 cloudscape.config.mgmt.null=derby
 
-# J2ME optional elements, the J2ME_optional_ lead in
-# is removed if the optional target is built.
-
-#J2ME_optional_derby.module.dvfCDC=org.apache.derby.iapi.types.CDCDataValueFactory
-#J2ME_optional_cloudscape.config.dvfCDC=derby
-#J2ME_optional_derby.module.jdbc169=org.apache.derby.jdbc.Driver169
-#J2ME_optional_derby.env.classes.jdbc169=javax.sql.DataSource
-#J2ME_optional_cloudscape.config.jdbc169=derby
+# Modules used on J2ME only
+derby.module.dvfCDC=org.apache.derby.iapi.types.CDCDataValueFactory
+cloudscape.config.dvfCDC=derby
+derby.module.jdbc169=org.apache.derby.jdbc.Driver169
+derby.env.classes.jdbc169=javax.sql.DataSource
+cloudscape.config.jdbc169=derby



Mime
View raw message