cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stef...@locus.apache.org
Subject cvs commit: xml-cocoon build.bat build.sh build.xml
Date Sun, 17 Sep 2000 00:15:19 GMT
stefano     00/09/16 17:15:19

  Modified:    .        Tag: xml-cocoon2 build.bat build.sh build.xml
  Log:
  ouch, cleaning up the build system is harder than I first imagined... I even had to patch
Ant... but now it works
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.10.2.12 +2 -2      xml-cocoon/build.bat
  
  Index: build.bat
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/build.bat,v
  retrieving revision 1.10.2.11
  retrieving revision 1.10.2.12
  diff -u -r1.10.2.11 -r1.10.2.12
  --- build.bat	2000/09/16 00:12:23	1.10.2.11
  +++ build.bat	2000/09/17 00:15:17	1.10.2.12
  @@ -2,7 +2,7 @@
   :: -----------------------------------------------------------------------------
   :: build.bat - Win32 Build Script for Apache Cocoon
   ::
  -:: $Id: build.bat,v 1.10.2.11 2000/09/16 00:12:23 stefano Exp $
  +:: $Id: build.bat,v 1.10.2.12 2000/09/17 00:15:17 stefano Exp $
   :: -----------------------------------------------------------------------------
   
   :: ----- Verify and Set Required Environment Variables -------------------------
  @@ -18,7 +18,7 @@
   
   :: ----- Set Up The Runtime Classpath ------------------------------------------
   
  -set CP=%JAVA_HOME%\lib\tools.jar;%ANT_HOME%\lib\ant.jar;
  +set CP=%JAVA_HOME%\lib\tools.jar;%ANT_HOME%\lib\ant.jar;.\lib\xerces_1_2.jar
   
   :: ----- Execute The Requested Build -------------------------------------------
   
  
  
  
  1.10.2.10 +2 -2      xml-cocoon/build.sh
  
  Index: build.sh
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/build.sh,v
  retrieving revision 1.10.2.9
  retrieving revision 1.10.2.10
  diff -u -r1.10.2.9 -r1.10.2.10
  --- build.sh	2000/09/16 00:12:23	1.10.2.9
  +++ build.sh	2000/09/17 00:15:17	1.10.2.10
  @@ -2,7 +2,7 @@
   # -----------------------------------------------------------------------------
   # build.sh - Unix Build Script for Apache Cocoon
   #
  -# $Id: build.sh,v 1.10.2.9 2000/09/16 00:12:23 stefano Exp $
  +# $Id: build.sh,v 1.10.2.10 2000/09/17 00:15:17 stefano Exp $
   # -----------------------------------------------------------------------------
   
   # ----- Verify and Set Required Environment Variables -------------------------
  @@ -18,7 +18,7 @@
   
   # ----- Set Up The Runtime Classpath ------------------------------------------
   
  -CP=$ANT_HOME/lib/ant.jar:$JAVA_HOME/lib/tools.jar
  +CP=$JAVA_HOME/lib/tools.jar:$ANT_HOME/lib/ant.jar:./lib/xerces_1_2.jar
   
   # ----- Make sure Ant script is executable ------------------------------------
   
  
  
  
  1.6.2.33  +37 -16    xml-cocoon/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/build.xml,v
  retrieving revision 1.6.2.32
  retrieving revision 1.6.2.33
  diff -u -r1.6.2.32 -r1.6.2.33
  --- build.xml	2000/09/16 00:12:23	1.6.2.32
  +++ build.xml	2000/09/17 00:15:17	1.6.2.33
  @@ -126,10 +126,11 @@
   
       <echo message="------------------- ${fullname} ${version} [${year}] ----------------"/>
   
  -    <property name="debug"       value="on"/>
  -    <property name="optimize"    value="on"/>
  -    <property name="deprecation" value="off"/>
  +    <property name="debug"          value="on"/>
  +    <property name="optimize"       value="off"/>
  +    <property name="deprecation"    value="off"/>
       <property name="build.compiler" value="classic"/>
  +    <property name="target.vm"      value="1.2"/>
   
       <property name="src.dir"      value="./src"/>
       <property name="lib.dir"      value="./lib"/>
  @@ -167,16 +168,36 @@
       <filter token="log"     value="true"/>
       <filter token="verbose" value="true"/>
   
  -    <available property="servlet.present" classname="javax.servlet.http.HttpServlet"/>
  -    <available property="php.present"     classname="net.php.servlet"/>
  -    <available property="xt.present"      classname="com.jclark.xsl.sax.XMLProcessorImpl"/>
  -    <available property="svg.present"     classname="org.csiro.svg.dom.SVGDocumentImpl"/>
  -    <available property="rhino.present"   classname="org.mozilla.javascript.tools.jsc.Main"/>
  -    <available property="jstyle.present"  classname="jstyle.JSFormatter"/>
  -    <available property="fop.present"     classname="org.apache.fop.apps.Driver"/>
  -    <available property="jpeg.present"    classname="com.sun.image.codec.jpeg.JPEGCodec"/>
  -    <available property="png.present"     classname="com.keypoint.PngEncoder"/>
  -    <available property="jai.present"     classname="com.sun.media.jai.codec.ImageCodec"/>
  +    <available property="servlet.present" classname="javax.servlet.http.HttpServlet">
  +      <classpath refid="classpath"/>
  +    </available>
  +    <available property="php.present" classname="net.php.servlet">
  +      <classpath refid="classpath"/>
  +    </available>
  +    <available property="xt.present" classname="com.jclark.xsl.sax.XMLProcessorImpl">
  +      <classpath refid="classpath"/>
  +    </available>
  +    <available property="svg.present" classname="org.csiro.svg.dom.SVGDocumentImpl">
  +      <classpath refid="classpath"/>
  +    </available>
  +    <available property="rhino.present" classname="org.mozilla.javascript.tools.jsc.Main">
  +      <classpath refid="classpath"/>
  +    </available>
  +    <available property="jstyle.present" classname="jstyle.JSFormatter">
  +      <classpath refid="classpath"/>
  +    </available>
  +    <available property="fop.present" classname="org.apache.fop.apps.Driver">
  +      <classpath refid="classpath"/>
  +    </available>
  +    <available property="jpeg.present" classname="com.sun.image.codec.jpeg.JPEGCodec">
  +      <classpath refid="classpath"/>
  +    </available>
  +    <available property="png.present" classname="com.keypoint.PngEncoder">
  +      <classpath refid="classpath"/>
  +    </available>
  +    <available property="jai.present" classname="com.sun.media.jai.codec.ImageCodec">
  +      <classpath refid="classpath"/>
  +    </available>
       <available property="action.present"  file="action.inc"/>
     </target>
   
  @@ -213,12 +234,12 @@
         <include name="sitemap.xsl" if="action.present"/>
       </copydir>
   
  -
       <javac srcdir="${build.src}"
              destdir="${build.dest}"
              debug="${debug}"
              optimize="${optimize}"
  -           deprecation="${deprecation}">
  +           deprecation="${deprecation}"
  +           target="${target.vm}">
         <classpath refid="classpath"/>
         <exclude name="**/*.html"/>
         <exclude name="**/CocoonServlet*.java" unless="servlet.present"/>
  @@ -226,7 +247,7 @@
         <exclude name="**/SVG*.java"           unless="svg.present"/>
         <exclude name="**/Javascript*"         unless="rhino.present"/>
         <exclude name="**/Jstyle*"             unless="jstyle.present"/>
  -      <exclude name="**/FO2*"                unless="fop.present"/>
  +      <exclude name="**/FOP*"                unless="fop.present"/>
         <exclude name="**/Php*"                unless="php.present"/>
         <exclude name="**/JPEGEncoder*.java"   unless="jpeg.present"/>
         <exclude name="**/PNGEncoder*.java"    unless="png.present"/>
  
  
  

Mime
View raw message