cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stef...@apache.org
Subject cvs commit: xml-cocoon2 build.properties build.xml
Date Sat, 01 Mar 2003 17:48:18 GMT
stefano     2003/03/01 09:48:18

  Modified:    .        build.properties build.xml
  Log:
  starting to cleanup the huge samples mess (this will take a while people, so please be patient)
  
  Revision  Changes    Path
  1.13      +14 -16    xml-cocoon2/build.properties
  
  Index: build.properties
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/build.properties,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- build.properties	28 Feb 2003 13:34:11 -0000	1.12
  +++ build.properties	1 Mar 2003 17:48:18 -0000	1.13
  @@ -12,21 +12,20 @@
   exclude.webapp.documentation=true
   exclude.webapp.javadocs=true
   exclude.webapp.scratchpad=true
  -exclude.webapp.samples=true
  -
  -webapp.samples.database.driver=org.hsqldb.jdbcDriver
  -webapp.samples.database.url=jdbc:hsqldb:hsql://localhost:9002
  -webapp.samples.database.user=sa
  -webapp.samples.database.password=
  -
  -# ---- Build -------------------------------------------------------------------
  +#exclude.webapp.samples=true
   
   #exclude.scratchpad=true
   #exclude.deprecated=true
   
  +samples.database.driver=org.hsqldb.jdbcDriver
  +samples.database.url=jdbc:hsqldb:hsql://localhost:9002
  +samples.database.user=sa
  +samples.database.password=
  +
  +# ---- Build -------------------------------------------------------------------
  +
   build.root=build
   build=${build.root}/${name}-${version}
  -build.src=${build}/src
   build.dest=${build}/classes
   build.mocks=${build}/mocks
   build.test=${build}/test
  @@ -36,17 +35,13 @@
   build.javadocs=${build}/javadocs
   build.context=${build}/documentation
   build.context.printer=${build}/printer-documentation
  -build.temp=${build}/temp
  -# FIXME: is this needed
  -build.temp.browser=${build.temp}/browser
  -# FIXME: is this needed 
  -build.temp.printer=${build.temp}/printer
  -build.samples=${build}/samples
   build.blocks=${build}/blocks
   build.deprecated=${build}/deprecated
   build.scratchpad=${build}/scratchpad
   build.scratchpad.src=${build.scratchpad}/src
   build.scratchpad.dest=${build.scratchpad}/dest
  +build.samples=${build}/samples
  +build.temp=${build}/temp
   
   build.docs.loglevel=ERROR
   build.docs.printer.loglevel=ERROR
  @@ -55,7 +50,9 @@
   
   build.webapp=${build.root}/webapp
   build.webapp.webinf=${build.webapp}/WEB-INF
  +build.webapp.classes=${build.webapp.webinf}/classes
   build.webapp.lib=${build.webapp.webinf}/lib
  +build.webapp.samples=${build.webapp}/samples
   build.war=${build}/${name}.war
   
   # ---- Compilation -------------------------------------------------------------
  @@ -86,7 +83,7 @@
   packages=org.apache
   
   # Project descriptor
  -gump.project.info=gump.xml
  +gump.descriptor=gump.xml
   
   # Directory Layout
   src=src
  @@ -102,6 +99,7 @@
   blocks=${src}/blocks
   samples=${src}/samples
   webapp=${src}/webapp
  +webapp.samples=${webapp}/samples
   
   # Scratchpad Stuff
   scratchpad=${src}/scratchpad
  
  
  
  1.348     +68 -54    xml-cocoon2/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/build.xml,v
  retrieving revision 1.347
  retrieving revision 1.348
  diff -u -r1.347 -r1.348
  --- build.xml	28 Feb 2003 15:27:23 -0000	1.347
  +++ build.xml	1 Mar 2003 17:48:18 -0000	1.348
  @@ -150,7 +150,7 @@
       <mkdir dir="${build}"/>
     </target>
   
  -  <!-- Prepare the source -->
  +  <!-- Prepare the build directories -->
     <target name="prepare-core" depends="prepare">
       <mkdir dir="${build.dest}"/>
       <mkdir dir="${build.mocks}"/>
  @@ -242,18 +242,10 @@
     <target name="compile-deprecated" depends="prepare" unless="exclude.deprecated">
       <mkdir dir="${build.deprecated}"/>
   
  -    <!-- FIXME: Is this the correct place? -->
       <xpatch configuration="${build.dest}/org/apache/cocoon/cocoon.roles" 
               directory="${deprecated.conf}" 
               extension="xroles"/>
  -    <copy todir="${build.src}">
  -      <fileset dir="${deprecated.conf}">
  -        <include name="*.xmap"/>
  -        <include name="*.xpipe"/>
  -        <include name="*.xconf"/>
  -      </fileset>
  -    </copy>
  -
  +            
       <javac srcdir="${deprecated.src}"
              destdir="${build.deprecated}"
              debug="${compiler.debug}"
  @@ -264,20 +256,6 @@
              classpathref="classpath"/>
     </target>
   
  -  <!-- compiles sample code -->
  -  <target name="compile-samples" depends="prepare" unless="exclude.webapp.samples">
  -    <mkdir dir="${build.samples}"/>
  -
  -    <javac srcdir="${build.samples}"
  -       destdir="${build.samples}"
  -       debug="${compiler.debug}"
  -       optimize="${compiler.optimize}"
  -       deprecation="${compiler.deprecation}"
  -       target="${target.vm}"
  -       compiler="${compiler}"
  -       classpathref="classpath"/>
  -  </target>
  -
   <!-- Package Targets ======================================================= -->
   
     <!-- packages everything -->
  @@ -310,20 +288,13 @@
       </jar>
     </target>
   
  -  <!-- package sample code -->
  -  <target name="package-samples" depends="compile-samples" unless="exclude.webapp.samples">
  -    <jar jarfile="${build}/${name}-samples.jar">
  -      <fileset dir="${build.samples}"/>
  -    </jar>
  -  </target>
  -
   <!-- Block Targets ========================================================= -->
   
     <!-- compiles blocks -->
     <target name="blocks" depends="compile">
       <mkdir dir="${build.blocks}"/>
   
  -    <xslt in="${gump.project.info}"
  +    <xslt in="${gump.descriptor}"
             out="${build.temp}/blocks-build.xml"
             processor="trax"
             style="${tools}/src/blocks-build.xsl"/>
  @@ -406,7 +377,6 @@
     <!-- Create docs -->
     <target name="docs" depends="prepare-docs, validate-xdocs, docs_done" unless="docs.notrequired"
