xmlbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ra...@apache.org
Subject svn commit: r149462 - in xmlbeans/trunk: build.xml external/lib/jam-0.1.0-src.jar jam/
Date Tue, 01 Feb 2005 23:31:41 GMT
Author: radup
Date: Tue Feb  1 15:31:38 2005
New Revision: 149462

URL: http://svn.apache.org/viewcvs?view=rev&rev=149462
Log:
JAM is now part of the annogen project on codehaus,
with an Apache 2.0 license, so I just checked in the source code.

Added:
    xmlbeans/trunk/external/lib/jam-0.1.0-src.jar   (with props)
Removed:
    xmlbeans/trunk/jam/
Modified:
    xmlbeans/trunk/build.xml

Modified: xmlbeans/trunk/build.xml
URL: http://svn.apache.org/viewcvs/xmlbeans/trunk/build.xml?view=diff&r1=149461&r2=149462
==============================================================================
--- xmlbeans/trunk/build.xml (original)
+++ xmlbeans/trunk/build.xml Tue Feb  1 15:31:38 2005
@@ -3,7 +3,6 @@
     <property name="build.compiler" value="javac1.4"/>
     <property name="javac.source" value="1.4"/>
     <property name="javac.target" value="1.4"/>
-    <property name="jam_root" value="jam"/>
 
     <property name="product.version" value="2.0.0-beta1"/>
 
@@ -14,9 +13,6 @@
     <property name="manifest.url" value="http://xmlbeans.apache.org/"/>
     <property name="manifest.comment" value="Apache XmlBeans version ${product.version}"/>
 
-    <!-- needs to be the same as 'classes_dir' in jam/build.xml -->
-    <property name="jam_classes_dir" value="${jam_root}/build/classes"/>
-
     <target name="usage">
         <echo message="The following ant targets are defined:"/>
         <echo/>
@@ -352,7 +348,7 @@
             <fileset dir="build/classes/xmlinputstream"/>
             <fileset dir="build/classes/marshal"/>
             <fileset dir="build/classes/repackage"/>
-            <fileset dir="${jam_classes_dir}"/>
+            <fileset dir="build/classes/jam"/>
             <fileset dir="build/classes/piccolo"/>
             <fileset dir="build/classes/tools"/>
             <fileset dir="src/license"/>
@@ -474,7 +470,7 @@
 
     <target name="typeimpl.classes" depends="dirs, newstore2.classes,
         repackage.classes, xmlpublic.classes, typeholder.template, typestore.classes, xsdschema.classes,
-        configschema.classes, toolschema.classes, jsr173_api.jar, jam">
+        configschema.classes, toolschema.classes, jsr173_api.jar, jam.classes">
         <mkdir dir="build/classes/typeimpl"/>
         <javac destdir="build/classes/typeimpl" source="${javac.source}" target="${javac.target}"
debug="on">
             <classpath>
@@ -489,7 +485,7 @@
                 <pathelement location="build/classes/xsdschema"/>
                 <pathelement location="build/classes/xmlschema"/>
                 <pathelement location="build/classes/toolschema"/>
-                <pathelement location="${jam_classes_dir}"/>
+                <pathelement location="build/classes/jam"/>
                 <pathelement location="build/lib/jsr173_api.jar"/>
             </classpath>
 
@@ -531,12 +527,6 @@
 
     </target>
 
-    <!-- jam target =================================================== -->
-
-    <target name='jam'>
-        <ant dir='${jam_root}' target='all' inheritAll='false'/>
-    </target>
-
     <!-- marshal target =============================================== -->
 
     <target name="marshal.classes" depends="dirs, typeimpl.classes, xmlpublic.classes,
jsr173_api.jar">
@@ -751,6 +741,7 @@
     <property name="schema_compiler" value="org.apache.xmlbeans.impl.tool.SchemaCompiler"/>
     <property name="bootstrap_schema_compiler" value="org.apache.xmlbeans.impl.tool.SchemaCompiler"/>
     <property name="piccolo_package_name" value="org.apache.xmlbeans.impl.piccolo"/>
+    <property name="jam_package_name" value="org.apache.xmlbeans.impl.jam"/>
 
     <!--
         Params to repackage are:
@@ -935,6 +926,42 @@
         </java>
     </target>
 
+    <!-- JAM deployment -->
+    <target name="jam.classes.check">
+        <uptodate property="jam.classes.notRequired"
+            targetfile="build/ar/xbean.jar">
+            <srcfiles dir="external/lib" includes="jam*-src.jar"/>
+        </uptodate>
+    </target>
+
+    <target name="jam.classes" depends="jam.classes.check, dirs, repackage.classes, jsr173_api.jar"
unless="jam.classes.notRequired">
+        <delete dir="build/private/jam"/>
+        <mkdir dir="build/private/jam"/>
+        <unjar src="external/lib/jam-0.1.0-src.jar" dest="build/private/jam"/>
+
+        <echo message="Re-packaging JAM"/>
+
+        <java classname="repackage.Repackage" fork="true" failonerror="true">
+            <classpath>
+                <pathelement location="build/classes/repackage"/>
+            </classpath>
+            <arg line="-repackage org.codehaus.jam:${jam_package_name} -f build/private/jam/src
-t build/private/jam/src_repackage"/>
+        </java>
+        <!--copy file="build/private/jam/src/java.g" todir="build/private/jam/src_repackage"/-->
+
+        <delete dir="build/classes/jam"/>
+        <mkdir dir="build/classes/jam"/>
+        <javac 
+            destdir="build/classes/jam"
+            source="1.4" target="1.4"
+            debug="on">
+            <src path="build/private/jam/src_repackage"/>
+        	<classpath>
+        		<pathelement location="build/lib/jsr173_api.jar"/>
+        	</classpath>
+        </javac>
+    </target>
+
     <!-- Piccolo deployment -->
     <target name="piccolo.classes.check">
         <uptodate property="piccolo.classes.notRequired"
@@ -948,7 +975,7 @@
         <mkdir dir="build/private/piccolo"/>
         <unjar src="external/lib/piccolo_apache_dist_20040629_v2.jar" dest="build/private/piccolo"/>
 
-        <echo message="Re-packaging XmlBeans"/>
+        <echo message="Re-packaging Piccolo"/>
 
         <java classname="repackage.Repackage" fork="true" failonerror="true">
             <classpath>

Added: xmlbeans/trunk/external/lib/jam-0.1.0-src.jar
URL: http://svn.apache.org/viewcvs/xmlbeans/trunk/external/lib/jam-0.1.0-src.jar?view=auto&rev=149462
==============================================================================
Binary file - no diff available.

Propchange: xmlbeans/trunk/external/lib/jam-0.1.0-src.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlbeans.apache.org
For additional commands, e-mail: commits-help@xmlbeans.apache.org


Mime
View raw message