Skip to content

Commit e2d7218

Browse files
henhen
committed
Zapping the old build.xml and replacing it with a maven generated one.
Seems to build fine for me, but real test will be when the nightly tries it. git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/cli/trunk@129824 13f79535-47bb-0310-9956-ffa450edef68
1 parent cbeb47f commit e2d7218

1 file changed

Lines changed: 150 additions & 172 deletions

File tree

‎build.xml‎

Lines changed: 150 additions & 172 deletions
Original file line numberDiff line numberDiff line change
@@ -1,180 +1,158 @@
1-
<?xml version="1.0"?>
1+
<?xml version="1.0" encoding="UTF-8"?>
22

3-
<project name="cli" default="maven:jar" basedir=".">
3+
<project default="jar" name="commons-cli" basedir=".">
4+
5+
<property name="defaulttargetdir" value="target"></property>
6+
<property name="classesdir" value="target/classes"></property>
7+
<property name="testclassesdir" value="target/test-classes"></property>
8+
<property name="testreportdir" value="target/test-reports"></property>
9+
<property name="distdir" value="dist"></property>
10+
<property name="javadocdir" value="target/docs/apidocs"></property>
11+
<property name="final.name" value="commons-cli-1.0-beta-2-dev"></property>
12+
13+
<target name="init" description="o Initializes some properties">
14+
15+
<condition property="noget">
16+
<equals arg2="only" arg1="${build.sysclasspath}"></equals>
17+
</condition>
18+
</target>
19+
20+
<target name="jar" description="o Create the jar" depends="get-deps">
21+
22+
<mkdir dir="${classesdir}"></mkdir>
23+
24+
<javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
25+
<src>
26+
<pathelement location="src/java"></pathelement>
27+
</src>
28+
<classpath>
29+
<fileset dir="lib">
30+
<include name="*.jar"></include>
31+
</fileset>
32+
</classpath>
33+
</javac>
34+
35+
36+
<jar jarfile="target/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}"></jar>
37+
38+
</target>
39+
40+
<target name="clean" description="o Clean up the generated directories">
41+
<delete dir="${defaulttargetdir}"></delete>
42+
<delete dir="${distdir}"></delete>
43+
</target>
44+
45+
<target name="dist" description="o Create a distribution" depends="jar, javadoc">
46+
<mkdir dir="dist"></mkdir>
47+
<copy todir="dist">
48+
<fileset dir="${defaulttargetdir}"></fileset>
49+
</copy>
50+
</target>
51+
52+
<target name="test" description="o Run the test cases" depends="compile-tests">
53+
<mkdir dir="${testreportdir}"></mkdir>
54+
<junit dir="./" printSummary="yes" fork="true" haltonerror="true">
55+
<sysproperty key="basedir" value="src/test"></sysproperty>
56+
<formatter type="xml"></formatter>
57+
<formatter usefile="true" type="plain"></formatter>
58+
<classpath>
59+
<fileset dir="lib">
60+
<include name="*.jar"></include>
61+
</fileset>
62+
<pathelement location="target/${final.name}.jar"></pathelement>
63+
<pathelement path="${testclassesdir}"></pathelement>
64+
</classpath>
65+
<batchtest todir="${testreportdir}">
66+
<fileset dir="src/test">
67+
68+
<include name="**/*Test*.java"></include>
69+
70+
71+
</fileset>
72+
</batchtest>
73+
</junit>
74+
</target>
75+
76+
<target name="compile-tests" depends="jar">
77+
<mkdir dir="${testclassesdir}"></mkdir>
78+
<javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
79+
<src>
80+
<pathelement location="src/test"></pathelement>
81+
</src>
82+
<classpath>
83+
<fileset dir="lib">
84+
<include name="*.jar"></include>
85+
</fileset>
86+
<pathelement location="target/${final.name}.jar"></pathelement>
87+
</classpath>
88+
</javac>
89+
90+
91+
92+
93+
94+
<copy todir="${testclassesdir}">
95+
<fileset dir="src/test">
96+
97+
98+
</fileset>
99+
</copy>
100+
101+
</target>
4102

