sylvain     01/11/12 10:04:43

  Modified:    .        build.xml
  Log:
  Include scratchpad in build. Time to reorganize the directories...
  
  Revision  Changes    Path
  1.90      +49 -1     xml-cocoon2/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/build.xml,v
  retrieving revision 1.89
  retrieving revision 1.90
  diff -u -r1.89 -r1.90
  --- build.xml 2001/11/08 14:42:07     1.89
  +++ build.xml 2001/11/12 18:04:43     1.90
  @@ -167,6 +167,14 @@
       </fileset>
     </path>
   
  +  <path id="scratchpad.classpath">
  +    <fileset dir="./lib">
  +      <include name="*.jar"/>
  +    </fileset>
  +    <!-- FIXME : how to build a path that references a property set in 'init' 
target ? -->
  +    <pathelement path="./build/cocoon/classes"/>
  +  </path>
  +
     <!-- =================================================================== -->
     <!-- Initialization target                                               -->
     <!-- =================================================================== -->
  @@ -201,6 +209,10 @@
       <property name="packages"     value="org.apache.*"/>
       <property name="context.dir" value="./documentation"/>
   
  +    <property name="scratchpad.dir"  value="./scratchpad"/>
  +    <property name="scratchpad.src"  value="${scratchpad.dir}/src"/>
  +    <property name="scratchpad.name" value="cocoon-scratchpad"/>
  +
       <property name="build.root"     value="./build"/>
       <property name="build.dir"      value="${build.root}/${name}"/>
       <property name="build.src"      value="${build.dir}/src"/>
  @@ -214,6 +226,9 @@
       <property name="build.tutorial.war" value="${build.dir}/tutorial"/>
       <property name="build.javadocs" value="${build.dir}/javadocs"/>
       <property name="build.context" value="${build.dir}/documentation"/>
  +    <property name="build.scratchpad" value="${build.dir}/scratchpad"/>
  +    <property name="build.scratchpad.src" value="${build.scratchpad}/src"/>
  +    <property name="build.scratchpad.dest" value="${build.scratchpad}/classes"/>
   
       <property name="dist.root"   value="./dist"/>
       <property name="dist.name" value="${name}-${version}"/>
  @@ -330,6 +345,12 @@
           <exclude name="**/samples/parentcm/*.java" unless="naming.present"/>
         </fileset>
       </copy>
  +
  +    <mkdir dir="${build.scratchpad.src}"/>
  +    <mkdir dir="${build.scratchpad.dest}"/>
  +    <copy todir="${build.scratchpad.src}" filtering="on">
  +      <fileset dir="${scratchpad.src}"/>
  +    </copy>
     </target>
   
     <!-- =================================================================== -->
  @@ -407,6 +428,7 @@
           <include name="**/Manifest.mf"/>
           <include name="**/*.xsl"/>
           <include name="**/*.roles"/>
  +        <include name="**/*.xconf"/>
           <include name="META-INF/**"/>
         </fileset>
       </copy>
  @@ -433,6 +455,25 @@
         <exclude name="**/Jaxen*"              unless="jaxen.present"/>
         <exclude name="**/Ora*"                unless="ora.driver.present"/>
       </javac>
  +
  +    <copy todir="${build.scratchpad.dest}">
  +      <fileset dir="${build.scratchpad.src}">
  +        <include name="**/Manifest.mf"/>
  +        <include name="**/*.xsl"/>
  +        <include name="**/*.roles"/>
  +        <include name="**/*.xconf"/>
  +        <include name="META-INF/**"/>
  +      </fileset>
  +    </copy>
  +
  +    <javac srcdir="${build.scratchpad.src}"
  +           destdir="${build.scratchpad.dest}"
  +           debug="${debug}"
  +           optimize="${optimize}"
  +           deprecation="${deprecation}"
  +           target="${target.vm}">
  +      <classpath refid="scratchpad.classpath"/>
  +    </javac>
     </target>
   
     <!-- =================================================================== -->
  @@ -446,6 +487,12 @@
           <exclude name="org/apache/cocoon/samples/**"/>
         </fileset>
       </jar>
  +
  +    <jar jarfile="${build.dir}/${scratchpad.name}.jar">
  +      <fileset dir="${build.scratchpad.dest}">
  +        <include name="org/**"/>
  +      </fileset>
  +    </jar>
     </target>
   
     <!-- =================================================================== -->
  @@ -848,9 +895,10 @@
     <!-- =================================================================== -->
     <target name="webapp-local" depends="prepare-webapp, prepare-webapp-libs"
         description="Generates a local webapp directory usable as servlet context for 
quicker turn around">
  -    <!-- delete file="${build.war}/WEB-INF/lib/${name}-${version}.jar"/ -->
  +    <delete file="${build.war}/WEB-INF/lib/${name}-${version}.jar"/>
       <copy todir="${build.war}/WEB-INF/classes">
         <fileset dir="${build.dest}"/>
  +      <fileset dir="${build.scratchpad.dest}"/>
       </copy>
     </target>
   
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     [EMAIL PROTECTED]
To unsubscribe, e-mail:          [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to