You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by gr...@apache.org on 2005/03/19 19:41:10 UTC

svn commit: r158263 - in lenya/trunk/src/targets: init-build.xml properties-build.xml

Author: gregor
Date: Sat Mar 19 10:41:08 2005
New Revision: 158263

URL: http://svn.apache.org/viewcvs?view=rev&rev=158263
Log:
Moved more properties to properties-build, enabled javac optimization

Modified:
    lenya/trunk/src/targets/init-build.xml
    lenya/trunk/src/targets/properties-build.xml

Modified: lenya/trunk/src/targets/init-build.xml
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/targets/init-build.xml?view=diff&r1=158262&r2=158263
==============================================================================
--- lenya/trunk/src/targets/init-build.xml (original)
+++ lenya/trunk/src/targets/init-build.xml Sat Mar 19 10:41:08 2005
@@ -31,25 +31,9 @@
       <format property="SNAPSHOT_STAMP" pattern="yyyyMMddhhmmss"/>
     </tstamp>
     
-    <property name="Name"     value="Apache Lenya"/>
-    <property name="release"  value="1th"/>
-    <property name="year"     value="1999-2004"/>
-
     <echo message="------------------- ${Name} ${version} [${year}] ----------------"/>
     <echo>Building with ${ant.version} using build file ${ant.file}</echo>
 
-    <property name="debug"          value="on"/>
-    <property name="optimize"       value="off"/>
-    <property name="deprecation"    value="off"/>
-    <property name="nowarn"         value="on"/>
-    <property name="build.compiler" value="modern"/>
-    <property name="target.vm"      value="1.4"/>
-
-    <property name="packages"      value="*.*"/>
-    <property name="resource.dir"  value="${src.webapp.dir}/resources/css"/>
-
-    <property name="today"         value="${TODAY}"/>
-
     <property name="snapshot.bin.name" value="${fullname}-${SNAPSHOT_STAMP}-bin"/>
     <property name="snapshot.src.name" value="${fullname}-${SNAPSHOT_STAMP}-src"/>
     <property name="snapshot.bin.dir" value="${dist.root}/${snapshot.bin.name}"/>
@@ -93,7 +77,9 @@
     <ant dir="${cocoon.src.dir}" inheritall="false"/>
   </target>
 
-  <!-- Prepare cocoon unless this is a gump build -->
+  <!-- ============================================================ -->
+  <!-- copy the bulk of the cocoon webapp to our destination        -->
+  <!-- ============================================================ -->
   <target name="prepare-cocoon" depends="check-cocoon" unless="gump.skipcocoonbuild">
     <taskdef name="xpatch" classname="XConfToolTask" classpath="${tools.tasks.dest}"/>
     <copy todir="${build.webapp}" filtering="off">
@@ -155,9 +141,6 @@
     -->
   </target>
 
-  <!-- ============================================================ -->
-  <!-- copy the bulk of the cocoon webapp to our destination        -->
-  <!-- ============================================================ -->
   <target name="prepare" depends="prepare-cocoon">
     <mkdir dir="${build.dir}"/>
     <mkdir dir="${build.webapp}"/>

Modified: lenya/trunk/src/targets/properties-build.xml
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/targets/properties-build.xml?view=diff&r1=158262&r2=158263
==============================================================================
--- lenya/trunk/src/targets/properties-build.xml (original)
+++ lenya/trunk/src/targets/properties-build.xml Sat Mar 19 10:41:08 2005
@@ -44,6 +44,19 @@
   <property name="version" value="1.4-dev"/>
   <property name="fullname" value="${ant.project.name}-${version}"/>
   <property name="distname" value="apache-${ant.project.name}-${version}"/>
+  <property name="Name"     value="Apache Lenya"/>
+  <property name="year"     value="1999-2004"/>
+
+  <property name="debug"          value="on"/>
+  <property name="optimize"       value="on"/>
+  <property name="deprecation"    value="off"/>
+  <property name="nowarn"         value="on"/>
+  <property name="target.vm"      value="1.4"/>
+
+  <property name="packages"      value="*.*"/>
+  <property name="resource.dir"  value="${src.webapp.dir}/resources/css"/>
+
+  <property name="today"         value="${TODAY}"/>
 
   <!-- The libraries we use and which are not already included in the cocoon package -->
   <property name="lib.dir" value="lib"/>
@@ -95,8 +108,6 @@
   contents of the cocoon webapp are here
   -->
   <property name="src.webapp.dir" value="src/webapp"/>
-  <!-- documentation directory -->
-  <property name="src.documentation.dir" value="src/documentation"/>
   <property name="tools.tasks.dest" value="tools/anttasks"/>
   <!-- cocoon build properties directory -->
   <property name="src.cocoon.properties.dir" value="src/cocoon"/>



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org