cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From step...@apache.org
Subject cvs commit: xml-cocoon2 build.properties build.xml
Date Wed, 05 Mar 2003 19:16:08 GMT
stephan     2003/03/05 11:16:08

  Modified:    .        build.properties build.xml
  Log:
  Moved the samples stuff from 'prepare-webapp-samples' to 'samples', since
  the 'block-samples' depend on samples.xml.
  Exclude all options by default, which is intended (I think), to have a
  clean webapp.
  
  Revision  Changes    Path
  1.14      +4 -4      xml-cocoon2/build.properties
  
  Index: build.properties
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/build.properties,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- build.properties	1 Mar 2003 17:48:18 -0000	1.13
  +++ build.properties	5 Mar 2003 19:16:07 -0000	1.14
  @@ -12,10 +12,10 @@
   exclude.webapp.documentation=true
   exclude.webapp.javadocs=true
   exclude.webapp.scratchpad=true
  -#exclude.webapp.samples=true
  +exclude.webapp.samples=true
   
  -#exclude.scratchpad=true
  -#exclude.deprecated=true
  +exclude.scratchpad=true
  +exclude.deprecated=true
   
   samples.database.driver=org.hsqldb.jdbcDriver
   samples.database.url=jdbc:hsqldb:hsql://localhost:9002
  @@ -137,4 +137,4 @@
   dist.samples=${dist}/samples
   
   # Site location
  -site=../xml-site/targets/cocoon
  \ No newline at end of file
  +site=../xml-site/targets/cocoon
  
  
  
  1.354     +29 -30    xml-cocoon2/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/build.xml,v
  retrieving revision 1.353
  retrieving revision 1.354
  diff -u -r1.353 -r1.354
  --- build.xml	5 Mar 2003 12:17:15 -0000	1.353
  +++ build.xml	5 Mar 2003 19:16:07 -0000	1.354
  @@ -521,15 +521,41 @@
          target="${target.vm}"
          compiler="${compiler}"
          classpathref="classpath"/>
  +
  +    <!-- 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>
  +
  +    <copy todir="${build.webapp.samples}" filtering="off">
  +      <fileset dir="${webapp.samples}">
  +       <include name="**/*.jpg"/>
  +       <include name="**/*.gif"/>
  +       <include name="**/*.png"/>
  +      </fileset>
  +    </copy>
  +
  +    <!-- 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="block-samples" depends="prepare" unless="exclude.webapp.samples">
  -    <!--
       <ant antfile="${build.temp}/blocks-build.xml"
            inheritAll="true"
            inheritRefs="false"
            target="samples"/>
  -    -->
     </target>
     
   <!-- Webapp targets ==================================================== -->
  @@ -596,33 +622,6 @@
     </target>
   
     <target name="prepare-webapp-samples" depends="prepare-webapp, samples, block-samples"
unless="exclude.webapp.samples">
  -
  -    <!-- 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>
  -
  -    <copy todir="${build.webapp.samples}" filtering="off">
  -      <fileset dir="${webapp.samples}">
  -       <include name="**/*.jpg"/>
  -       <include name="**/*.gif"/>
  -       <include name="**/*.png"/>
  -      </fileset>
  -    </copy>
  -
  -    <!-- 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="prepare-webapp-deprecated" depends="prepare-webapp" unless="exclude.deprecated">
  
  
  

Mime
View raw message