Skip to content

Commit 9627184

Browse files
henhen
committed
Regenerated build.xml from changed pom
git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/cli/branches/cli-1.0.x@542141 13f79535-47bb-0310-9956-ffa450edef68
1 parent d35f2fa commit 9627184

1 file changed

Lines changed: 22 additions & 79 deletions

File tree

‎build.xml‎

Lines changed: 22 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,32 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

33
<!--build.xml generated by maven from project.xml version 1.1-SNAPSHOT
4-
on date May 14 2007, time 1658-->
4+
on date May 28 2007, time 0053-->
55

66
<project default="jar" name="commons-cli" basedir=".">
7-
<!--Load local and user build preferences-->
8-
9-
<property file="build.properties">
10-
</property>
11-
<property file="${user.home}/build.properties">
7+
<property name="defaulttargetdir" value="target">
128
</property>
13-
<!--Build properties-->
14-
15-
<property name="defaulttargetdir" value="${basedir}/target">
9+
<property name="libdir" value="target/lib">
1610
</property>
17-
<property name="libdir" value="${user.home}/.maven/repository">
11+
<property name="classesdir" value="target/classes">
1812
</property>
19-
<property name="classesdir" value="${basedir}/target/classes">
13+
<property name="testclassesdir" value="target/test-classes">
2014
</property>
21-
<property name="testclassesdir" value="${basedir}/target/test-classes">
15+
<property name="testclassesdir" value="target/test-classes">
2216
</property>
23-
<property name="testreportdir" value="${basedir}/target/test-reports">
17+
<property name="testreportdir" value="target/test-reports">
2418
</property>
25-
<property name="distdir" value="${basedir}/dist">
19+
<property name="distdir" value="dist">
2620
</property>
27-
<property name="javadocdir" value="${basedir}/dist/docs/api">
21+
<property name="javadocdir" value="dist/docs/api">
2822
</property>
2923
<property name="final.name" value="commons-cli-1.1-SNAPSHOT">
3024
</property>
31-
<property name="proxy.host" value="">
32-
</property>
33-
<property name="proxy.port" value="">
34-
</property>
35-
<property name="proxy.username" value="">
36-
</property>
37-
<property name="proxy.password" value="">
38-
</property>
3925
<path id="build.classpath">
40-
<pathelement location="${libdir}/commons-lang/jars/commons-lang-2.1.jar">
41-
</pathelement>
42-
<pathelement location="${libdir}/junit/jars/junit-3.8.1.jar">
43-
</pathelement>
26+
<fileset dir="${libdir}">
27+
<include name="**/*.jar">
28+
</include>
29+
</fileset>
4430
</path>
4531
<target name="init" description="o Initializes some properties">
4632
<mkdir dir="${libdir}">
@@ -53,25 +39,13 @@
5339

