You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xmlbeans.apache.org by kk...@apache.org on 2005/02/11 01:28:41 UTC

svn commit: r153306 - in xmlbeans: branches/1.x/build.xml trunk/build.xml

Author: kkrouse
Date: Thu Feb 10 16:28:40 2005
New Revision: 153306

URL: http://svn.apache.org/viewcvs?view=rev&rev=153306
Log:
- rename dist archives

Modified:
    xmlbeans/branches/1.x/build.xml
    xmlbeans/trunk/build.xml

Modified: xmlbeans/branches/1.x/build.xml
URL: http://svn.apache.org/viewcvs/xmlbeans/branches/1.x/build.xml?view=diff&r1=153305&r2=153306
==============================================================================
--- xmlbeans/branches/1.x/build.xml (original)
+++ xmlbeans/branches/1.x/build.xml Thu Feb 10 16:28:40 2005
@@ -644,90 +644,95 @@
   </target>
 
   <target name="dist-bin" depends="xbean, docs">
-     <delete dir="build/private/xmlbeans-${version.full}"/>
-     <delete file="build/private/xmlbeans-${version.full}.zip"/>
-     <delete file="build/private/xmlbeans-${version.full}.tgz"/>
+     <delete dir="build/private/xmlbeans-${version.base}"/>
+     <delete file="build/private/xmlbeans-${version.base}.zip"/>
+     <delete file="build/private/xmlbeans-${version.base}.tgz"/>
 
-     <mkdir dir="build/private/xmlbeans-${version.full}"/>
-     <copy todir="build/private/xmlbeans-${version.full}">
+     <mkdir dir="build/private/xmlbeans-${version.base}"/>
+     <copy todir="build/private/xmlbeans-${version.base}">
         <fileset dir="xkit"/>
         <fileset dir="." includes="bin/**" />
         <fileset file="CHANGES.txt" />
      </copy>
-     <copy todir="build/private/xmlbeans-${version.full}/schemas/s4s">
+     <copy todir="build/private/xmlbeans-${version.base}/schemas/s4s">
         <fileset dir="src/xsdschema/schema" includes="XMLSchema.xsd,w3c-schema-license.html"/>
         <fileset dir="src/xmlschema/schema" includes="XML.xsd,w3c-xml-license.html"/>
      </copy>
-     <copy todir="build/private/xmlbeans-${version.full}/schemas">
+     <copy todir="build/private/xmlbeans-${version.base}/schemas">
         <fileset dir="test/src" includes="easypo/*.xsd, easypo/*.xsdconfig"/>
      </copy>
 
-     <mkdir dir="build/private/xmlbeans-${version.full}/lib"/>
-     <copy todir="build/private/xmlbeans-${version.full}/lib" file="build/ar/xbean.jar"/>
-     <copy todir="build/private/xmlbeans-${version.full}/lib" file="external/lib/jaxen-1.1-beta-2.jar"/>
-     <copy todir="build/private/xmlbeans-${version.full}/lib" file="build/lib/xbean_xpath.jar"/>
+     <mkdir dir="build/private/xmlbeans-${version.base}/lib"/>
+     <copy todir="build/private/xmlbeans-${version.base}/lib" file="build/ar/xbean.jar"/>
+     <copy todir="build/private/xmlbeans-${version.base}/lib" file="external/lib/jaxen-1.1-beta-2.jar"/>
+     <copy todir="build/private/xmlbeans-${version.base}/lib" file="build/lib/xbean_xpath.jar"/>
 
-     <mkdir dir="build/private/xmlbeans-${version.full}/src/schema"/>
-     <copy todir="build/private/xmlbeans-${version.full}/src/schema">
+     <mkdir dir="build/private/xmlbeans-${version.base}/src/schema"/>
+     <copy todir="build/private/xmlbeans-${version.base}/src/schema">
         <fileset dir="src/toolschema"/>
      </copy>
 
-     <mkdir dir="build/private/xmlbeans-${version.full}/docs"/>
-     <copy todir="build/private/xmlbeans-${version.full}/docs">
+     <mkdir dir="build/private/xmlbeans-${version.base}/docs"/>
+     <copy todir="build/private/xmlbeans-${version.base}/docs">
         <fileset dir="build/docs"/>
      </copy>
 
-     <chmod dir="build/private/xmlbeans-${version.full}/bin" perm="ugo+rx" includes="**" />
+     <chmod dir="build/private/xmlbeans-${version.base}/bin" perm="ugo+rx" includes="**" />
 
