Merge pull request #48 from jvirkki/easier2build

Support for easily building a faban tarball out of the box.

.gitignore

@@ -1,5 +1,28 @@
 common/build
+common/build.properties
 driver/build
+driver/build.properties
 driver/lib/fabancommon.jar
 harness/build
+harness/build.properties
 harness/lib/fabancommon.jar
+stage/build.properties
+
+nightly/
+stage/ant/
+stage/bin/
+stage/config/
+stage/javadocs.zip
+stage/lib/commons-codec-1.2.jar
+stage/lib/commons-httpclient-3.1.jar
+stage/lib/commons-logging.jar
+stage/lib/fabanagents.jar
+stage/lib/fabancommon.jar
+stage/lib/fabandriver.jar
+stage/master/conf/Catalina/localhost/faban.xml
+stage/master/webapps/faban.war
+stage/master/webapps/faban/
+stage/release
+stage/resources/
+stage/samples/
+stage/src.zip

README

@@ -5,9 +5,9 @@ Faban is distributed under the Common Development and Distribution
 License (CDDL). A copy of the CDDL license can be found at in
 stage/legal/LICENSE.
 
-To build, go to each of common,driver,harness: copy build.properties.template
-to build.properties and edit for your envrionment.
-Typing 'an't will build each of these modules.
+To build an installable tarball, just run ant from the top level directory.
+Be sure environment variable JDK_HOME points to a suitable JDK installation.
 
-To package, go to 'stage', create build.properties from build.properties.template
- and type 'ant'.
+Local customization of the build options can be done by copying the
+build-defaults.properties file in each source directory to
+build.properties and making local changes there.

build.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<project default="build">
+
+  <target name="build">
+    <ant dir="common"/>
+    <ant dir="driver"/>
+    <ant dir="harness"/>
+    <ant dir="stage"/>
+  </target>
+
+  <target name="clean">
+    <ant dir="common" target="clean"/>
+    <ant dir="driver" target="clean"/>
+    <ant dir="harness" target="clean"/>
+    <ant dir="stage" target="clean-all"/>
+  </target>
+
+</project>

common/build.properties.template → common/build-defaults.properties

@@ -1,4 +1,3 @@
-jdk.home=/apps/JVMs/jdk1.5.0
 compiler.debug=on
 compiler.generate.no.warnings=off
 compiler.args=-Xlint

common/build.xml

@@ -27,6 +27,7 @@
 
     <!-- Compiler options -->
     <property file="build.properties"/>
+    <property file="build-defaults.properties"/>
     <property name="compile.output" value="build/classes"/>
     <property name="compile.test.output" value="build/test/classes"/>
     <property name="test.results.dir" value="build/test/output"/>

harness/build.properties.tempate → driver/build-defaults.properties

@@ -4,5 +4,3 @@ compiler.args=
 compiler.max.memory=128m
 compiler.target.version=1.5
 junit.jar=/opt/netbeans-6.5/platform9/modules/ext/junit-4.5.jar
-jdk.home=/usr/java/latest
-

driver/build.xml

@@ -27,6 +27,8 @@
 
     <!-- Compiler options -->
     <property file="build.properties"/>
+    <property file="build-defaults.properties"/>
+    <property environment="env"/>
     <property name="compile.output" value="build/classes"/>
     <property name="compile.test.output" value="build/test/classes"/>
     <property name="test.results.dir" value="build/test/output"/>
@@ -38,7 +40,7 @@
 
     <path id="class.path">
         <fileset dir="lib" includes="*.jar"/>
-        <fileset dir="${jdk.home}/lib" includes="tools.jar"/>
+        <fileset dir="${env.JDK_HOME}/lib" includes="tools.jar"/>
     </path>
 
     <path id="test.class.path">

driver/build.properties.template → harness/build-defaults.properties

@@ -1,4 +1,3 @@
-jdk.home=/apps/JVMs/jdk1.6.0
 compiler.debug=on
 compiler.generate.no.warnings=off
 compiler.args=

harness/build.xml

@@ -27,6 +27,8 @@
 
     <!-- Compiler options -->
     <property file="build.properties"/>
+    <property file="build-defaults.properties"/>
+    <property environment="env"/>
     <property name="compile.output" value="build/classes"/>
     <property name="compile.test.output" value="build/test/classes"/>
     <property name="test.results.dir" value="build/test/output"/>
@@ -42,7 +44,7 @@
     <path id="class.path">
         <fileset dir="lib" includes="*.jar"/>
         <fileset dir="../stage/master/common/lib" includes="*.jar"/>
-        <fileset dir="${jdk.home}/lib" includes="tools.jar"/>
+        <fileset dir="${env.JDK_HOME}/lib" includes="tools.jar"/>
     </path>
 
     <path id="test.class.path">

stage/build.properties.template → stage/build-defaults.properties

@@ -10,10 +10,7 @@ workspace.dir=..
 
 # The directory where the finished kit should go.
 # By default, the nightly build download area.
-kit.dir=../../../nightly
-
-# The base directory for public web site output
-public.dir=../../../www
+kit.dir=../nightly
 
 # Directory for temp files
 tmp.dir=/tmp

stage/build.xml

@@ -26,6 +26,7 @@
 <project name="Faban Kit" default="all">
 
     <property file="build.properties"/>
+    <property file="build-defaults.properties"/>
     <property name="jar.output" value="build/lib"/>
     <property name="lib.dir" value="lib"/>
     <property name="docs.dir" value="${tmp.dir}/fabandocs"/>