You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2013/06/14 13:42:14 UTC
svn commit: r1493034 - /manifoldcf/site/trunk/build.xml
Author: kwright
Date: Fri Jun 14 11:42:13 2013
New Revision: 1493034
URL: http://svn.apache.org/r1493034
Log:
Modify script to actually checkout and build forrest, for Jenkins.
Modified:
manifoldcf/site/trunk/build.xml
Modified: manifoldcf/site/trunk/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/site/trunk/build.xml?rev=1493034&r1=1493033&r2=1493034&view=diff
==============================================================================
--- manifoldcf/site/trunk/build.xml (original)
+++ manifoldcf/site/trunk/build.xml Fri Jun 14 11:42:13 2013
@@ -31,16 +31,35 @@
</exec>
</target>
+ <target name="checkout-forrest">
+ <mkdir dir="build"/>
+ <antcall target="checkout-source-via-svn">
+ <param name="root-dir" value="build"/>
+ <param name="svn-url" value="http://svn.apache.org/repos/asf/forrest/trunk"/>
+ <param name="dir-name" value="forrest"/>
+ </antcall>
+ </target>
+
+ <target name="build-forrest" depends="checkout-forrest">
+ <exec osfamily="windows" dir="build/forrest/main" executable="cmd" failifexecutionfails="true" failonerror="true">
+ <arg value="/c"/>
+ <arg value="build.bat"/>
+ </exec>
+ <exec osfamily="unix" dir="build/forrest/main" executable="build.sh" failifexecutionfails="true" failonerror="true">
+ </exec>
+ </target>
+
<target name="build-via-ant">
+ <property name="forrest.path" location="build/forrest"/>
<exec osfamily="windows" dir="${root-dir}" executable="cmd" failifexecutionfails="true" failonerror="true">
<arg value="/c"/>
<arg value="ant.bat"/>
<arg value="${target}" />
- <env key="FORREST_HOME" value="${env.FORREST_HOME}"/>
+ <env key="FORREST_HOME" value="${forrest.path}"/>
</exec>
<exec osfamily="unix" dir="${root-dir}" executable="ant" failifexecutionfails="true" failonerror="true">
<arg value="${target}" />
- <env key="FORREST_HOME" value="${env.FORREST_HOME}"/>
+ <env key="FORREST_HOME" value="${forrest.path}"/>
</exec>
</target>
@@ -167,10 +186,11 @@
</target>
- <target name="get-forrest-root">
- <property environment="env"/>
+ <target name="get-forrest-root" depends="build-forrest">
+ <!--property environment="env"/>
<echo message="${env.FORREST_HOME}"/>
- <property name="forrest-root" value="${env.FORREST_HOME}"/>
+ <property name="forrest-root" value="${env.FORREST_HOME}"/-->
+ <property name="forrest-root" value="build/forrest"/>
</target>
<target name="calculate-forrest-condition" depends="get-forrest-root">