-     <zip destfile="build/private/xmlbeans-${version.full}.zip"
+     <zip destfile="build/private/xmlbeans-${version.base}.zip"
           basedir="build/private"
-          includes="xmlbeans-${version.full}/**"
-          excludes="xmlbeans-${version.full}/bin/dumpxsb, 
-                    xmlbeans-${version.full}/bin/scomp, 
-                    xmlbeans-${version.full}/bin/validate">
-         <zipfileset dir="." includes="src/license/LICENSE.txt" fullpath="xmlbeans-${version.full}/LICENSE.txt"/>
-         <zipfileset dir="." includes="src/license/NOTICE.txt" fullpath="xmlbeans-${version.full}/NOTICE.txt"/>
-         <zipfileset dir="build/private/xmlbeans-${version.full}/bin" includes="dumpxsb, scomp, validate" prefix="xmlbeans-${version.full}/bin" filemode="755"/>
+          includes="xmlbeans-${version.base}/**"
+          excludes="xmlbeans-${version.base}/bin/dumpxsb, 
+                    xmlbeans-${version.base}/bin/scomp, 
+                    xmlbeans-${version.base}/bin/validate">
+         <zipfileset dir="." includes="src/license/LICENSE.txt" fullpath="xmlbeans-${version.base}/LICENSE.txt"/>
+         <zipfileset dir="." includes="src/license/NOTICE.txt" fullpath="xmlbeans-${version.base}/NOTICE.txt"/>
+         <zipfileset dir="build/private/xmlbeans-${version.base}/bin" includes="dumpxsb, scomp, validate"
+             prefix="xmlbeans-${version.base}/bin" filemode="755"/>
      </zip>
-     <tar destfile="build/private/xmlbeans-${version.full}.tgz"
+     <tar destfile="build/private/xmlbeans-${version.base}.tgz"
           basedir="build/private"
-          includes="xmlbeans-${version.full}/**"
-          excludes="xmlbeans-${version.full}/bin/dumpxsb, 
-                    xmlbeans-${version.full}/bin/scomp, 
-                    xmlbeans-${version.full}/bin/validate"
+          includes="xmlbeans-${version.base}/**"
+          excludes="xmlbeans-${version.base}/bin/dumpxsb, 
+                    xmlbeans-${version.base}/bin/scomp, 
+                    xmlbeans-${version.base}/bin/validate"
           compression="gzip">
-         <tarfileset dir="." includes="src/license/LICENSE.txt" fullpath="xmlbeans-${version.full}/LICENSE.txt"/>
-         <tarfileset dir="." includes="src/license/NOTICE.txt" fullpath="xmlbeans-${version.full}/NOTICE.txt"/>
-         <tarfileset dir="build/private/xmlbeans-${version.full}/bin" includes="dumpxsb, scomp, validate" prefix="xmlbeans-${version.full}/bin" mode="755"/>
+         <tarfileset dir="." includes="src/license/LICENSE.txt" fullpath="xmlbeans-${version.base}/LICENSE.txt"/>
+         <tarfileset dir="." includes="src/license/NOTICE.txt" fullpath="xmlbeans-${version.base}/NOTICE.txt"/>
+         <tarfileset dir="build/private/xmlbeans-${version.base}/bin" includes="dumpxsb, scomp, validate"
+             prefix="xmlbeans-${version.base}/bin" mode="755"/>
      </tar>
   </target>
 
   <target name="dist-src" depends="clean, dirs, version">
-     <delete file="build/private/xmlbeans-${version.full}-src.zip"/>
-     <delete file="build/private/xmlbeans-${version.full}-src.tgz"/>
+     <delete file="build/private/xmlbeans-${version.base}-src.zip"/>
+     <delete file="build/private/xmlbeans-${version.base}-src.tgz"/>
 
