Mailing-List: contact commits-help@commons.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@commons.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r765074 - in /commons/sandbox/runtime/trunk:
 build.properties.default build.xml
Date: Wed, 15 Apr 2009 07:45:06 -0000
To: commits@commons.apache.org
From: mturk@apache.org
Message-Id: <20090415074506.C26932388B9A@eris.apache.org>

Author: mturk
Date: Wed Apr 15 07:45:05 2009
New Revision: 765074

URL: http://svn.apache.org/viewvc?rev=765074&view=rev
Log:
Add build properties file and make compile flags naming consistent

Added:
    commons/sandbox/runtime/trunk/build.properties.default   (with props)
Modified:
    commons/sandbox/runtime/trunk/build.xml

Added: commons/sandbox/runtime/trunk/build.properties.default
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/build.properties.default?rev=765074&view=auto
==============================================================================
--- commons/sandbox/runtime/trunk/build.properties.default (added)
+++ commons/sandbox/runtime/trunk/build.properties.default Wed Apr 15 07:45:05 2009
@@ -0,0 +1,38 @@
+# -----------------------------------------------------------------------------
+# 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.
+#
+# -----------------------------------------------------------------------------
+# build.properties.default
+#
+# This is an example "build.properties" file, used to customize building 
+# Runtime for your local environment. It defines the location of all external
+# modules that Runtime depends on. Copy this file to "build.properties"
+# in the top-level source directory, and customize it as needed.
+#
+# -----------------------------------------------------------------------------
+
+# ----- Vesion Control Flags --------------------------------------------------
+version.major=0
+version.minor=9
+version.patch=3
+version.suffix=-dev
+
+# ----- Default Compile options -----------------------------------------------
+compile.source=1.5
+compile.target=1.5
+compile.debug=off
+compile.optimize=on
+compile.deprecation=on

Propchange: commons/sandbox/runtime/trunk/build.properties.default
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: commons/sandbox/runtime/trunk/build.xml
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/build.xml?rev=765074&r1=765073&r2=765074&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/build.xml (original)
+++ commons/sandbox/runtime/trunk/build.xml Wed Apr 15 07:45:05 2009
@@ -7,14 +7,16 @@
     <property file="${user.home}/.ant.properties" />
     <property file="${user.home}/build.properties" />
     <property file="build.properties" />
+    <property file="build.properties.default" />
     <property file=".ant.properties" />
 
     <!-- Initialization properties -->
     <property name="name" value="Apache Commons Runtime"/>
     <property name="title" value="Apache Commons Runtime core library"/>
-    <property name="version.major" value="1"/>
+    <property name="version.major" value="0"/>
     <property name="version.minor" value="0"/>
     <property name="version.patch" value="0"/>
+    <property name="version.suffix" value=""/>
     <property name="version" value="${version.major}.${version.minor}.${version.patch}"/>
     <property name="implementation" value="${version.major}.${version.minor}"/>
     <property name="version.number" value="${version.major}${version.minor}${version.patch}"/>
@@ -23,14 +25,10 @@
     <property name="build.src" value="${build.dir}/src"/>
     <property name="build.dest" value="${build.dir}/bin"/>
     <property name="src.dir" value="./src"/>
-    <property name="final.name" value="${project}-${version}"/>
+    <property name="final.name" value="${project}-${version}${version.suffix}"/>
     <property name="dist.root" value="./dist"/>
     <property name="ant.home" value="."/>
 
-    <property name="debug" value="off"/>
-    <property name="optimize" value="on"/>
-    <property name="deprecation" value="on"/>
-
     <property name="docs.src" value="./xdocs"/>
     <property name="docs.dest" value="${dist.root}/doc"/>
     <property name="docs.dest.print" value="${dist.root}/doc/printable"/>
@@ -48,8 +46,11 @@
     <property name="runtime.library.path" value="${runtime.natives.path}/.libs"/>
     <property name="runtime.attributes.base" value="org/apache/commons/runtime"/>
 
-    <property name="compile.source" value="5"/>
-    <property name="compile.target" value="5"/>
+    <property name="compile.source" value="1.5"/>
+    <property name="compile.target" value="1.5"/>
+    <property name="compile.debug" value="off"/>
+    <property name="compile.optimize" value="on"/>
+    <property name="compile.deprecation" value="on"/>
 
     <!-- The base directory for component sources -->
     <property name="source.home" value="java"/>
@@ -134,6 +135,9 @@
         </tstamp>
         <!-- Copy static resource files -->
         <filter token="VERSION" value="${version}"/>
+        <filter token="VERSION_MAJOR" value="${version.major}"/>
+        <filter token="VERSION_MINOR" value="${version.minor}"/>
+        <filter token="VERSION_PATHC" value="${version.patch}"/>
         <filter token="VERSION_NUMBER" value="${version.number}"/>
         <filter token="VERSION_BUILT" value="${TODAY} ${TSTAMP}"/>
         <copy todir="${build.src}/java" filtering="yes">
@@ -146,12 +150,12 @@
 
         <javac srcdir="${build.src}/java"
             destdir="${build.dest}/java"
-            debug="${debug}"
-            deprecation="${deprecation}"
+            debug="${compile.debug}"
+            deprecation="${compile.deprecation}"
             source="${compile.source}"
             target="${compile.target}"
             failonerror="false"
-            optimize="${optimize}">
+            optimize="${compile.optimize}">
             <classpath refid="classpath"/>
             <compilerarg line="-Xmaxerrs 1000"/>
         </javac>
@@ -206,11 +210,11 @@
 
         <javac srcdir="${build.src}/examples"
             destdir="${build.dest}/examples"
-            debug="${debug}"
+            debug="${compile.debug}"
             source="${compile.source}"
             target="${compile.target}"
-            deprecation="${deprecation}"
-            optimize="${optimize}">
+            deprecation="${compile.deprecation}"
+            optimize="${compile.optimize}">
             <classpath refid="examples.classpath"/>
         </javac>
         <copy todir="${build.dest}/examples" filtering="yes">
@@ -275,11 +279,11 @@
         </copy>
         <javac srcdir="${build.src}/test"
             destdir="${build.dest}/test"
-            debug="${debug}"
+            debug="${compile.debug}"
             source="${compile.source}"
             target="${compile.target}"
-            deprecation="${deprecation}"
-            optimize="${optimize}">
+            deprecation="${compile.deprecation}"
+            optimize="${compile.optimize}">
             <classpath refid="test.classpath"/>
         </javac>
     </target>