You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@forrest.apache.org by ni...@apache.org on 2002/07/07 21:14:08 UTC

cvs commit: xml-forrest/src/scratchpad/targets transform-v11.xml validate-v10.xml validate-v11.xml

nicolaken    2002/07/07 12:14:08

  Modified:    .        build.xml
               src/scratchpad/targets transform-v11.xml validate-v10.xml
                        validate-v11.xml
  Log:
  update build to run scratchpad and interactive
  
  Revision  Changes    Path
  1.6       +56 -2     xml-forrest/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/build.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- build.xml	7 Jul 2002 09:47:51 -0000	1.5
  +++ build.xml	7 Jul 2002 19:14:07 -0000	1.6
  @@ -7,7 +7,7 @@
     <!ENTITY import-antipede  SYSTEM "./tools/antipede/build.xtarget"> 
                      
   ]>
  -<project default="docs" basedir="." name="project build file">
  +<project default="interactive" basedir="." name="project build file">
   
   <description>
                      * ===================================== *
  @@ -20,7 +20,7 @@
                      
                      
                      For a simple interactive build, simply 
  -                   run the build script (build.bar or build.sh)
  +                   run the build script (build.bat or build.sh)
   </description>
   
     <path id="classpath">
  @@ -89,6 +89,49 @@
       </antcall>
     </target>
   
  +  <!-- =================================================================== -->
  +  <!-- Interactive build                                                   -->
  +  <!-- =================================================================== -->
  +  <target name="interactive" description="Interactive Build" depends="-init">          
  +    <echo> 
  +    --------------------------------------------------------------
  +
  +          ${xgump.module.project.name} ${xgump.module.project.version.major}.${xgump.module.project.version.minor}   [${YEAR}]
  +
  +    --------------------------------------------------------------
  +     Using ${ant.version}
  +     Build file ${ant.file}
  +    --------------------------------------------------------------   
  +     These are the most common build targets.   
  +     You can also invoke them directly; see build.xml for more info. 
  +     Builds will be in /build directory, distributions in /dist.        
  +        
  +   
  +     compile ---------- compiles the source code      
  +     test ------------- performs the jUnit tests       
  +     jar -------------- create the jar files
  +     docs ------------- generates the html docs - clean not needed        
  +     javadocs --------- generates the API documentation   
  +     site ------------- generates the html site (docs+reports)    
  +     clean ------------ cleans the build directory    
  +     dist ------------- creates src and bin distributions    
  +     scratchpad ------- build-run scratchpad code       
  +     contrib ---------- build-run contributed code    
  +   
  +
  +    </echo>
  +    <property name="input.selection" value="docs"/>        
  +    <centipede-user-input name="input.selection">Please select a target </centipede-user-input>   
  +    
  +    <antcall target="call-cent">
  +      <param name="cent-name"   value="centipede"/> 
  +      <param name="cent-target" value="splash"/> 
  +    </antcall>
  + 
  +    <antcall target="${input.selection}"/>
  +    
  +  </target>
  +
   
     <!-- ================================== -->
     <!--              Compile               -->
  @@ -104,6 +147,17 @@
       
     </target>             
     
  +  <!-- ================================== -->
  +  <!--              Scratchpad               -->
  +  <!-- ================================== -->
  +
  +  <target  name="scratchpad"   depends="-init"
  +           description="Execute scratchpad targets">
  +           
  +    <ant antfile="${xlayout.source.scratchpad.targets.dir}/scratchpad.xml"/>
  +    
  +  </target>  
  +    
     <!-- ================== -->
     <!-- Prepares the docs  -->
     <!-- ================== -->
  
  
  
  1.3       +9 -9      xml-forrest/src/scratchpad/targets/transform-v11.xml
  
  Index: transform-v11.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/scratchpad/targets/transform-v11.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- transform-v11.xml	22 Jun 2002 02:34:48 -0000	1.2
  +++ transform-v11.xml	7 Jul 2002 19:14:07 -0000	1.3
  @@ -2,7 +2,7 @@
     undergoing testing. When ready they can be moved into the main build.xml -->
   
   <!DOCTYPE project [
  -<!ENTITY xmlcatalog-include SYSTEM "../../../build/xml-forrest/src/resources/schema/catalog-ant.xcat">
  +<!ENTITY xmlcatalog-include SYSTEM "../../../build/src/resources/schema/catalog-ant.xcat">
   ]>
   
   <project default="transform2v11" basedir="."
  @@ -23,13 +23,13 @@
     <xslt basedir="${v10.dir}"
       destdir="${v11.dir}"
       extension=".xml"
  -    style="${resource.dir}/library/xslt/docv10todocv11.xsl"
  +    style="${xlayout.source.resources.dir}/library/xslt/docv10todocv11.xsl"
       includes="**/*.xml"
       excludes="css/**, drafts/**, faq/faq**.xml, book.xml, **/book.xml, plan/changes-doc.xml"
     >
       <xmlcatalog refid="forrest-schema">
         <classpath>
  -        <pathelement location="${resource.dir}/schema" />
  +        <pathelement location="${xlayout.source.resources.dir}/schema" />
         </classpath>
       </xmlcatalog>
     </xslt> 
  @@ -39,13 +39,13 @@
     <xslt basedir="src/testcases/c2/v10/faq"
       destdir="src/testcases/c2/v11/faq"
       extension=".xml" 
  -    style="src/resources/library/xslt/faqv10tofaqv11.xsl"
  +    style="${xlayout.source.resources.dir}/library/xslt/faqv10tofaqv11.xsl"
       includes="*.xml"
       excludes="book.xml, index.xml"
     >
       <xmlcatalog refid="forrest-schema">
         <classpath>
  -        <pathelement location="${resource.dir}/schema" />
  +        <pathelement location="${xlayout.source.resources.dir}/schema" />
         </classpath>
       </xmlcatalog>
     </xslt> 
  @@ -55,12 +55,12 @@
     <xslt basedir="src/testcases/c2/v10"
       destdir="src/testcases/c2/v11"
       extension=".xml" 
  -    style="src/resources/library/xslt/bookv10.xsl"
  +    style="${xlayout.source.resources.dir}/library/xslt/bookv10.xsl"
       includes="book.xml, **/book.xml"
     >
       <xmlcatalog refid="forrest-schema">
         <classpath>
  -        <pathelement location="${resource.dir}/schema" />
  +        <pathelement location="${xlayout.source.resources.dir}/schema" />
         </classpath>
       </xmlcatalog>
     </xslt> 
  @@ -70,12 +70,12 @@
     <xslt basedir="src/testcases/c2/v10/plan"
       destdir="src/testcases/c2/v11/plan"
       extension=".xml" 
  -    style="src/resources/library/xslt/changesv10tochangesv11.xsl"
  +    style="${xlayout.source.resources.dir}/library/xslt/changesv10tochangesv11.xsl"
       includes="changes-doc.xml"
     >
       <xmlcatalog refid="forrest-schema">
         <classpath>
  -        <pathelement location="${resource.dir}/schema" />
  +        <pathelement location="${xlayout.source.resources.dir}/schema" />
         </classpath>
       </xmlcatalog>
     </xslt> 
  
  
  
  1.3       +1 -1      xml-forrest/src/scratchpad/targets/validate-v10.xml
  
  Index: validate-v10.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/scratchpad/targets/validate-v10.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- validate-v10.xml	22 Jun 2002 02:34:48 -0000	1.2
  +++ validate-v10.xml	7 Jul 2002 19:14:07 -0000	1.3
  @@ -2,7 +2,7 @@
     undergoing testing. When ready they can be moved into the main build.xml -->
   
   <!DOCTYPE project [
  -<!ENTITY xmlcatalog-include SYSTEM "../../../build/xml-forrest/src/resources/schema/catalog-ant.xcat">
  +<!ENTITY xmlcatalog-include SYSTEM "../../../build/src/resources/schema/catalog-ant.xcat">
   ]>
   
   <project default="validate-v10" basedir="."
  
  
  
  1.3       +1 -1      xml-forrest/src/scratchpad/targets/validate-v11.xml
  
  Index: validate-v11.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/scratchpad/targets/validate-v11.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- validate-v11.xml	22 Jun 2002 02:34:48 -0000	1.2
  +++ validate-v11.xml	7 Jul 2002 19:14:07 -0000	1.3
  @@ -2,7 +2,7 @@
     undergoing testing. When ready they can be moved into the main build.xml -->
   
   <!DOCTYPE project [
  -<!ENTITY xmlcatalog-include SYSTEM "../../../build/xml-forrest/src/resources/schema/catalog-ant.xcat">
  +<!ENTITY xmlcatalog-include SYSTEM "../../../build/src/resources/schema/catalog-ant.xcat">
   ]>
   
   <project default="validate-v11" basedir="."