Author: cziegeler Date: Wed Jan 19 09:45:50 2005 New Revision: 125631 URL: http://svn.apache.org/viewcvs?view=rev&rev=125631 Log: Use additional local block descriptors for building Modified: cocoon/trunk/ (props changed) cocoon/trunk/status.xml cocoon/trunk/tools/targets/compile-build.xml cocoon/trunk/tools/targets/ide-build.xml
Modified: cocoon/trunk/status.xml Url: http://svn.apache.org/viewcvs/cocoon/trunk/status.xml?view=diff&rev=125631&p1=cocoon/trunk/status.xml&r1=125630&p2=cocoon/trunk/status.xml&r2=125631 ============================================================================== --- cocoon/trunk/status.xml (original) +++ cocoon/trunk/status.xml Wed Jan 19 09:45:50 2005 @@ -457,6 +457,9 @@ </action> </release> <release version="2.1.7" date="TBD"> + <action dev="CZ" type="add"> + Build system: External blocks can be built together with Cocoon. + </action> <action dev="RG" type="fix" fixes-bug="33091"> Refreshing a page with a JSR-168 portlet in it could cause unexpected results. JSR-168 urls can now be configured to contain the data required to generated the required events. Modified: cocoon/trunk/tools/targets/compile-build.xml Url: http://svn.apache.org/viewcvs/cocoon/trunk/tools/targets/compile-build.xml?view=diff&rev=125631&p1=cocoon/trunk/tools/targets/compile-build.xml&r1=125630&p2=cocoon/trunk/tools/targets/compile-build.xml&r2=125631 ============================================================================== --- cocoon/trunk/tools/targets/compile-build.xml (original) +++ cocoon/trunk/tools/targets/compile-build.xml Wed Jan 19 09:45:50 2005 @@ -225,7 +225,11 @@ <target name="prepare-blocks" depends="prepare"> <mkdir dir="${build.blocks}"/> - <xslt in="${gump.descriptor}" + <copy file="${gump.descriptor}" tofile="${build.temp}/gump.xml" overwrite="true"/> + <xpatch file="${build.temp}/gump.xml" srcdir="."> + <include name="local.blocks.*.xconf"/> + </xpatch> + <xslt in="${build.temp}/gump.xml" out="${build.temp}/blocks-build.xml" style="${tools.src}/blocks-build.xsl"/> </target> Modified: cocoon/trunk/tools/targets/ide-build.xml Url: http://svn.apache.org/viewcvs/cocoon/trunk/tools/targets/ide-build.xml?view=diff&rev=125631&p1=cocoon/trunk/tools/targets/ide-build.xml&r1=125630&p2=cocoon/trunk/tools/targets/ide-build.xml&r2=125631 ============================================================================== --- cocoon/trunk/tools/targets/ide-build.xml (original) +++ cocoon/trunk/tools/targets/ide-build.xml Wed Jan 19 09:45:50 2005 @@ -28,10 +28,10 @@ out="${build.temp}/blocks-eclipse.xml" style="${tools}/ide/eclipse/blocks-classpath.xsl"/> - <ant antfile="${build.temp}/blocks-eclipse.xml" - inheritAll="true" - inheritRefs="false" - target="generate-customized-eclipse-project"/> + <ant antfile="${build.temp}/blocks-eclipse.xml" + inheritAll="true" + inheritRefs="false" + target="generate-customized-eclipse-project"/> </target> <!-- Generate the Emacs JDE project file -->