5440
<available property="Junit.present" classname="junit.framework.Test">
5541
</available>
56-
<!--Test if user defined a proxy-->
57-
58-
<condition property="useProxy">
59-
<and>
60-
<isset property="proxy.host">
61-
</isset>
62-
<not>
63-
<equals trim="true" arg2="" arg1="${proxy.host}">
64-
</equals>
65-
</not>
66-
</and>
67-
</condition>
6842
</target>
6943
<target name="compile" description="o Compile the code" depends="get-deps">
7044
<mkdir dir="${classesdir}">
7145
</mkdir>
7246
<javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
7347
<src>
74-
<pathelement location="${basedir}/src/java">
48+
<pathelement location="src/java">
7549
</pathelement>
7650
</src>
7751
<classpath refid="build.classpath">
@@ -105,7 +79,7 @@
10579
<target name="internal-test" if="Junit.present" depends="junit-present,compile-tests">
10680
<mkdir dir="${testreportdir}">
10781
</mkdir>
108-
<junit dir="${basedir}" failureproperty="test.failure" printSummary="yes" fork="true" haltonerror="true">
82+
<junit dir="./" failureproperty="test.failure" printSummary="yes" fork="true" haltonerror="true">
10983
<sysproperty key="basedir" value=".">
11084
</sysproperty>
11185
<formatter type="xml">
@@ -121,7 +95,7 @@
12195
</pathelement>
12296
</classpath>
12397
<batchtest todir="${testreportdir}">
124-
<fileset dir="${basedir}/src/test">
98+
<fileset dir="src/test">
12599
<include name="**/Test*.java">
126100
</include>
127101
<include name="**/*Test.java">
@@ -140,7 +114,7 @@
140114
</mkdir>
141115
<javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
142116
<src>
143-
<pathelement location="${basedir}/src/test">
117+
<pathelement location="src/test">
144118
</pathelement>
145119
</src>
146120
<classpath>
@@ -162,51 +136,20 @@
162136
</property>
163137
<property name="title" value="CLI 1.1-SNAPSHOT API">
164138
</property>
165-
<javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="${basedir}/src/java" packagenames="org.apache.commons.*">
139+
<javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="org.apache.commons.*">
166140
<classpath>
167141
<path refid="build.classpath">
168142
</path>
169143
</classpath>
170144
</javadoc>
171145
</target>
172-
<target name="get-dep-commons-lang.jar" description="o Download the dependency : commons-lang.jar" unless="commons-lang.jar" depends="init,setProxy,noProxy,get-custom-dep-commons-lang.jar">
173-
<mkdir dir="${libdir}/commons-lang/jars/">
174-
</mkdir>
175-
<get dest="${libdir}/commons-lang/jars/commons-lang-2.1.jar" usetimestamp="true" ignoreerrors="true" src="http://repo1.maven.org/maven/commons-lang/jars/commons-lang-2.1.jar">
176-
</get>
177-
</target>
178-
<target name="get-custom-dep-commons-lang.jar" if="commons-lang.jar" depends="init,setProxy,noProxy">
179-
<mkdir dir="${libdir}/commons-lang/jars/">
180-
</mkdir>
181-
<get dest="${libdir}/commons-lang/jars/commons-lang-2.1.jar" usetimestamp="true" ignoreerrors="true" src="${commons-lang.jar}">
182-
</get>
183-
</target>
184-
<target name="get-dep-junit.jar" description="o Download the dependency : junit.jar" unless="junit.jar" depends="init,setProxy,noProxy,get-custom-dep-junit.jar">
185-
<mkdir dir="${libdir}/junit/jars/">
186-
</mkdir>
187-
<get dest="${libdir}/junit/jars/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true" src="http://repo1.maven.org/maven/junit/jars/junit-3.8.1.jar">
188-
</get>
189-
</target>
190-
<target name="get-custom-dep-junit.jar" if="junit.jar" depends="init,setProxy,noProxy">
191-
<mkdir dir="${libdir}/junit/jars/">
192-
</mkdir>
193-
<get dest="${libdir}/junit/jars/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true" src="${junit.jar}">
194-
</get>
195-
</target>
196-
<target name="get-deps" unless="noget" depends="get-dep-commons-lang.jar,get-dep-junit.jar">
197-
</target>
198-
<target name="setProxy" if="useProxy" depends="init">
146+
<target name="get-deps" unless="noget" depends="init">
199147
<!--Proxy settings works only with a JDK 1.2 and higher.-->
200148

201-
<echo>Proxy used :</echo>
202-
<echo>Proxy host [${proxy.host}]</echo>
203-
<echo>Proxy port [${proxy.port}]</echo>
204-
<echo>Proxy user [${proxy.username}]</echo>
205-
<setproxy proxyuser="${proxy.username}" proxyport="${proxy.port}" proxypassword="${proxy.password}" proxyhost="${proxy.host}">
149+
<setproxy>
206150
</setproxy>
207-
</target>
208-
<target name="noProxy" unless="useProxy" depends="init">
209-
<echo>Proxy not used.</echo>
151+
<get dest="${libdir}/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true" src="http://repo1.maven.org/maven/junit/jars/junit-3.8.1.jar">
152+
</get>
210153
</target>
211154
<target name="install-maven">
212155
<get dest="${user.home}/maven-install-latest.jar" usetimestamp="true" src="${repo}/maven/maven-install-latest.jar">

0 commit comments

Comments
 (0)