Author: rjung
Date: Wed Sep 16 17:00:48 2009
New Revision: 815883

URL: http://svn.apache.org/viewvc?rev=815883&view=rev
Log:
Pick up modern build.xml from tc5.5.x jni.
- better support for build.properties
- handling version numbers
- careing about charset when filtering

Modified:
    tomcat/native/branches/1.1.x/build.properties.default
    tomcat/native/branches/1.1.x/build.xml

Modified: tomcat/native/branches/1.1.x/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/build.properties.default?rev=815883&r1=815882&r2=815883&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/build.properties.default (original)
+++ tomcat/native/branches/1.1.x/build.properties.default Wed Sep 16 17:00:48 
2009
@@ -1,3 +1,27 @@
+#
+#  Licensed to the Apache Software Foundation (ASF) under one or more
+#  contributor license agreements.  See the NOTICE file distributed with
+#  this work for additional information regarding copyright ownership.
+#  The ASF licenses this file to You under the Apache License, Version 2.0
+#  (the "License"); you may not use this file except in compliance with
+#  the License.  You may obtain a copy of the License at
+# 
+#      http://www.apache.org/licenses/LICENSE-2.0
+# 
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+#
+
+# ----- Vesion Control Flags -----
+version.major=1
+version.minor=1
+version.build=17
+version.patch=0
+version.suffix=-dev
+
 # The directory containing your binary distribution of JUnit,
 # version 3.8 or later
 junit.home = /usr/local/java/junit3.8.1

Modified: tomcat/native/branches/1.1.x/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/build.xml?rev=815883&r1=815882&r2=815883&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/build.xml (original)
+++ tomcat/native/branches/1.1.x/build.xml Wed Sep 16 17:00:48 2009
@@ -22,20 +22,35 @@
     -->
     <property file="${user.home}/.ant.properties" />
     <property file="${user.home}/build.properties" />
-    <property file="build.properties" />
     <property file=".ant.properties" />
+    <property file="build.properties" />
+    <property file="build.properties.default"/>
 
     <!-- Initialization properties -->
-    <property name="name" value="Tomcat Native"/>
-    <property name="title" value="Tomcat Native Library"/>
-    <property name="version" value="1.0.0"/>
-    <property name="version.number" value="100"/>
-    <property name="project" value="tomcat-native"/>
+    <property name="project"               value="tomcat-native" />
+    <property name="name"                  value="Tomcat Native" />
+    <property name="title"                 value="Tomcat Native Library"/>
+    <property name="year"                  value="2009" />
+    <property name="version.major"         value="1" />
+    <property name="version.minor"         value="1" />
+    <property name="version.build"         value="17" />
+    <property name="version.patch"         value="0" />
+    <property name="version.suffix"        value="-dev" />
+
+    <property name="junit.home"            value="/usr/local/junit3.8"/>
+    <property name="junit.jar"             value="${junit.home}/junit.jar"/>
+    <property name="test.runner"           value="junit.textui.TestRunner"/>
+
+    <property name="version"               
value="${version.major}.${version.minor}.${version.build}${version.suffix}" />
+    <property name="version.number"        
value="${version.major}.${version.minor}.${version.build}.${version.patch}" />
+    <property name="version.major.minor"   
value="${version.major}.${version.minor}" />
+
+    <property name="final.name"            value="${project}-${version}" />
+
     <property name="build.dir" value="./dist"/>
     <property name="build.src" value="${build.dir}/src"/>
     <property name="build.dest" value="${build.dir}/classes"/>
     <property name="src.dir" value="."/>
-    <property name="final.name" value="${project}-${version}"/>
     <property name="dist.root" value="./dist"/>
     <property name="ant.home" value="."/>
 
@@ -46,15 +61,13 @@
     <property name="docs.src" value="./xdocs"/>
     <property name="docs.dest" value="${dist.root}/doc"/>
     <property name="docs.dest.print" value="${dist.root}/doc/printable"/>
-    <property name="test.runner" value="junit.textui.TestRunner"/>
     <property name="test.dir" value="${build.dest}/test"/>
     <property name="examples.dir" value="${build.dest}/examples"/>
-    <property name="junit.home" value="/usr/local/junit3.8"/>
-    <property name="junit.jar" value="${junit.home}/junit.jar"/>
+
     <property name="tc.library.path" value="${basedir}/native/.libs"/>
 
-      <!-- The base directory for component sources -->
-      <property name="source.home"             value="java"/>
+    <!-- The base directory for component sources -->
+    <property name="source.home"             value="java"/>
 
     <!-- Build classpath -->
     <path id="classpath">