5-
<!-- Give user a chance to override without editing this file
6-
(and without typing -D each time they invoke a target) -->
103+
<target name="javadoc" description="o Generate javadoc" depends="jar">
104+
105+
106+
<mkdir dir="${javadocdir}"></mkdir>
107+
108+
109+
<tstamp>
110+
<format pattern="2002-yyyy" property="year"></format>
111+
</tstamp>
112+
113+
<property name="copyright" value="Copyright &amp;copy; Apache Software Foundation. All Rights Reserved."></property>
114+
115+
<property name="title" value="CLI 1.0-beta-2-dev API"></property>
116+
117+
<javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="org.apache.commons.cli.*">
118+
<classpath>
119+
<fileset dir="lib">
120+
<include name="*.jar"></include>
121+
</fileset>
122+
<pathelement location="target/${final.name}.jar"></pathelement>
123+
</classpath>
124+
</javadoc>
125+
126+
</target>
7127

8-
<!-- Allow any user specific values to override the defaults -->
9-
<property file="${user.home}/build.properties" />
128+
<target name="get-deps" unless="noget" depends="init">
129+
130+
<mkdir dir="lib"></mkdir>
131+
132+
<get dest="lib/commons-logging-1.0.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-logging/jars/commons-logging-1.0.jar"></get>
133+
<get dest="lib/commons-lang-SNAPSHOT.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-lang/jars/commons-lang-SNAPSHOT.jar"></get>
134+
<get dest="lib/junit-3.7.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/junit/jars/junit-3.7.jar"></get>
135+
136+
</target>
137+
138+
139+
140+
10141

11-
<!-- Allow user defaults for this project -->
12-
<property file="build.properties" />
13142

14-
<!-- Set default values for the build -->
15-
<property file="project.properties" />
16143

17-
<!-- maven:start -->
18144