description="Builds the documentation">
       <mkdir dir="${build.docs}"/>
  -    <mkdir dir="${build.temp.browser}"/>
   
       <java classname="org.apache.cocoon.Main" fork="true" dir="${build.context}" failonerror="true"
maxmemory="128m">
         <arg value="-c."/>
  @@ -458,7 +428,6 @@
     <!-- Create printer friendly docs -->
     <target name="printer-docs" depends="prepare-printer-docs, validate-xdocs, printer-docs_done"
description="Builds printer-friendly documentation">
       <mkdir dir="${build.docs.printer}"/>
  -    <mkdir dir="${build.temp.printer}"/>
   
       <java classname="org.apache.cocoon.Main" fork="true" dir="${build.context.printer}"
failonerror="true" maxmemory="128m">
         <arg value="-c."/>
  @@ -491,7 +460,7 @@
       <echo message="-------------------------------------------------------------"/>
       <echo message="Not rebuilding Javadocs, as they are up-to-date:"/>
       <echo message="  ${build.javadocs}/packages.html is more recent than"/>
  -    <echo message="  ${build.src}/**/*.java"/>
  +    <echo message="  ${java}/**/*.java"/>
       <echo message="-------------------------------------------------------------"/>
     </target>
   
  @@ -535,9 +504,33 @@
   
     </target>
   
  +<!-- Samples Targets ======================================================= -->
  +
  +  <target name="samples" depends="prepare" unless="exclude.webapp.samples">
  +    <mkdir dir="${build.samples}"/>
  +
  +    <javac srcdir="${samples}"
  +       destdir="${build.samples}"
  +       debug="${compiler.debug}"
  +       optimize="${compiler.optimize}"
  +       deprecation="${compiler.deprecation}"
  +       target="${target.vm}"
  +       compiler="${compiler}"
  +       classpathref="classpath"/>
  +  </target>
  +  
  +  <target name="block-samples" depends="prepare" unless="exclude.webapp.samples">
  +    <!--
  +    <ant antfile="${build.temp}/blocks-build.xml"
  +         inheritAll="true"
  +         inheritRefs="false"
  +         target="samples"/>
  +    -->
  +  </target>
  +  
   <!-- Webapp targets ==================================================== -->
   
  -  <target name="prepare-webapp" depends="package, blocks">
  +  <target name="prepare-webapp" depends="blocks, package">
       <mkdir dir="${build.webapp}"/>
   
       <copy file="${webapp}/welcome.xml" tofile="${build.webapp}/welcome.xml" filtering="on"/>
  @@ -552,13 +545,11 @@
         <fileset dir="${webapp}/WEB-INF">
           <include name="entities/**"/>
           <include name="classes/**"/>
  -        <include name="deli/**"/>
           <include name="*.x*"/>
         </fileset>
       </copy>
   
       <copy file="${build}/${name}.jar" tofile="${build.webapp.lib}/${name}-${version}.jar"/>
  -    <copy file="${build}/${name}-deprecated.jar" tofile="${build.webapp.lib}/${name}-${version}-deprecated.jar"
