You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by lg...@apache.org on 2005/10/13 11:55:20 UTC

svn commit: r320705 - in /cocoon/trunk/tools: ide/eclipse/blocks-classpath.xsl targets/ide-build.xml

Author: lgawron
Date: Thu Oct 13 02:55:11 2005
New Revision: 320705

URL: http://svn.apache.org/viewcvs?rev=320705&view=rev
Log:
reintroduce old build eclipse-project in a new way

Modified:
    cocoon/trunk/tools/ide/eclipse/blocks-classpath.xsl
    cocoon/trunk/tools/targets/ide-build.xml

Modified: cocoon/trunk/tools/ide/eclipse/blocks-classpath.xsl
URL: http://svn.apache.org/viewcvs/cocoon/trunk/tools/ide/eclipse/blocks-classpath.xsl?rev=320705&r1=320704&r2=320705&view=diff
==============================================================================
--- cocoon/trunk/tools/ide/eclipse/blocks-classpath.xsl (original)
+++ cocoon/trunk/tools/ide/eclipse/blocks-classpath.xsl Thu Oct 13 02:55:11 2005
@@ -23,7 +23,7 @@
     <xsl:template match="/">
         <project default="generate-customized-eclipse-project" basedir="." name="blocks-eclipse">
             <description>Autogenerated Ant build file that builds customized eclipse project for selected blocks.</description>
-        	<!-- copied over from blocks-build.xsl -->
+            <!-- copied over from blocks-build.xsl -->
             <macrodef name="test-include-block">
                 <attribute name="name"/>
                 <sequential>
@@ -34,7 +34,10 @@
                         </and>
                     </condition>
                     <condition property="internal.exclude.block.@{{name}}">
-                        <not><istrue value="${{include.block.@{{name}}}}"/></not>
+                        <and>
+                            <not><istrue value="${{unconditional.include.all.blocks}}"/></not>
+                            <not><istrue value="${{include.block.@{{name}}}}"/></not>
+                        </and>
                     </condition>
                 </sequential>
             </macrodef>
@@ -47,7 +50,10 @@
 
         <!-- Define wich blocks will be included -->
         <target name="init">
-        	<!-- copied over from blocks-build.xsl -->
+            <!-- copied over from blocks-build.xsl -->
+            <condition property="default.block.mode" value="include">
+                <istrue value="${{unconditional.include.all.blocks}}"/>
+            </condition>
             <condition property="default.block.mode" value="include">
                 <istrue value="${{include.all.blocks}}"/>
             </condition>

Modified: cocoon/trunk/tools/targets/ide-build.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/tools/targets/ide-build.xml?rev=320705&r1=320704&r2=320705&view=diff
==============================================================================
--- cocoon/trunk/tools/targets/ide-build.xml (original)
+++ cocoon/trunk/tools/targets/ide-build.xml Thu Oct 13 02:55:11 2005
@@ -21,8 +21,15 @@
   <!-- for those who like long names.. -->
   <target name="eclipse-customized-project" depends="eclipse-project"/>
   
+  <target name="init-full-eclipse-project">
+    <property name="unconditional.include.all.blocks" value="true"/>
+  </target>
+  
+  <target name="full-eclipse-project" depends="init-full-eclipse-project, eclipse-project"/>
+  
   <!-- Build the Eclipse customized project's files -->
-  <target name="eclipse-project" description="Generate the Eclipse customized project files (using local.block.properties)">
+  <target name="eclipse-project" 
+    description="Generate the Eclipse customized project files (using local.block.properties). Use -Dunconditional.include.all.blocks=true to override local.build.properties">
     <echo message="Building Eclipse Customized Project Files"/>
     <xslt in="${gump.descriptor}"
           out="${build.temp}/blocks-eclipse.xml"