Author: cheche
Date: Tue Apr 12 12:58:27 2005
New Revision: 161105
URL: http://svn.apache.org/viewcvs?view=rev&rev=161105
Log:
remove hardcoded directory and use FORREST_HOME and COCOON_HOME for build
Modified:
forrest/trunk/etc/cocoon_upgrade/build.xml
Modified: forrest/trunk/etc/cocoon_upgrade/build.xml
URL:
http://svn.apache.org/viewcvs/forrest/trunk/etc/cocoon_upgrade/build.xml?view=diff&r1=161104&r2=161105
==============================================================================
--- forrest/trunk/etc/cocoon_upgrade/build.xml (original)
+++ forrest/trunk/etc/cocoon_upgrade/build.xml Tue Apr 12 12:58:27 2005
@@ -24,8 +24,9 @@
<!-- ===============================================================
Set properties
=============================================================== -->
- <property name="cocoon.home" location="../../../cocoon"/>
- <property name="forrest.home" location="../../"/>
+ <property environment="env" />
+ <property name="cocoon.home" location="${env.COCOON_HOME}" />
+ <property name="forrest.home" location="${env.FORREST_HOME}" />
</target>
<target name="import-cocoon-xconf" depends="init">
@@ -41,6 +42,13 @@
<target name="local-build-cocoon" depends="init">
<copy todir="${cocoon.home}">
<fileset dir="." includes="local.*.properties"/>
+ </copy>
+ <exec dir="${cocoon.home}" executable="${cocoon.home}/build.sh" />
+ <copy todir="${forrest.home}/lib/core">
+ <fileset dir="${cocoon.home}/build/cocoon-2.2.0-dev/">
+ <include name="blocks/blocks-*.jar"/>
+ <include name="cocoon.jar"/>
+ </fileset>
</copy>
</target>