failonerror="false"/>
   
       <copy todir="${build.webapp.lib}">
         <fileset dir="${lib}/endorsed">
  @@ -594,30 +585,48 @@
            inheritRefs="false"
            target="lib"/>
   
  -    <xpatch directory="${build.src}" extension="xmap" configuration="${build.webapp}/sitemap.xmap"/>
  -    <xpatch directory="${build.src}" extension="xpipe" configuration="${build.webapp}/sitemap.xmap"/>
  -    <xpatch directory="${build.src}" extension="xconf" configuration="${build.webapp}/WEB-INF/cocoon.xconf"/>
  -
       <ant antfile="${build.temp}/blocks-build.xml"
            inheritAll="true"
            inheritRefs="false"
            target="patch"/>
     </target>
   
  -  <target name="prepare-webapp-samples" depends="package-samples" unless="exclude.webapp.samples">
  +  <target name="prepare-webapp-samples" depends="prepare-webapp, samples, block-samples"
unless="exclude.webapp.samples">
   
  -    <copy file="${build}/${name}-samples.jar" tofile="${build.webapp.lib}/${name}-${version}-samples.jar"/>
  +    <!-- copy sample files -->
  +    <copy todir="${build.webapp.samples}" filtering="on">
  +      <fileset dir="${webapp.samples}">
  +       <exclude name="samples.xwelcome"/>
  +       <exclude name="old_sitemap.xmap"/>
  +       <exclude name="**/*.jpg"/>
  +       <exclude name="**/*.gif"/>
  +       <exclude name="**/*.png"/>
  +      </fileset>
  +    </copy>
   
  -    <xpatch directory="${build.src}" extension="samplesxpipe" configuration="${build.webapp}/samples/sitemap.xmap"/>
  +    <copy todir="${build.webapp.samples}" filtering="off">
  +      <fileset dir="${webapp.samples}">
  +       <include name="**/*.jpg"/>
  +       <include name="**/*.gif"/>
  +       <include name="**/*.png"/>
  +      </fileset>
  +    </copy>
   
  -    <ant antfile="${build.temp}/blocks-build.xml"
  -         inheritAll="true"
  -         inheritRefs="false"
  -         target="samples"/>
  +    <!-- copy sample classes -->
  +    <copy todir="${build.webapp.classes}" filtering="off">
  +      <fileset dir="${build.samples}"/>
  +    </copy>
   
  +    <!-- patch the welcome page to tell we have samples to show -->
  +    <xpatch directory="${webapp.samples}" extension="xwelcome" configuration="${build.webapp}/welcome.xml"/>
     </target>
   
  -  <target name="webapp" depends="prepare-webapp,prepare-webapp-samples"/>
  +  <target name="prepare-webapp-deprecated" depends="prepare-webapp" unless="exclude.deprecated">
  +    <copy file="${build}/${name}-deprecated.jar" tofile="${build.webapp.lib}/${name}-${version}-deprecated.jar"/>
  +    <xpatch directory="${deprecated.conf}" extension="xconf" configuration="${build.webapp}/WEB-INF/cocoon.xconf"/>
  +  </target>
  +  
  +  <target name="webapp" depends="prepare-webapp,prepare-webapp-samples,prepare-webapp-deprecated"/>
   
     <target name="war" depends="webapp">
       <!-- A task to create manifest for webapp. -->
  @@ -884,9 +893,6 @@
   
   <!-- Admin targets ========================================================= -->
   
  -  <!-- Gump target -->
  -  <target name="gump" depends="docs, javadocs, package, blocks, test"/>
  -
     <!-- Creates the web site  -->
     <target name="site" depends="docs, javadocs">
       <mkdir dir="${site}"/>
  @@ -908,6 +914,14 @@
              extension=".txt"
              force="true"/>
     </target>
  +
  +<!-- Gump targets ========================================================== -->
  +
  +  <!-- Builds Core -->
  +  <target name="gump-core" depends="package"/>
  +
  +  <!-- Builds Blocks -->
  +  <target name="gump-blocks" depends="blocks"/>
   
   <!-- Clean Targets ========================================================= -->
   
  
  
  

Mime
View raw message