You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by jh...@apache.org on 2014/06/05 14:04:45 UTC
git commit: extract properties; add classpath to javadoc
Repository: ant-antlibs-common
Updated Branches:
refs/heads/master abc34f5a5 -> 51f7f8197
extract properties; add classpath to javadoc
Project: http://git-wip-us.apache.org/repos/asf/ant-antlibs-common/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-antlibs-common/commit/51f7f819
Tree: http://git-wip-us.apache.org/repos/asf/ant-antlibs-common/tree/51f7f819
Diff: http://git-wip-us.apache.org/repos/asf/ant-antlibs-common/diff/51f7f819
Branch: refs/heads/master
Commit: 51f7f81979e31e6ca6d7711c16508a229e940e09
Parents: abc34f5
Author: Jan Mat�rne <jh...@apache.org>
Authored: Thu Jun 5 14:04:22 2014 +0200
Committer: Jan Mat�rne <jh...@apache.org>
Committed: Thu Jun 5 14:04:22 2014 +0200
----------------------------------------------------------------------
build.properties | 47 +++++++++++++++++++++++++++++++++++++++++++++++
build.xml | 48 ++++++------------------------------------------
2 files changed, 53 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant-antlibs-common/blob/51f7f819/build.properties
----------------------------------------------------------------------
diff --git a/build.properties b/build.properties
index 676baf7..c0fde72 100644
--- a/build.properties
+++ b/build.properties
@@ -21,7 +21,54 @@ ivy.install.version=2.4.0-rc1
ivy.jar.dir=${basedir}/ivy
ivy.jar.file=${ivy.jar.dir}/ivy.jar
+
# Where to store the dependencies
lib.dir=lib
lib.dir.compile=${lib.dir}/compile
lib.dir.test=${lib.dir}/test
+
+
+# properties for build and test
+build=build
+build.classes=${build}/classes
+build.testclasses=${build}/test-classes
+build.lib=${build}/lib
+build.deps=${build}/deps
+build.javarepository=${build}/java-repository
+build.javadoc=${build}/javadoc
+src.junit=src/tests/junit
+src.antunit=src/tests/antunit
+
+
+# javac properties
+javac.-source=1.2
+javac.-target=1.2
+javac.debug=on
+
+
+# you really need a proper version in version.properties
+artifact.version=0.1-SNAPSHOT
+artifact.name=ant-${ant.project.name}
+artifact.stub=${artifact.name}-${artifact.version}
+jarname=${build.lib}/${artifact.stub}.jar
+target.jar=${jarname}
+
+
+# properties for distribution target
+dist.name=apache-${artifact.name}-${artifact.version}
+dist.base=distribution
+dist.base.source=${dist.base}/source
+dist.base.binaries=${dist.base}/binaries
+bin.dist.dir=dist-bin
+src.dist.dir=dist-src
+
+
+# junit test properties
+junit.fork=true
+junit.forkmode=once
+# Default to the location in the Ant installation
+ant-testutil.jar=${ant.home}/lib/ant-testutil.jar
+report.dir=${build}/reports
+antunit.report.dir=${report.dir}/antunit
+junit.report.dir=${report.dir}/junit
+
http://git-wip-us.apache.org/repos/asf/ant-antlibs-common/blob/51f7f819/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index ae3dede..f9785a1 100644
--- a/build.xml
+++ b/build.xml
@@ -23,7 +23,7 @@
<available property="with.ivy" file="ivy.xml"/>
<target name="setup-properties">
- <!-- load antlib specific configuration -->
+ <!-- load optional antlib specific configuration -->
<property file="build.properties"/>
<!--load in an optional file containing versions of things-->
<property file="version.properties"/>
@@ -35,53 +35,13 @@
and other libraries-->
<property file="${ant.home}/lib/libraries.properties"/>
- <!-- properties for build and test -->
- <property name="build" value="build"/>
- <property name="build.classes" value="${build}/classes"/>
- <property name="build.testclasses" value="${build}/test-classes"/>
- <property name="build.lib" value="${build}/lib"/>
- <property name="build.deps" value="${build}/deps"/>
- <property name="build.javarepository"
- value="${build}/java-repository"/>
- <property name="build.javadoc" value="${build}/javadoc"/>
- <property name="src.junit" location="src/tests/junit"/>
- <property name="src.antunit" location="src/tests/antunit"/>
-
<!-- javac properties -->
- <property name="javac.-source" value="1.2"/>
- <property name="javac.-target" value="1.2"/>
<property name="javac.test-source" value="${javac.-source}"/>
<property name="javac.test-target" value="${javac.-target}"/>
- <property name="javac.debug" value="on"/>
-
- <!--you really need a proper version in version.properties-->
- <property name="artifact.version" value="0.1-SNAPSHOT"/>
- <property name="artifact.name" value="ant-${ant.project.name}"/>
- <property name="artifact.stub" value="${artifact.name}-${artifact.version}"/>
- <property name="jarname" value="${build.lib}/${artifact.stub}.jar"/>
- <property name="target.jar" value="${jarname}"/>
-
+
<tstamp>
<format property="artifact.publication.datetime" pattern="yyyyMMddHHmmss"/>
</tstamp>
-
- <!-- properties for distribution target -->
- <property name="dist.name"
- value="apache-${artifact.name}-${artifact.version}"/>
- <property name="dist.base" value="distribution"/>
- <property name="dist.base.source" value="${dist.base}/source"/>
- <property name="dist.base.binaries" value="${dist.base}/binaries"/>
- <property name="bin.dist.dir" value="dist-bin"/>
- <property name="src.dist.dir" value="dist-src"/>
-
- <!-- junit test properties -->
- <property name="junit.fork" value="true" />
- <property name="junit.forkmode" value="once" />
- <!-- Default to the location in the Ant installation -->
- <property name="ant-testutil.jar" value="${ant.home}/lib/ant-testutil.jar" />
- <property name="report.dir" value="${build}/reports" />
- <property name="antunit.report.dir" value="${report.dir}/antunit" />
- <property name="junit.report.dir" value="${report.dir}/junit" />
</target>
<target name="setup" depends="setup-properties">
@@ -278,6 +238,10 @@
failonerror="true"
verbose="false">
<packageset dir="src/main"/>
+ <classpath>
+ <path refid="classpath.compile"/>
+ <fileset dir="${ant.home}/lib" includes="*.jar"/>
+ </classpath>
</javadoc>
</target>