19-
<!-- ================================================================== -->
20-
<!-- D E L E G A T O R S -->
21-
<!-- ================================================================== -->
22-
23-
<target name="maven:gump-descriptor">
24-
<ant antfile="${maven.home}/plugins/core/build.xml" target="gump-descriptor"/>
25-
</target>
26-
27-
<target name="maven:maven-update">
28-
<ant antfile="${maven.home}/plugins/core/build.xml" target="maven-update"/>
29-
</target>
30-
31-
<target name="maven:update-jars">
32-
<ant antfile="${maven.home}/plugins/core/build.xml" target="update-jars"/>
33-
</target>
34-
35-
<target name="maven:jar">
36-
<ant antfile="${maven.home}/plugins/core/build.xml" target="jar"/>
37-
</target>
38-
39-
<target name="maven:docs-quick">
40-
<ant antfile="${maven.home}/plugins/docs/build.xml" target="docs-quick"/>
41-
</target>
42-
43-
<target name="maven:run-singletest">
44-
<ant antfile="${maven.home}/plugins/test/build.xml" target="run-singletest"/>
45-
</target>
46-
47-
<target name="maven:compile">
48-
<ant antfile="${maven.home}/plugins/core/build.xml" target="compile"/>
49-
</target>
50-
51-
<target name="maven:jar-resources">
52-
<ant antfile="${maven.home}/plugins/core/build.xml" target="jar-resources"/>
53-
</target>
54-
55-
<target name="maven:fo">
56-
<ant antfile="${maven.home}/plugins/docs/build.xml" target="fo"/>
57-
</target>
58-
59-
<target name="maven:cvs-change-log">
60-
<ant antfile="${maven.home}/plugins/docs/build.xml" target="cvs-change-log"/>
61-
</target>
62-
63-
<target name="maven:war">
64-
<ant antfile="${maven.home}/plugins/j2ee/build.xml" target="war"/>
65-
</target>
66-
67-
<target name="maven:generate-reactor">
68-
<ant antfile="${maven.home}/build-reactor.xml" target="generate-reactor"/>
69-
</target>
70-
71-
<target name="maven:cross-ref">
72-
<ant antfile="${maven.home}/plugins/docs/build.xml" target="cross-ref"/>
73-
</target>
74-
75-
<target name="maven:deploy-site">
76-
<ant antfile="${maven.home}/plugins/docs/build.xml" target="deploy-site"/>
77-
</target>
78-
79-
<target name="maven:ear">
80-
<ant antfile="${maven.home}/plugins/j2ee/build.xml" target="ear"/>
81-
</target>
82-
83-
<target name="maven:install-jar">
84-
<ant antfile="${maven.home}/plugins/core/build.xml" target="install-jar"/>
85-
</target>
86-
87-
<target name="maven:task-list">
88-
<ant antfile="${maven.home}/plugins/docs/build.xml" target="task-list"/>
89-
</target>
90-
91-
<target name="maven:docs">
92-
<ant antfile="${maven.home}/plugins/docs/build.xml" target="docs"/>
93-
</target>
94-
95-
<target name="maven:site">
96-
<ant antfile="${maven.home}/plugins/docs/build.xml" target="site"/>
97-
</target>
98-
99-
<target name="maven:deploy-dist">
100-
<ant antfile="${maven.home}/plugins/core/build.xml" target="deploy-dist"/>
101-
</target>
102-
103-
<target name="maven:javadocs">
104-
<ant antfile="${maven.home}/plugins/docs/build.xml" target="javadocs"/>
105-
</target>
106-
107-
<target name="maven:announce">
108-
<ant antfile="${maven.home}/plugins/core/build.xml" target="announce"/>
109-
</target>
110-
111-
<target name="maven:check-source">
112-
<ant antfile="${maven.home}/plugins/core/build.xml" target="check-source"/>
113-
</target>
114-
115-
<target name="maven:dist">
116-
<ant antfile="${maven.home}/plugins/core/build.xml" target="dist"/>
117-
</target>
118-
119-
<target name="maven:dist-build">
120-
<ant antfile="${maven.home}/plugins/core/build.xml" target="dist-build"/>
121-
</target>
122-
123-
<target name="maven:metrics">
124-
<ant antfile="${maven.home}/plugins/metrics/build.xml" target="metrics"/>
125-
</target>
126-
127-
<target name="maven:clean">
128-
<ant antfile="${maven.home}/plugins/core/build.xml" target="clean"/>
129-
</target>
130-
131-
<target name="maven:env">
132-
<ant antfile="${maven.home}/plugins/core/build.xml" target="env"/>
133-
</target>
134-
135-
<target name="maven:test">
136-
<ant antfile="${maven.home}/plugins/test/build.xml" target="test"/>
137-
</target>
138-
139-
<target name="maven:pdf">
140-
<ant antfile="${maven.home}/plugins/docs/build.xml" target="pdf"/>
141-
</target>
142-
143-
<target name="maven:iutest">
144-
<ant antfile="${maven.home}/plugins/iutest/build.xml" target="iutest"/>
145-
</target>
146-
147-
<target name="maven:activity-log">
148-
<ant antfile="${maven.home}/plugins/docs/build.xml" target="activity-log"/>
149-
</target>
150-
151-
<target name="maven:verify-project">
152-
<ant antfile="${maven.home}/plugins/core/build.xml" target="verify-project"/>
153-
</target>
154-
155-
<target name="maven:validate-pom">
156-
<ant antfile="${maven.home}/plugins/core/build.xml" target="validate-pom"/>
157-
</target>
158-
159-
<target name="maven:validate-war">
160-
<ant antfile="${maven.home}/plugins/j2ee/build.xml" target="validate-war"/>
161-
</target>
162-
163-
164-
<!-- maven:end -->
165-
166-
<!-- ========== Helper Targets ============================================ -->
167-
168-
<target name="clean" depends="maven:clean">
169-
<delete file="velocity.log"/>
170-
</target>
171-
172-
<target name="site" depends="maven:site"/>
173-
174-
<target name="test" depends="maven:test"/>
175-
176-
<target name="compile" depends="maven:compile, maven:jar-resources"/>
177-
178-
<target name="dist" depends="maven:dist-build"/>
179-
145+
146+
147+
<target name="install-maven">
148+
149+
150+
151+
<get dest="${user.home}/maven-install-latest.jar" usetimestamp="true" src="${maven.repo.remote}/maven/maven-install-latest.jar"></get>
152+
153+
<unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar"></unjar>
154+
155+
</target>
156+
180157
</project>
158+

0 commit comments

Comments
 (0)