-     <zip destfile="build/private/xmlbeans-${version.full}-src.zip">
+     <zip destfile="build/private/xmlbeans-${version.base}-src.zip">
      	<zipfileset
      		dir="."
        		includes="**"
                 excludes="build/**, test/src/teststore/**, test/src/easypouse/**, test/src/nameworlduse/**,
                 test/src/stsschema/**, test/src/unmarshal/**, test/cases/schema/**, external/lib/junit.jar, bin/dumpxsb, bin/scomp, bin/validate"
-       		prefix="xmlbeans-${version.full}" />
-         <zipfileset dir="." includes="src/license/LICENSE.txt" fullpath="xmlbeans-${version.full}/LICENSE.txt"/>
-         <zipfileset dir="." includes="src/license/NOTICE.txt" fullpath="xmlbeans-${version.full}/NOTICE.txt"/>
-         <zipfileset dir="bin" includes="dumpxsb, scomp, validate" prefix="xmlbeans-${version.full}/bin" filemode="755"/>
+       		prefix="xmlbeans-${version.base}" />
+         <zipfileset dir="." includes="src/license/LICENSE.txt" fullpath="xmlbeans-${version.base}/LICENSE.txt"/>
+         <zipfileset dir="." includes="src/license/NOTICE.txt" fullpath="xmlbeans-${version.base}/NOTICE.txt"/>
+         <zipfileset dir="bin" includes="dumpxsb, scomp, validate" prefix="xmlbeans-${version.base}/bin" filemode="755"/>
      </zip>
-     <tar destfile="build/private/xmlbeans-${version.full}-src.tgz"
+     <tar destfile="build/private/xmlbeans-${version.base}-src.tgz"
 	 	  compression="gzip">
      	<tarfileset
      		dir="."
        		includes="**"
        		excludes="build/**, test/src/teststore/**, test/src/easypouse/**, test/src/nameworlduse/**,
                 test/src/stsschema/**, test/src/unmarshal/**, test/cases/schema/**, external/lib/junit.jar, bin/dumpxsb, bin/scomp, bin/validate"
-       		prefix="xmlbeans-${version.full}"/>
-         <tarfileset dir="." includes="src/license/LICENSE.txt" fullpath="xmlbeans-${version.full}/LICENSE.txt"/>
-         <tarfileset dir="." includes="src/license/NOTICE.txt" fullpath="xmlbeans-${version.full}/NOTICE.txt"/>
-         <tarfileset dir="bin" includes="dumpxsb, scomp, validate" prefix="xmlbeans-${version.full}/bin" mode="755"/>
+       		prefix="xmlbeans-${version.base}"/>
+         <tarfileset dir="." includes="src/license/LICENSE.txt"
+             fullpath="xmlbeans-${version.base}/LICENSE.txt"/>
+         <tarfileset dir="." includes="src/license/NOTICE.txt"
+             fullpath="xmlbeans-${version.base}/NOTICE.txt"/>
+         <tarfileset dir="bin" includes="dumpxsb, scomp, validate"
+             prefix="xmlbeans-${version.base}/bin" mode="755"/>
      </tar>
   </target>
 

Modified: xmlbeans/trunk/build.xml
URL: http://svn.apache.org/viewcvs/xmlbeans/trunk/build.xml?view=diff&r1=153305&r2=153306
==============================================================================
--- xmlbeans/trunk/build.xml (original)
+++ xmlbeans/trunk/build.xml Thu Feb 10 16:28:40 2005
@@ -289,38 +289,38 @@
     </target>
 
     <target name="dist-bin" depends="xbean, docs">
-        <delete dir="build/private/xmlbeans-${version.full}"/>
-        <delete file="build/private/xmlbeans-${version.full}.zip"/>
-        <delete file="build/private/xmlbeans-${version.full}.tgz"/>
+        <delete dir="build/private/xmlbeans-${version.base}"/>
+        <delete file="build/private/xmlbeans-${version.base}.zip"/>
+        <delete file="build/private/xmlbeans-${version.base}.tgz"/>
 
-        <mkdir dir="build/private/xmlbeans-${version.full}"/>
-        <copy todir="build/private/xmlbeans-${version.full}">
+        <mkdir dir="build/private/xmlbeans-${version.base}"/>
+        <copy todir="build/private/xmlbeans-${version.base}">
             <fileset dir="xkit"/>
             <fileset dir="." includes="bin/**"/>
             <fileset file="LICENSE.txt"/>
             <fileset file="NOTICE.txt"/>
         </copy>
-        <copy todir="build/private/xmlbeans-${version.full}/schemas/s4s">
+        <copy todir="build/private/xmlbeans-${version.base}/schemas/s4s">
             <fileset dir="src/xsdschema/schema" includes="XMLSchema.xsd"/>
             <fileset dir="src/xmlschema/schema" includes="XML.xsd"/>
         </copy>
-        <copy todir="build/private/xmlbeans-${version.full}/schemas">
+        <copy todir="build/private/xmlbeans-${version.base}/schemas">
             <fileset dir="test/cases/xbean/xmlobject"
                 includes="easypo.xsd,easypo.xsdconfig,numerals.xsd,nameworld.xsd"/>
         </copy>
 
-        <mkdir dir="build/private/xmlbeans-${version.full}/lib"/>
-        <copy todir="build/private/xmlbeans-${version.full}/lib">
+        <mkdir dir="build/private/xmlbeans-${version.base}/lib"/>
+        <copy todir="build/private/xmlbeans-${version.base}/lib">
             <fileset dir="build/lib" includes="xbean.jar,jsr173_api.jar"/>
         </copy>
 
-        <mkdir dir="build/private/xmlbeans-${version.full}/docs"/>
-        <copy todir="build/private/xmlbeans-${version.full}/docs">
+        <mkdir dir="build/private/xmlbeans-${version.base}/docs"/>
+        <copy todir="build/private/xmlbeans-${version.base}/docs">
             <fileset dir="build/docs"/>
         </copy>
         
-        <mkdir dir="build/private/xmlbeans-${version.full}/samples"/>
-        <copy todir="build/private/xmlbeans-${version.full}/samples">
+        <mkdir dir="build/private/xmlbeans-${version.base}/samples"/>
+        <copy todir="build/private/xmlbeans-${version.base}/samples">
             <fileset dir="samples">
                 <include name="MixedContent/**/*"/>
                 <include name="OrderMatters/**/*"/>
