You are viewing a plain text version of this content. The canonical link for it is here.
Posted to xap-commits@incubator.apache.org by bb...@apache.org on 2007/01/21 16:43:15 UTC
svn commit: r498399 -
/incubator/xap/trunk/buildsystem/build-manufacturing.xml
Author: bbuffone
Date: Sun Jan 21 08:43:15 2007
New Revision: 498399
URL: http://svn.apache.org/viewvc?view=rev&rev=498399
Log:
fixed issues with manuafacturing script on working.
Modified:
incubator/xap/trunk/buildsystem/build-manufacturing.xml
Modified: incubator/xap/trunk/buildsystem/build-manufacturing.xml
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/buildsystem/build-manufacturing.xml?view=diff&rev=498399&r1=498398&r2=498399
==============================================================================
--- incubator/xap/trunk/buildsystem/build-manufacturing.xml (original)
+++ incubator/xap/trunk/buildsystem/build-manufacturing.xml Sun Jan 21 08:43:15 2007
@@ -1,4 +1,4 @@
-<project name="Xap-Manufucturing" default="build">
+<project name="Xap-Manufucturing" default="manufacture">
<property name="svn_root" value="http://svn.apache.org/repos/asf/incubator/xap/trunk/"/>
<property name="svn_revision" value="HEAD"/>
@@ -20,10 +20,14 @@
Move manufacturing into a separate project??
-->
- <property name="xapTrunk" value="../.dist/.temp/xap/trunk" />
- <property name="XapStaging" value="../.dist/.temp/.staging"/>
- <property name="ajax-prefix" value="nxAjax"/>
- <property name="zap-prefix" value="xap"/>
+ <property name="trunk.location" value="../.dist/.temp/xap/trunk"/>
+ <property name="staging.location" value="../.dist/.temp/.staging"/>
+ <property name="staging.buildsystem.location" value="${staging.location}/buildsystem"/>
+ <property name="staging.buildsystem.seed.location" value="${staging.buildsystem.location}/seed"/>
+ <property name="staging.codebase.location" value="${staging.location}/codebase"/>
+ <property name="staging.dist.location" value="${staging.location}/.dist"/>
+ <property name="staging.dist.output.location" value="${staging.dist.location}/output"/>
+ <property name="zap-prefix" value="xap"/>
<property name="dist.location" value="../.dist"/>
<property name="package.output.location" value="${dist.location}/package/"/>
@@ -34,29 +38,29 @@
<!-- checks out a fresh copy of xap trunk from the repository -->
<target name="-checkout-xap">
- <delete dir="${xapTrunk}"/>
- <mkdir dir="${xapTrunk}"/>
+ <delete dir="${trunk.location}"/>
+ <mkdir dir="${trunk.location}"/>
<svn javahl="false">
- <checkout revision="HEAD" url="${svn_root}" destPath="${xapTrunk}"/>
+ <checkout revision="HEAD" url="${svn_root}" destPath="${trunk.location}"/>
</svn>
</target>
<!-- in a real build this should check out xap instead of copying it from local disk -->
<target name="-copy-xap" description="Copy XAP to staging area">
- <delete dir="${XapStaging}"/>
- <mkdir dir="${XapStaging}"/>
+ <delete dir="${staging.location}"/>
+ <mkdir dir="${staging.location}"/>
- <copy todir="${XapStaging}" overwrite="false">
- <fileset dir="${xapTrunk}" includes="*/**"/>
+ <copy todir="${staging.location}" overwrite="false">
+ <fileset dir="${trunk.location}" includes="*/**"/>
</copy>
</target>
<target name="-tests" if="run.test">
- <delete dir="${XapStaging}/logs"/>
- <mkdir dir="${XapStaging}/logs"/>
+ <delete dir="${staging.dist.location}/logs"/>
+ <mkdir dir="${staging.dist.location}/logs"/>
- <exec dir="${XapStaging}" executable="ant.bat">
+ <exec dir="${staging.buildsystem.location}" executable="ant.bat">
<arg value="tests"/>
<arg value="-DcloseBrowsersAfterTestRuns"/>
<arg value="true"/>
@@ -69,8 +73,8 @@
</exec>
<!-- combine all log files into one -->
- <copy todir="${XapStaging}/logs">
- <fileset dir="${XapStaging}/logs">
+ <copy todir="${staging.dist.location}/logs">
+ <fileset dir="${staging.dist.location}/logs">
<include name="**/*.xml"/>
</fileset>
<mapper type="merge" to="testErrors.txt"/>
@@ -79,7 +83,7 @@
<!-- load the file ONLY if it contains an error in it -->
<loadfile
property="testResults"
- srcFile="${XapStaging}/logs/testErrors.txt"
+ srcFile="${staging.dist.location}/logs/testErrors.txt"
failonerror="true">
<filterChain>
<linecontainsregexp>
@@ -89,90 +93,95 @@
</loadfile>
<fail message="Failure running unit tests, check logs for details. Errors: ${testResults}" if="testResults"/>
-
- <!-- <exec dir="${XapStaging}/logs" executable="notepad.exe" failonerror="true">
- <arg value="testErrors.txt"/>
- </exec> -->
-
+
</target>
<target name="-doc">
<!-- IMPORTANT fail on error? -->
<!-- using 'ant' task here doesn't work -->
- <exec dir="${XapStaging}" executable="ant.bat" failonerror="true">
+ <exec dir="${staging.buildsystem.location}" executable="ant.bat" failonerror="true">
<arg value="doc"/>
</exec>
</target>
<!--
+ This target calles the underlying Xap build profiles target in the
+ staging buildsystem
+ -->
+ <target name="-build-profile">
+ <!-- IMPORTANT fail on error? -->
+ <!-- using 'ant' task here doesn't work -->
+ <exec dir="${staging.buildsystem.location}" executable="ant.bat">
+ <arg value="build-profile"/>
+ <arg value="-Dprofile-name=${profile-name}"/>
+ </exec>
+ </target>
+
+ <!--
Build a zip file of the redistruable files for the project
-->
<target name="-build-dist-zip" description="builds platform zip">
<mkdir dir="${zipDir}"/>
<zip destfile="${zipDir}/${zipName}">
- <zipfileset dir="${XapStaging}" prefix="${dir-prefix}" includes="src/**"/>
- <zipfileset dir="${XapStaging}" prefix="${dir-prefix}" includes="css/**"/>
+ <zipfileset dir="${staging.codebase.location}" prefix="${dir-prefix}" includes="src/**"/>
+ <zipfileset dir="${staging.codebase.location}" prefix="${dir-prefix}" includes="css/**"/>
</zip>
<zip destfile="${zipDir}/${zipName}" update="true">
- <zipfileset dir="${XapStaging}/dist" prefix="${dir-prefix}/lib" includes="**/*"/>
+ <zipfileset dir="${staging.dist.output.location}" prefix="${dir-prefix}/lib" includes="**/*"/>
</zip>
<zip destfile="${zipDir}/${zipName}" update="true">
- <zipfileset dir="${seed-dir}" includes="**"/>
+ <zipfileset dir="${staging.buildsystem.seed.location}" includes="**"/>
</zip>
</target>
-
- <target name="-build-profile">
- <!-- IMPORTANT fail on error? -->
- <!-- using 'ant' task here doesn't work -->
- <exec dir="${XapStaging}" executable="ant.bat">
- <arg value="build-profile"/>
- <arg value="-Dprofile=${profile}"/>
- </exec>
- </target>
-
+
<!--
Build a tar file of the redistruable files for the project
-->
<target name="-build-dist-tar" description="builds platform zip">
<mkdir dir="${zipDir}"/>
<tar destfile="${zipDir}/${zipName}">
- <tarfileset dir="${XapStaging}" prefix="${dir-prefix}" includes="src/**"/>
- <tarfileset dir="${XapStaging}" prefix="${dir-prefix}" includes="css/**"/>
- <tarfileset dir="${XapStaging}/dist" prefix="${dir-prefix}/lib" includes="**/*"/>
- <tarfileset dir="${seed-dir}" includes="**"/>
+ <tarfileset dir="${staging.codebase.location}" prefix="${dir-prefix}" includes="src/**"/>
+ <tarfileset dir="${staging.codebase.location}" prefix="${dir-prefix}" includes="css/**"/>
+ <tarfileset dir="${staging.dist.output.location}" prefix="${dir-prefix}/lib" includes="**/*"/>
+ <tarfileset dir="${staging.buildsystem.seed.location}" includes="**"/>
</tar>
</target>
<target name="build-xap" description="build xap">
<!-- delete the dist directory in staging. -->
- <delete dir="${XapStaging}/dist"/>
+ <delete dir="${staging.dist.location}"/>
<antcall target="-copy-xap"/>
+
<antcall target="-tests">
<param name="testPage" value="XapUnitTestSuite.html"/>
</antcall>
+
<antcall target="-doc"/>
<antcall target="-build-profile">
- <param name="profile" value="xapcore-razorfish"/>
+ <param name="profile-name" value="xapcore-razorfish"/>
</antcall>
<!--
Profiles are built to have the name xapcore.js. Change the name to xapcore-min.js.
Need to gzip the file so it will be really small.
-->
- <copyfile src="${XapStaging}/dist/xapcore.js" dest="${XapStaging}/dist/xapcore-min.js"/>
- <copyfile src="${XapStaging}/dist/xapcore.js.uncompressed.js" dest="${XapStaging}/dist/xapcore-min.js.uncompressed.js"/>
- <gzip src="${XapStaging}/dist/xapcore-min.js" destfile="${XapStaging}/dist/xapcore-min.js.gz"/>
+ <copyfile src="${staging.dist.location}/lib/xapcore.js" dest="${staging.dist.output.location}/xapcore-min.js"/>
+ <copyfile src="${staging.dist.location}/lib/xapcore.js.uncompressed.js" dest="${staging.dist.output.location}/xapcore-min.js.uncompressed.js"/>
+ <gzip src="${staging.dist.output.location}/xapcore-min.js" destfile="${staging.dist.output.location}/xapcore-min.js.gz"/>
<antcall target="-build-profile">
- <param name="profile" value="xap"/>
+ <param name="profile-name" value="xap"/>
</antcall>
- <gzip src="${XapStaging}/dist/xapcore.js" destfile="${XapStaging}/dist/xapcore.js.gz"/>
+
+ <copyfile src="${staging.dist.location}/lib/xapcore.js" dest="${staging.dist.output.location}/xapcore.js"/>
+ <copyfile src="${staging.dist.location}/lib/xapcore.js.uncompressed.js" dest="${staging.dist.output.location}/xapcore.js.uncompressed.js"/>
+ <gzip src="${staging.dist.output.location}/xapcore.js" destfile="${staging.dist.output.location}/xapcore.js.gz"/>
<antcall target="-build-dist-zip">
<param name="zipName" value="${zap-framework}"/>
@@ -188,13 +197,13 @@
<param name="seed-dir" value="seed"/>
</antcall>
- <gzip src="${dist.location}/${zap-framework-tar}" destfile="${package.output.location}/${zap-framework-tar}.gz"/>
+ <gzip src="${package.output.location}/${zap-framework-tar}" destfile="${package.output.location}/${zap-framework-tar}.gz"/>
<!-- create the checksum's for the distribution files -->
<!-- MD5 versions of the check sum -->
<checksum file="${package.output.location}/${zap-framework}" forceOverwrite="yes" fileext=".md5"/>
- <checksum file="${package.output.location/${zap-framework-tar}.gz" forceOverwrite="yes" fileext=".md5"/>
+ <checksum file="${package.output.location}/${zap-framework-tar}.gz" forceOverwrite="yes" fileext=".md5"/>
</target>
<!-- ======================================================================