You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by mi...@apache.org on 2004/12/15 21:50:35 UTC
svn commit: r112019 - /lenya/trunk/src/targets/init-build.xml
Author: michi
Date: Wed Dec 15 12:50:33 2004
New Revision: 112019
URL: http://svn.apache.org/viewcvs?view=rev&rev=112019
Log:
do not build Cocoon every time during Lenya build
Modified:
lenya/trunk/src/targets/init-build.xml
Modified: lenya/trunk/src/targets/init-build.xml
Url: http://svn.apache.org/viewcvs/lenya/trunk/src/targets/init-build.xml?view=diff&rev=112019&p1=lenya/trunk/src/targets/init-build.xml&r1=112018&p2=lenya/trunk/src/targets/init-build.xml&r2=112019
==============================================================================
--- lenya/trunk/src/targets/init-build.xml (original)
+++ lenya/trunk/src/targets/init-build.xml Wed Dec 15 12:50:33 2004
@@ -80,8 +80,14 @@
<!-- ============================================================ -->
<!-- Prepares the build webapp directory -->
<!-- ============================================================ -->
- <!-- build cocoon unless this is a gump build -->
- <target name="build-cocoon" depends="init" unless="gump.skipcocoonbuild">
+ <target name="check-cocoon" depends="init" unless="gump.skipcocoonbuild">
+ <echo>Check if Cocoon has been built: ${cocoon.src.dir}/build/webapp</echo>
+ <available file="${cocoon.src.dir}/build/webapp" type="dir" property="cocoon.build.webapp.dir.exists"/>
+ <!--<fail unless="cocoon.build.webapp.dir.exists" message="Cocoon needs to be built first!"/>-->
+ <antcall target="build-cocoon"/>
+ </target>
+
+ <target name="build-cocoon" depends="init" unless="cocoon.build.webapp.dir.exists">
<echo>Building Cocoon with our properties</echo>
<copy todir="${cocoon.src.dir}" filtering="off">
<fileset dir="${src.cocoon.properties.dir}"/>
@@ -89,7 +95,8 @@
<ant dir="${cocoon.src.dir}" inheritall="false"/>
</target>
- <target name="prepare-cocoon" depends="build-cocoon" unless="gump.skipcocoonbuild">
+ <!-- Prepare cocoon unless this is a gump build -->
+ <target name="prepare-cocoon" depends="check-cocoon" unless="gump.skipcocoonbuild">
<taskdef name="xpatch" classname="XConfToolTask" classpath="${tools.tasks.dest}"/>
<echo>INFO: exclude: WEB-INF/cocoon.xconf</echo>
<echo>INFO: exclude: WEB-INF/logkit.xconf</echo>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org
Re: svn commit: r112019 - /lenya/trunk/src/targets/init-build.xml
Posted by "Gregor J. Rothfuss" <gr...@apache.org>.
Michael Wechner wrote:
> Have you tried running the gump process?
we will know by tomorrow..
http://brutus.apache.org/gump/public/lenya/lenya/index.html
--
Gregor J. Rothfuss
COO, Wyona Content Management Solutions http://wyona.com
Apache Lenya http://lenya.apache.org
gregor.rothfuss@wyona.com gregor@apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lenya.apache.org
For additional commands, e-mail: dev-help@lenya.apache.org
Apache Lenya Project http://lenya.apache.org
Re: svn commit: r112019 - /lenya/trunk/src/targets/init-build.xml
Posted by Michael Wechner <mi...@wyona.com>.
Gregor J. Rothfuss wrote:
> +
>
>> + <target name="build-cocoon" depends="init"
>> unless="cocoon.build.webapp.dir.exists">
>
>
> this will break the gump build. gump will try running build-cocoon,
> but since you removed the unless="gump.skipcocoonbuild"> it will fail.
I don't think so, because build-cocoon is only called by check-cocoon
which is being called by prepare-cocoon which has an unless attribute re
gump.
Have you tried running the gump process?
>
> please change or revert.
>
--
Michael Wechner
Wyona Inc. - Open Source Content Management - Apache Lenya
http://www.wyona.com http://lenya.apache.org
michael.wechner@wyona.com michi@apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lenya.apache.org
For additional commands, e-mail: dev-help@lenya.apache.org
Apache Lenya Project http://lenya.apache.org
Re: svn commit: r112019 - /lenya/trunk/src/targets/init-build.xml
Posted by "Gregor J. Rothfuss" <gr...@apache.org>.
michi@apache.org wrote:
> Modified: lenya/trunk/src/targets/init-build.xml
> Url: http://svn.apache.org/viewcvs/lenya/trunk/src/targets/init-build.xml?view=diff&rev=112019&p1=lenya/trunk/src/targets/init-build.xml&r1=112018&p2=lenya/trunk/src/targets/init-build.xml&r2=112019
> ==============================================================================
> --- lenya/trunk/src/targets/init-build.xml (original)
> +++ lenya/trunk/src/targets/init-build.xml Wed Dec 15 12:50:33 2004
> @@ -80,8 +80,14 @@
> <!-- ============================================================ -->
> <!-- Prepares the build webapp directory -->
> <!-- ============================================================ -->
> - <!-- build cocoon unless this is a gump build -->
> - <target name="build-cocoon" depends="init" unless="gump.skipcocoonbuild">
> + <target name="check-cocoon" depends="init" unless="gump.skipcocoonbuild">
> + <echo>Check if Cocoon has been built: ${cocoon.src.dir}/build/webapp</echo>
> + <available file="${cocoon.src.dir}/build/webapp" type="dir" property="cocoon.build.webapp.dir.exists"/>
> + <!--<fail unless="cocoon.build.webapp.dir.exists" message="Cocoon needs to be built first!"/>-->
> + <antcall target="build-cocoon"/>
> + </target>
> +
> + <target name="build-cocoon" depends="init" unless="cocoon.build.webapp.dir.exists">
this will break the gump build. gump will try running build-cocoon, but
since you removed the unless="gump.skipcocoonbuild"> it will fail.
please change or revert.
--
Gregor J. Rothfuss
COO, Wyona Content Management Solutions http://wyona.com
Apache Lenya http://lenya.apache.org
gregor.rothfuss@wyona.com gregor@apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lenya.apache.org
For additional commands, e-mail: dev-help@lenya.apache.org
Apache Lenya Project http://lenya.apache.org