@@ -328,30 +328,30 @@
             </fileset>
         </copy>
 
-        <zip destfile="build/private/xmlbeans-${version.full}.zip"
+        <zip destfile="build/private/xmlbeans-${version.base}.zip"
             basedir="build/private"
-            includes="xmlbeans-${version.full}/**"/>
-        <tar destfile="build/private/xmlbeans-${version.full}.tgz"
+            includes="xmlbeans-${version.base}/**"/>
+        <tar destfile="build/private/xmlbeans-${version.base}.tgz"
             basedir="build/private"
-            includes="xmlbeans-${version.full}/**"
-            excludes="xmlbeans-${product.version}/bin/*"
+            includes="xmlbeans-${version.base}/**"
+            excludes="xmlbeans-${version.base}/bin/*"
             compression="gzip">
             <tarfileset dir="build/private">
-                <include name="xmlbeans-${product.version}/bin/*.cmd"/>
+                <include name="xmlbeans-${version.base}/bin/*.cmd"/>
             </tarfileset>
             <tarfileset dir="build/private" mode="754">
-                <include name="xmlbeans-${product.version}/bin/*"/>
-                <exclude name="xmlbeans-${product.version}/bin/*.cmd"/>
+                <include name="xmlbeans-${version.base}/bin/*"/>
+                <exclude name="xmlbeans-${version.base}/bin/*.cmd"/>
             </tarfileset>
         </tar>
     </target>
 
     <target name="dist-src" depends="clean, dirs">
-        <delete file="build/private/xmlbeans-${version.full}-src.zip"/>
-        <delete file="build/private/xmlbeans-${version.full}-src.tgz"/>
+        <delete file="build/private/xmlbeans-${version.base}-src.zip"/>
+        <delete file="build/private/xmlbeans-${version.base}-src.tgz"/>
 
-        <zip destfile="build/private/xmlbeans-${version.full}-src.zip">
-            <zipfileset dir="." prefix="xmlbeans-${version.full}">
+        <zip destfile="build/private/xmlbeans-${version.base}-src.zip">
+            <zipfileset dir="." prefix="xmlbeans-${version.base}">
                 <patternset id="src.dist.content.dirs"
                     includes="docs/** external/** samples/** src/**"/>
                 <patternset id="src.dist.content.dirs.bin"
@@ -362,15 +362,15 @@
                     includes=""/><!-- don't have tests part of the distribution yet -->
             </zipfileset>
         </zip>
-        <tar destfile="build/private/xmlbeans-${version.full}-src.tgz"
+        <tar destfile="build/private/xmlbeans-${version.base}-src.tgz"
             compression="gzip">
-            <tarfileset dir="." prefix="xmlbeans-${version.full}">
+            <tarfileset dir="." prefix="xmlbeans-${version.base}">
                 <patternset refid="src.dist.content.dirs"/>
                 <patternset refid="src.dist.content.files"/>
                 <patternset refid="src.dist.content.tests"/>
                 <patternset includes="bin/*.cmd"/>
             </tarfileset>
-            <tarfileset dir="." prefix="xmlbeans-${product.version}" mode="754">
+            <tarfileset dir="." prefix="xmlbeans-${version.base}" mode="754">
                 <include name="bin/*"/>
                 <exclude name="bin/*.cmd"/>
             </tarfileset>



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