You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by mt...@apache.org on 2009/09/23 10:37:12 UTC
svn commit: r818005 - /commons/sandbox/runtime/trunk/build.xml
Author: mturk
Date: Wed Sep 23 08:37:12 2009
New Revision: 818005
URL: http://svn.apache.org/viewvc?rev=818005&view=rev
Log:
Add and use build.package property
Modified:
commons/sandbox/runtime/trunk/build.xml
Modified: commons/sandbox/runtime/trunk/build.xml
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/build.xml?rev=818005&r1=818004&r2=818005&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/build.xml (original)
+++ commons/sandbox/runtime/trunk/build.xml Wed Sep 23 08:37:12 2009
@@ -29,12 +29,14 @@
<property name="dist.root" value="./dist"/>
<property name="ant.home" value="."/>
+ <property name="build.package.path" value="org/apache/commons/runtime"/>
+ <property name="build.package.name" value="org.apache.commons.runtime"/>
<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.entry" value="org.apache.commons.runtime.TestAll"/>
- <property name="test.child" value="org.apache.commons.runtime.TestChild"/>
+ <property name="test.entry" value="${build.package.name}.TestAll"/>
+ <property name="test.child" value="${build.package.name}.TestChild"/>
<property name="test.dir" value="${build.dest}/test"/>
<property name="examples.dir" value="${build.dest}/examples"/>
<property name="example" value="Unknown"/>
@@ -45,7 +47,6 @@
<property name="runtime.natives.path" value="${basedir}/src/main/native"/>
<property name="runtime.libname" value="libacr"/>
<property name="runtime.library.path" value="${runtime.natives.path}"/>
- <property name="runtime.attributes.base" value="org/apache/commons/runtime"/>
<property name="compile.source" value="1.5"/>
<property name="compile.target" value="1.5"/>
@@ -107,7 +108,7 @@
author="true"
version="true"
overview="${src.dir}/main/java/overview.html"
- packagenames="org.apache.commons.runtime.*"
+ packagenames="{build.package.name}.*"
windowtitle="${title} (Version ${version})"
doctitle="<h2>${title}</h2>"
bottom="Copyright 2009 The Apache Software Foundation<!--
@@ -149,11 +150,11 @@
<classpath refid="task.classpath"/>
</javac>
<taskdef name="systemid"
- classname="org.apache.commons.runtime.SystemIdTask">
+ classname="${build.package.name}.SystemIdTask">
<classpath refid="task.classpath"/>
</taskdef>
<taskdef name="uuid"
- classname="org.apache.commons.runtime.UuidTask">
+ classname="${build.package.name}.UuidTask">
<classpath refid="task.classpath"/>
</taskdef>
<uuid property="build.uuid" />
@@ -167,9 +168,9 @@
<mkdir dir="${build.dest}/java"/>
<mkdir dir="${build.src}"/>
<mkdir dir="${build.src}/java"/>
- <delete>
+ <delete failonerror="false">
<!-- Delete *.properties so that we always get the correct stamp -->
- <fileset dir="${build.src}/java" includes="**/*.properties"/>
+ <fileset dir="${build.src}/java/${build.package.path}" includes="*.properties"/>
</delete>
<tstamp>
<format property="TODAY" pattern="MMM d yyyy" locale="en"/>
@@ -211,23 +212,6 @@
</copy>
</target>
- <target name="compile-only"
- description="Compile shareable components">
-
- <javac srcdir="${source.home}"
- destdir="${build.home}/java"
- debug="${compile.debug}"
- source="${compile.source}"
- target="${compile.target}"
- deprecation="${compile.deprecation}"
- optimize="${compile.optimize}">
- <classpath refid="classpath"/>
- </javac>
- <copy todir="${build.home}/java" filtering="on">
- <fileset dir="${source.home}" excludes="**/*.java"/>
- </copy>
- </target>
-
<!-- =================================================================== -->
<!-- Compiles the examples directory -->
<!-- =================================================================== -->
@@ -284,7 +268,7 @@
basedir="${build.dest}/java"
excludes="**/*.${systemid.so}" >
<manifest>
- <section name="${runtime.attributes.base}">
+ <section name="${build.package.path}">
<attribute name="Specification-Title" value="Apache Commons Runtime library"/>
<attribute name="Specification-Version" value="${implementation}"/>
<attribute name="Specification-Vendor" value="Apache Software Foundation"/>
@@ -303,7 +287,7 @@
<target name="native-jar" depends="compile"
description="Generates the Jar file">
<systemid prefix="systemid" />
- <copy todir="${build.dest}/java/${runtime.attributes.base}/platform/${systemid.os}">
+ <copy todir="${build.dest}/java/${build.package.path}/platform/${systemid.os}">
<fileset dir="${runtime.library.path}">
<include name="*.${systemid.so}"/>
</fileset>
@@ -312,7 +296,7 @@
destfile="${build.dir}/${final.name}-${systemid.os}-${systemid.cpu}.jar"
basedir="${build.dest}/java" >
<manifest>
- <section name="${runtime.attributes.base}">
+ <section name="${build.package.path}">
<attribute name="Specification-Title" value="Apache Commons Runtime library"/>
<attribute name="Specification-Version" value="${implementation}"/>
<attribute name="Specification-Vendor" value="Apache Software Foundation"/>
@@ -321,7 +305,7 @@
<attribute name="Implementation-Vendor-Id" value="org.apache"/>
<attribute name="Implementation-Version" value="${version} (build ${DSTAMP} ${TSTAMP})"/>
</section>
- <section name="${runtime.attributes.base}/platform">
+ <section name="${build.package.path}/platform">
<attribute name="Operating-System" value="${systemid.os}"/>
<attribute name="Machine" value="${systemid.cpu}"/>
<attribute name="Library" value="${runtime.libname}.${systemid.so}"/>
@@ -427,7 +411,7 @@
<target name="run" depends="examples">
<echo message="Running Commons Runtime package example ${example} ..."/>
<java dir="${examples.dir}"
- classname="org.apache.commons.runtime.${example}"
+ classname="${build.package.name}.${example}"
fork="yes"
failonerror="${test.failonerror}">
<classpath refid="examples.classpath"/>
@@ -443,7 +427,7 @@
<target name="run64" depends="examples">
<echo message="Running Commons Runtime package example ${example} ..."/>
<java dir="${examples.dir}"
- classname="org.apache.commons.runtime.${example}"
+ classname="${build.package.name}.${example}"
fork="yes"
failonerror="${test.failonerror}">
<classpath refid="examples.classpath"/>