You are viewing a plain text version of this content. The canonical link for it is here.
Posted to kato-commits@incubator.apache.org by sp...@apache.org on 2009/04/04 14:31:05 UTC
svn commit: r761948 - in /incubator/kato/trunk/org.apache.kato.api: ./
build.properties build.xml
Author: spoole
Date: Sat Apr 4 14:31:04 2009
New Revision: 761948
URL: http://svn.apache.org/viewvc?rev=761948&view=rev
Log:
Updated api build script to work on hudson. Build script output is now relative to the project and will be held in the output directory. The output dir has been added to svn ignore to prevent spurious checkin of build code. Check build.xml for config options
Modified:
incubator/kato/trunk/org.apache.kato.api/ (props changed)
incubator/kato/trunk/org.apache.kato.api/build.properties
incubator/kato/trunk/org.apache.kato.api/build.xml
Propchange: incubator/kato/trunk/org.apache.kato.api/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Apr 4 14:31:04 2009
@@ -0,0 +1 @@
+output
Modified: incubator/kato/trunk/org.apache.kato.api/build.properties
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato.api/build.properties?rev=761948&r1=761947&r2=761948&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato.api/build.properties (original)
+++ incubator/kato/trunk/org.apache.kato.api/build.properties Sat Apr 4 14:31:04 2009
@@ -11,17 +11,15 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#-------------------------------------------------------------------------------
-workspace=..
-builder=../builder.dtfj
-project=org.apache.kato.api
-src=./src
-bin=./bin
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- plugin.xml,\
- schema/
-
-javacSource=1.4
-javacTarget=1.4
+kato.dependency.root=../KatoBinaryDependencies/lib
+junit.jar=${kato.dependency.root}/junit.jar
+output=output
+dist=${output}/dist
+javadoc.output=${output}/javadoc
+junit.output=${output}/junit
+src=src
+testsrc=testsrc
+bin=bin
+srclevel=1.4
+jarfile=${dist}/kato.api-head.jar
+srcjarfile=${dist}/kato.api-head.src.jar
\ No newline at end of file
Modified: incubator/kato/trunk/org.apache.kato.api/build.xml
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato.api/build.xml?rev=761948&r1=761947&r2=761948&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato.api/build.xml (original)
+++ incubator/kato/trunk/org.apache.kato.api/build.xml Sat Apr 4 14:31:04 2009
@@ -14,15 +14,20 @@
-->
<!-- ======================================================================
- DTFJ API
-
+ Apache Kato API Build script
+
+ Configuration properties are kept in build.properties local to this
+ file.
+
+ Note that binary dependencies required by this project are assumed to
+ be held in a relative directory ../KatoBinaryDependencies/lib
+
====================================================================== -->
<project name="project" default="default">
- <tstamp/>
-
- <property file="./build.properties" />
- <property file="${builder}/build.properties" />
+ <tstamp />
+
+ <property file="build.properties" />
<!-- =================================
target: default
@@ -31,7 +36,7 @@
<target name="default">
<antcall target="clean" />
<antcall target="compile" />
-
+ <antcall target="test" />
<antcall target="javadoc" />
<antcall target="jar" />
@@ -42,40 +47,40 @@
<target name="clean">
<delete dir="${bin}" />
- <delete dir="${dist}" />
- <delete dir="${junit.output}" />
- <delete dir="${javadoc.results}" />
-
+ <delete dir="${output}" />
+
</target>
<!-- compile -->
<target name="compile">
-
+
<mkdir dir="${bin}" />
-
+
<javac srcdir="${src}" debug="on" destdir="${bin}" source="${srclevel}" target="${srclevel}" />
- <javac srcdir="${testsrc}" debug="on" destdir="${bin}" source="${srclevel}" target="${srclevel}" >
+ <javac srcdir="${testsrc}" debug="on" destdir="${bin}" source="${srclevel}" target="${srclevel}">
<classpath>
- <path location="${junit.path}" />
+ <path location="${junit.jar}" />
</classpath>
+
</javac>
<copy todir="${bin}/META-INF" file="META-INF/MANIFEST.MF">
<filterset>
- <filter token="TITLE" value="Apache DTFJ ${buildname} built ${DSTAMP}:${TSTAMP}"/>
- <filter token="VERSION" value="${build.number}"/>
- </filterset>
+ <filter token="TITLE" value="Apache Kato API ${buildname} built ${DSTAMP}:${TSTAMP}" />
+ <filter token="VERSION" value="${build.number}" />
+ </filterset>
</copy>
</target>
<target name="test" unless="no.test">
-
+
+ <mkdir dir="${output}" />
<mkdir dir="${junit.output}" />
-
+
<junit>
<classpath>
- <path location="${junit.path}" />
+ <path location="${junit.jar}" />
<path location="${bin}" />
</classpath>
@@ -94,7 +99,7 @@
<target name="jar">
<mkdir dir="${dist}" />
-
+
<jar jarfile="${jarfile}" filesonly="true" manifest="${bin}/META-INF/MANIFEST.MF">
<fileset dir="${bin}">
<exclude name="test**/*.class" />
@@ -111,8 +116,8 @@
<target name="javadoc" unless="no.javadoc">
- <mkdir dir="${javadoc.results}" />
- <javadoc packagenames="org.apache.kato.*" verbose="false" sourcepath="${src}" defaultexcludes="yes" destdir="${javadoc.results}" author="true" version="true" use="true" failonerror="true"/>
+ <mkdir dir="${javadoc.output}" />
+ <javadoc packagenames="org.apache.kato.*" verbose="false" sourcepath="${src}" defaultexcludes="yes" destdir="${javadoc.output}" author="true" version="true" use="true" failonerror="true" />
</target>