@@ -145,7 +158,7 @@
         <filter token="VERSION" value="${version}"/>
         <filter token="VERSION_NUMBER" value="${version.number}"/>
         <filter token="VERSION_BUILT" value="${TODAY} ${TSTAMP}"/>
-        <copy todir="${build.src}/java" filtering="yes">
+        <copy todir="${build.src}/java" filtering="yes" encoding="ISO-8859-1">
             <fileset dir="${src.dir}/java">
                 <include name="**/*.java"/>
                 <include name="**/*.xml"/>
@@ -157,10 +170,11 @@
             destdir="${build.dest}/java"
             debug="${debug}"
             deprecation="${deprecation}"
-            optimize="${optimize}">
+            optimize="${optimize}"
+            encoding="ISO-8859-1">
             <classpath refid="classpath"/>
         </javac>
-        <copy todir="${build.dest}/java" filtering="yes">
+        <copy todir="${build.dest}/java" filtering="yes" encoding="ISO-8859-1">
             <fileset dir="${build.src}/java">
                 <include name="**/*.xml"/>
                 <include name="**/*.properties"/>
@@ -175,10 +189,11 @@
                destdir="${build.home}/classes"
                  debug="${compile.debug}"
            deprecation="${compile.deprecation}"
-              optimize="${compile.optimize}">
+              optimize="${compile.optimize}"
+              encoding="ISO-8859-1">
           <classpath refid="classpath"/>
         </javac>
-        <copy    todir="${build.home}/classes" filtering="on">
+        <copy    todir="${build.home}/classes" filtering="on" 
encoding="ISO-8859-1">
           <fileset dir="${source.home}" excludes="**/*.java"/>
         </copy>
       </target>
@@ -199,7 +214,7 @@
         <filter token="VERSION" value="${version}"/>
         <filter token="VERSION_NUMBER" value="${version.number}"/>
         <filter token="VERSION_BUILT" value="${TODAY} ${TSTAMP}"/>
-        <copy todir="${build.src}/examples" filtering="yes">
+        <copy todir="${build.src}/examples" filtering="yes" 
encoding="ISO-8859-1">
             <fileset dir="${src.dir}/examples">
                 <include name="**/*.java"/>
                 <include name="**/*.xml"/>
@@ -211,10 +226,11 @@
             destdir="${build.dest}/examples"
             debug="${debug}"
             deprecation="${deprecation}"
-            optimize="${optimize}">
+            optimize="${optimize}"
+            encoding="ISO-8859-1">
             <classpath refid="examples.classpath"/>
         </javac>
-        <copy todir="${build.dest}/examples" filtering="yes">
+        <copy todir="${build.dest}/examples" filtering="yes" 
encoding="ISO-8859-1">
             <fileset dir="${build.src}/examples">
                 <include name="**/*.xml"/>
                 <include name="**/*.properties"/>
@@ -251,7 +267,7 @@
     <target name="compile-tests" depends="compile">
         <mkdir dir="${build.dest}/test"/>
         <mkdir dir="${build.src}/test"/>
-        <copy todir="${build.src}/test" filtering="yes">
+        <copy todir="${build.src}/test" filtering="yes" encoding="ISO-8859-1">
             <fileset dir="${src.dir}/test">
                 <include name="**/*.java"/>
                 <include name="**/*.xml"/>
@@ -262,8 +278,8 @@
             destdir="${build.dest}/test"
             debug="on"
             deprecation="${deprecation}"
-            optimize="${optimize}">
-
+            optimize="${optimize}"
+            encoding="ISO-8859-1">
             <classpath refid="test.classpath"/>
         </javac>
     </target>
@@ -295,7 +311,7 @@
     <target name="compile-examples" depends="compile">
         <mkdir dir="${build.dest}/examples"/>
         <mkdir dir="${build.src}/examples"/>
-        <copy todir="${build.src}/examples" filtering="yes">
+        <copy todir="${build.src}/examples" filtering="yes" 
encoding="ISO-8859-1">
             <fileset dir="${src.dir}/examples">
                 <include name="**/*.java"/>
                 <include name="**/*.xml"/>
@@ -306,8 +322,8 @@
             destdir="${build.dest}/examples"
             debug="${debug}"
             deprecation="${deprecation}"
-            optimize="${optimize}">
-
+            optimize="${optimize}"
+            encoding="ISO-8859-1">
             <classpath refid="examples.classpath"/>
         </javac>
     </target>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to