Return-Path: 
 <cvs-return-16175-apmail-cocoon-cvs-archive=cocoon.apache.org@cocoon.apache.org>
Delivered-To: apmail-cocoon-cvs-archive@www.apache.org
Received: (qmail 60447 invoked from network); 20 Dec 2003 08:05:19 -0000
Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12)
  by minotaur-2.apache.org with SMTP; 20 Dec 2003 08:05:19 -0000
Received: (qmail 32195 invoked by uid 500); 20 Dec 2003 08:04:55 -0000
Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org
Received: (qmail 32144 invoked by uid 500); 20 Dec 2003 08:04:54 -0000
Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cocoon.apache.org
list-help: <mailto:cvs-help@cocoon.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@cocoon.apache.org>
list-post: <mailto:cvs@cocoon.apache.org>
Delivered-To: mailing list cvs@cocoon.apache.org
Received: (qmail 32133 invoked by uid 500); 20 Dec 2003 08:04:54 -0000
Delivered-To: apmail-cocoon-2.1-cvs@apache.org
Received: (qmail 32130 invoked from network); 20 Dec 2003 08:04:54 -0000
Received: from unknown (HELO minotaur.apache.org) (209.237.227.194)
  by daedalus.apache.org with SMTP; 20 Dec 2003 08:04:54 -0000
Received: (qmail 60419 invoked by uid 1746); 20 Dec 2003 08:05:17 -0000
Date: 20 Dec 2003 08:05:17 -0000
Message-ID: <20031220080517.60418.qmail@minotaur.apache.org>
From: antonio@apache.org
To: cocoon-2.1-cvs@apache.org
Subject: cvs commit: cocoon-2.1/tools/targets init-build.xml
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

antonio     2003/12/20 00:05:17

  Modified:    tools/targets init-build.xml
  Log:
  Defining target VM
  
  Revision  Changes    Path
  1.3       +30 -28    cocoon-2.1/tools/targets/init-build.xml
  
  Index: init-build.xml
  ===================================================================
  RCS file: /home/cvs//cocoon-2.1/tools/targets/init-build.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- init-build.xml	19 Nov 2003 20:20:50 -0000	1.2
  +++ init-build.xml	20 Dec 2003 08:05:17 -0000	1.3
  @@ -1,4 +1,4 @@
  -<!-- === Initialization Targets ================================================ -->
  +<!-- === Initialization Targets ========================================== -->
   
     <target name="init">
   
  @@ -50,7 +50,7 @@
       <condition property="unless.exclude.webapp.samples">
         <istrue value="${exclude.webapp.samples}"/>
       </condition>
  -    
  +
       <condition property="unless.exclude.deprecated">
         <istrue value="${exclude.deprecated}"/>
       </condition>
  @@ -66,7 +66,7 @@
       <condition property="exclude.validate.xdocs">
         <isfalse value="${validate.xdocs}"/>
       </condition>
  -            
  +
       <filter token="Name"                value="${fullname}"/>
       <filter token="name"                value="${fullname}"/>
       <filter token="year"                value="${year}"/>
  @@ -121,54 +121,59 @@
              debug="off"
              optimize="on"
              deprecation="on"
  -           target="1.3"
  +           target="${target.vm}"
              nowarn="on"
              compiler="${compiler}"
              classpathref="tasks.classpath"/>
   
       <!-- A task to patch xml files -->
  -    <taskdef name="xpatch" classname="XConfToolTask" classpath="${tools.tasks.dest}"/>
  +    <taskdef name="xpatch" classname="XConfToolTask"
  +           classpath="${tools.tasks.dest}"/>
   
       <!-- Jing is used in various targets for XML validation with RELAX NG -->
  -    <taskdef name="jing" classname="com.thaiopensource.relaxng.util.JingTask" classpathref="tasks.classpath"/>
  +    <taskdef name="jing" classname="com.thaiopensource.relaxng.util.JingTask"
  +           classpathref="tasks.classpath"/>
   
  -    <!-- compile the loader, used to change classpath especially for the CLI and Jetty -->
  +    <!-- compile the loader, used to change classpath especially for
  +           the CLI and Jetty -->
       <mkdir dir="${tools.loader.dest}"/>
       <javac srcdir="${tools.loader.src}"
              destdir="${tools.loader.dest}"
              debug="off"
              optimize="on"
              deprecation="on"
  -           target="1.3"
  +           target="${target.vm}"
              nowarn="on"
              compiler="${compiler}"/>
   
     </target>
  -  
  -<!-- === Preparation Targets =================================================== -->
  +
  +<!-- === Preparation Targets ============================================= -->
   
     <!-- Prepare the build directory -->
     <target name="prepare" depends="init-tasks">
  -
  -    <echo>+-----------------------------------------------------------+</echo>
  -    <echo>             ${fullname} ${version} [${year}]</echo>
  -    <echo>+-----------------------------------------------------------+</echo>
  -    <echo> Building with ${ant.version}</echo>
  -    <echo> using build file ${ant.file}</echo>
  -    <echo> Compiling with debug ${compiler.debug}, optimize ${compiler.optimize}, deprecation ${compiler.deprecation}</echo>
  -    <echo>+--------------------| W A R N I N G |----------------------+</echo>
  -    <echo>   This build is targeted for use with JVM ${target.vm}</echo>
  -    <echo> Using this build on a virtual machine other than the one</echo>
  -    <echo>   it is targeted for may result in runtime errors.</echo>
  -    <echo>+-----------------------------------------------------------+</echo>
  -
  +    <echo>
  ++------------------------------------------------------------------+
  +             ${fullname} ${version} [${year}]
  ++------------------------------------------------------------------+
  + Building with ${ant.version}
  + using build file ${ant.file}
  + Compiling with debug ${compiler.debug}, optimize ${compiler.optimize}, deprecation ${compiler.deprecation}
  ++-------------------------| W A R N I N G |------------------------+
  + This build is targeted for use with JVM ${target.vm}
  + Using this build on a virtual machine other than the one
  + it is targeted for may result in runtime errors.
  ++------------------------------------------------------------------+
  +    </echo>
       <mkdir dir="${build}"/>
     </target>
   
  -<!-- === Clean Targets ========================================================= -->
  +<!-- === Clean Targets =================================================== -->
   
     <!-- Clean -->
  -  <target name="clean" depends="clean-cocoon,clean-webapp,clean-standalone-demo" description="Cleans the cocoon build, webapp and standalone-demo"/>
  +  <target name="clean"
  +         depends="clean-cocoon,clean-webapp,clean-standalone-demo"
  +         description="Cleans the cocoon build, webapp and standalone-demo"/>
   
     <!-- Clean the cocoon build directory -->
     <target name="clean-cocoon" depends="init" description="Cleans the cocoon build">
  @@ -184,6 +189,3 @@
     <target name="clean-standalone-demo" depends="init" description="Cleans the standalone-demo">
       <delete dir="${build.standalone.demo}"/>
     </target>
  -
  -
  -