Author: lmandel
Date: Tue Dec 6 21:03:23 2005
New Revision: 354713
URL: http://svn.apache.org/viewcvs?rev=354713&view=rev
Log:
Updated build to allow for easy renaming of Woden libraries and assemblies.
Updated XmlSchema URL.
Modified:
incubator/woden/java/build.properties
incubator/woden/java/build.xml
Modified: incubator/woden/java/build.properties
URL:
http://svn.apache.org/viewcvs/incubator/woden/java/build.properties?rev=354713&r1=354712&r2=354713&view=diff
==============================================================================
--- incubator/woden/java/build.properties (original)
+++ incubator/woden/java/build.properties Tue Dec 6 21:03:23 2005
@@ -16,7 +16,7 @@
###########################################################################
! Prereq information
-XmlSchemaURL =
http://people.apache.org/~dims/maven/ws-commons/jars/XmlSchema-SNAPSHOT.jar
+XmlSchemaURL =
http://cvs.apache.org/repository/ws-commons/jars/XmlSchema-SNAPSHOT.jar
XmlSchemaFile = XmlSchema-SNAPSHOT.jar
XercesURL =
http://www.apache.org/dist/xml/xerces-j/Xerces-J-bin.2.7.1.zip
XercesFile = Xerces-J-bin.2.7.1.zip
@@ -26,11 +26,20 @@
! The location of the Woden build home
build.home = ${basedir}
+
! The version of Woden to build
version = 1.0.0
! The current milestone id
-milestone = 1
+milestone = 2
! The type of build to run. Valid value are R - release, M - milestone, I -
integration, N - nightly
-buildType = N
\ No newline at end of file
+buildType = N
+
+! Woden library names
+impl.name = woden
+test.name = woden-test
+api.name = woden-api
+
+! Woden Archive name
+archive.name = woden-incubating
\ No newline at end of file
Modified: incubator/woden/java/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/woden/java/build.xml?rev=354713&r1=354712&r2=354713&view=diff
==============================================================================
--- incubator/woden/java/build.xml (original)
+++ incubator/woden/java/build.xml Tue Dec 6 21:03:23 2005
@@ -89,7 +89,7 @@
<available classname="junit.framework.Test"
property="junitAvailable"/>
- <property name="archiveDir"
value="${build.output}/woden-${buildId}"/>
+ <property name="archiveDir"
value="${build.output}/${archive.name}-${buildId}"/>
</target>
@@ -168,7 +168,7 @@
</fileset>
</copy>
- <jar destfile="${build.output}/woden.jar"
basedir="${build.classes}"/>
+ <jar destfile="${build.output}/${impl.name}.jar"
basedir="${build.classes}"/>
</target>
<!-- This task builds the Woden API package.
@@ -181,6 +181,7 @@
classpath="${libraryDir}/${XmlSchemaFile};${libraryDir}/${XercesJar1};${libraryDir}/${XercesJar2}">
<include name="**/*.java"/>
<exclude name="**/internal/**/*.java"/>
+ <exclude name="temp/**/*.java"/>
</javac>
<!-- Copy all non Java files. -->
<copy todir="${build.classes.api}">
@@ -188,10 +189,11 @@
<include name="**/*"/>
<exclude name="**/*.java"/>
<exclude name="**/internal/**/*"/>
+ <exclude name="temp/**/*"/>
</fileset>
</copy>
- <jar destfile="${build.output}/woden-api.jar"
basedir="${build.classes.api}"/>
+ <jar destfile="${build.output}/${api.name}.jar"
basedir="${build.classes.api}"/>
</target>
<!-- This task builds a Woden Eclipse Plugin.
@@ -216,7 +218,7 @@
<javac sourcepath=""
srcdir="${testsrc.home}"
destdir="${build.classes.test}"
-
classpath="${libraryDir}/${XmlSchemaFile};${libraryDir}/${XercesJar1};${libraryDir}/${XercesJar2};${build.output}/woden.jar"/>
+
classpath="${libraryDir}/${XmlSchemaFile};${libraryDir}/${XercesJar1};${libraryDir}/${XercesJar2};${build.output}/${impl.name}.jar"/>
<!-- Copy all non Java files. -->
<copy todir="${build.classes.test}">
<fileset dir="${testsrc.home}">
@@ -225,7 +227,7 @@
</fileset>
</copy>
- <jar destfile="${build.output}/woden-test.jar"
basedir="${build.classes.test}"/>
+ <jar destfile="${build.output}/${test.name}.jar"
basedir="${build.classes.test}"/>
</target>
<!-- This task builds the Woden Javadoc. -->
@@ -278,8 +280,8 @@
<!-- Copy the woden jars -->
<copy todir="${archiveDir}/lib">
<fileset dir="${build.output}">
- <include name="woden.jar"/>
- <include name="woden-api.jar"/>
+ <include name="${impl.name}.jar"/>
+ <include name="${api.name}.jar"/>
</fileset>
</copy>
<!-- Copy the downloaded libraries -->
@@ -312,27 +314,27 @@
<!-- Builds a zip of the distributable dir -->
<!-- This target is not meant to be called on its own -->
<target name="createZip" depends="init">
- <zip destfile="${build.output}/woden-${buildId}.zip"
+ <zip destfile="${build.output}/${archive.name}-${buildId}.zip"
basedir="${archiveDir}"/>
</target>
<!-- Builds a tar.gz of the distributable dir -->
<!-- This target is not meant to be called on its own -->
<target name="createTarGz" depends="init">
- <tar tarfile="${build.output}/woden-${buildId}.tar"
basedir="${archiveDir}"/>
- <gzip zipfile="${build.output}/woden-${buildId}.tar.gz"
src="${build.output}/woden-${buildId}.tar"/>
- <bzip2 src="${build.output}/woden-${buildId}.tar.gz"
destfile="${build.output}/woden-${buildId}.tar.bz2"/>
- <delete file="${build.output}/woden-${buildId}.tar"/>
+ <tar tarfile="${build.output}/${archive.name}-${buildId}.tar"
basedir="${archiveDir}"/>
+ <gzip
zipfile="${build.output}/${archive.name}-${buildId}.tar.gz"
src="${build.output}/${archive.name}-${buildId}.tar"/>
+ <bzip2 src="${build.output}/${archive.name}-${buildId}.tar.gz"
destfile="${build.output}/${archive.name}-${buildId}.tar.bz2"/>
+ <delete file="${build.output}/$archive.name}-${buildId}.tar"/>
</target>
<!-- Create checksums for the zip and tar.gz files -->
<target name="createChecksums">
- <checksum file="${build.output}/woden-${buildId}.zip"/>
- <checksum file="${build.output}/woden-${buildId}.zip"
algorithm="SHA" fileext=".sha1"/>
- <checksum file="${build.output}/woden-${buildId}.tar.gz"/>
- <checksum file="${build.output}/woden-${buildId}.tar.gz"
algorithm="SHA" fileext=".sha1"/>
- <checksum file="${build.output}/woden-${buildId}.tar.bz2"/>
- <checksum file="${build.output}/woden-${buildId}.tar.bz2"
algorithm="SHA" fileext=".sha1"/>
+ <checksum
file="${build.output}/${archive.name}-${buildId}.zip"/>
+ <checksum file="${build.output}/${archive.name}-${buildId}.zip"
algorithm="SHA" fileext=".sha1"/>
+ <checksum
file="${build.output}/${archive.name}-${buildId}.tar.gz"/>
+ <checksum
file="${build.output}/${archive.name}-${buildId}.tar.gz" algorithm="SHA"
fileext=".sha1"/>
+ <checksum
file="${build.output}/${archive.name}-${buildId}.tar.bz2"/>
+ <checksum
file="${build.output}/${archive.name}-${buildId}.tar.bz2" algorithm="SHA"
fileext=".sha1"/>
</target>
<!-- A clean target to be run before builds. -->
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
