cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r125633 - /cocoon/branches/BRANCH_2_1_X /cocoon/branches/BRANCH_2_1_X/status.xml /cocoon/branches/BRANCH_2_1_X/tools/targets/compile-build.xml /cocoon/branches/BRANCH_2_1_X/tools/targets/ide-build.xml
Date Wed, 19 Jan 2005 17:50:20 GMT
Author: cziegeler
Date: Wed Jan 19 09:50:19 2005
New Revision: 125633

URL: http://svn.apache.org/viewcvs?view=rev&rev=125633
Log:
Use additional local block descriptors for building
Modified:
   cocoon/branches/BRANCH_2_1_X/   (props changed)
   cocoon/branches/BRANCH_2_1_X/status.xml
   cocoon/branches/BRANCH_2_1_X/tools/targets/compile-build.xml
   cocoon/branches/BRANCH_2_1_X/tools/targets/ide-build.xml

Modified: cocoon/branches/BRANCH_2_1_X/status.xml
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/status.xml?view=diff&rev=125633&p1=cocoon/branches/BRANCH_2_1_X/status.xml&r1=125632&p2=cocoon/branches/BRANCH_2_1_X/status.xml&r2=125633
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/status.xml	(original)
+++ cocoon/branches/BRANCH_2_1_X/status.xml	Wed Jan 19 09:50:19 2005
@@ -201,7 +201,10 @@
 
 
   <changes>
- <release version="@version@" date="@date@">
+  <release version="@version@" date="@date@">
+   <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/branches/BRANCH_2_1_X/tools/targets/compile-build.xml
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/tools/targets/compile-build.xml?view=diff&rev=125633&p1=cocoon/branches/BRANCH_2_1_X/tools/targets/compile-build.xml&r1=125632&p2=cocoon/branches/BRANCH_2_1_X/tools/targets/compile-build.xml&r2=125633
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/tools/targets/compile-build.xml	(original)
+++ cocoon/branches/BRANCH_2_1_X/tools/targets/compile-build.xml	Wed Jan 19 09:50:19 2005
@@ -218,7 +218,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/branches/BRANCH_2_1_X/tools/targets/ide-build.xml
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/tools/targets/ide-build.xml?view=diff&rev=125633&p1=cocoon/branches/BRANCH_2_1_X/tools/targets/ide-build.xml&r1=125632&p2=cocoon/branches/BRANCH_2_1_X/tools/targets/ide-build.xml&r2=125633
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/tools/targets/ide-build.xml	(original)
+++ cocoon/branches/BRANCH_2_1_X/tools/targets/ide-build.xml	Wed Jan 19 09:50:19 2005
@@ -25,13 +25,13 @@
   <target name="eclipse-customized-project" depends="prepare" description="Generate the
Eclipse customized project files (using local.block.properties)">
     <echo message="Building Eclipse Customized Project Files"/>
     <xslt in="${gump.descriptor}"
-            out="${build.temp}/blocks-eclipse.xml"
-            style="${tools}/ide/eclipse/blocks-classpath.xsl"/>
+          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 -->

Mime
View raw message