Author: craigmcc
Date: Thu Dec 15 13:51:53 2005
New Revision: 357075
URL: http://svn.apache.org/viewcvs?rev=357075&view=rev
Log:
Incorporate the "Shale Tiger Extensions" module into the "release" target
(and therefore the nightly builds) if it is executed with a JDK 1.5 or later
compiler.
Modified:
struts/shale/trunk/build.xml
Modified: struts/shale/trunk/build.xml
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/build.xml?rev=357075&r1=357074&r2=357075&view=diff
==============================================================================
--- struts/shale/trunk/build.xml (original)
+++ struts/shale/trunk/build.xml Thu Dec 15 13:51:53 2005
@@ -595,16 +595,21 @@
<!-- ====================== Release Targets ==============================
-->
+ <available property="jdk15.present"
+ classname="java.lang.annotation.Annotation"/>
+
<property name="target.dir" value="target"/>
<property name="dist.dir" value="dist"/>
<target name="clean-release">
+ <echo message="jdk15.present=${jdk15.present}"/>
<delete dir="${target.dir}"/>
<delete dir="${dist.dir}"/>
</target>
- <target name="release" depends="clean-release,dist"
- description="Construct release artifacts">
+
+ <!-- Subtarget of "release" for JDK 1.4 artifacts -->
+ <target name="release.14">
<echo message="---------- Create Release Artifacts For Version
${project.version} ----------"/>
@@ -681,6 +686,30 @@
includes="*.jar"/>
</copy>
+ </target>
+
+
+ <!-- Subtarget of "release" for JDK 1.5 artifacts -->
+ <target name="release.15" if="jdk15.present">
+
+ <!-- Copy tiger artifacts -->
+ <mkdir dir="${target.dir}/tiger"/>
+ <copy todir="${target.dir}/tiger">
+ <fileset dir="tiger/dist"
+ excludes="lib/**"/>
+ </copy>
+ <copy todir="${target.dir}/dist">
+ <fileset dir="tiger/dist/lib"
+ includes="*.jar"/>
+ </copy>
+
+ </target>
+
+
+ <target name="release"
+ depends="clean-release,dist,release.14,release.15"
+ description="Construct release artifacts">
+
<!-- Construct archive files -->
<tar tarfile="${dist.dir}/struts-shale-${project.version}.tar.gz"
compression="gzip"
@@ -701,8 +730,8 @@
by other targets. -->
- <!-- Recursively execute ${target} across all modules -->
- <target name="execute">
+ <!-- Recursively execute ${target} across JDK 1.4 library modules -->
+ <target name="execute.14.libraries">
<echo message="Executing ${target} on module core-library"/>
<ant dir="${basedir}/core-library"
@@ -716,11 +745,39 @@
<ant dir="${basedir}/test-framework"
target="${target}"/>
+ </target>
+
+
+ <!-- Recursively execute ${target} across JDK 1.5 library modules -->
+ <target name="execute.15.libraries" if="jdk15.present">
+
+ <echo message="Executing ${target} on module tiger"/>
+ <ant dir="${basedir}/tiger"
+ target="${target}"/>
+
+ </target>
+
+
+ <!-- Recursively execute ${target} across JDK 1.4 example apps -->
+ <target name="execute.14.examples">
+
<echo message="Executing ${target} on module use-cases"/>
<ant dir="${basedir}/use-cases"
target="${target}"/>
</target>
+
+
+ <!-- Recursively execute ${target} across JDK 1.5 example apps -->
+ <target name="execute.15.examples" if="jdk15.present">
+
+ </target>
+
+
+ <!-- Recursively execute ${target} across all modules -->
+ <target name="execute"
+ depends="execute.14.libraries,execute.15.libraries,
+ execute.14.examples,execute.15.examples"/>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
