Skip to content

Commit 9857f8a

Browse files
author
Stephen Colebourne
committed
Update build files for version 1.1
git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/io/trunk@293184 13f79535-47bb-0310-9956-ffa450edef68
1 parent c0a1271 commit 9857f8a

2 files changed

Lines changed: 41 additions & 30 deletions

File tree

‎build.xml‎

Lines changed: 34 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -16,28 +16,28 @@
1616
</property>
1717
<!--Build properties-->
1818

19-
<property name="defaulttargetdir" value="${basedir}/target">
19+
<property name="defaulttargetdir" value="${basedir}/build">
2020
</property>
2121
<property name="libdir" value="${user.home}/.maven/repository">
2222
</property>
23-
<property name="classesdir" value="${basedir}/target/classes">
23+
<property name="classesdir" value="${basedir}/build/classes" />
24+
<property name="srcdir" value="${basedir}/build/src" />
25+
<property name="testclassesdir" value="${basedir}/build/test-classes">
2426
</property>
25-
<property name="testclassesdir" value="${basedir}/target/test-classes">
26-
</property>
27-
<property name="testreportdir" value="${basedir}/target/test-reports">
27+
<property name="testreportdir" value="${basedir}/build/test-reports">
2828
</property>
2929
<property name="final.name" value="commons-io-1.1" />
30-
<property name="dist.build.dir" value="${basedir}/target/dist-build" />
30+
<property name="dist.build.dir" value="${basedir}/build/dist-build" />
3131
<property name="dist.bin" value="${dist.build.dir}/${final.name}" />
3232
<property name="dist.src" value="${dist.build.dir}/${final.name}-src" />
3333
<property name="javadocdir" value="${dist.bin}/docs" />
34-
<property name="dist.zip.dir" value="${basedir}/target/dist" />
35-
<property name="dist.bin.tar.name" value="${basedir}/target/dist/${final.name}.tar" />
36-
<property name="dist.bin.gz.name" value="${basedir}/target/dist/${final.name}.tar.gz" />
37-
<property name="dist.bin.zip.name" value="${basedir}/target/dist/${final.name}.zip" />
38-
<property name="dist.src.tar.name" value="${basedir}/target/dist/${final.name}-src.tar" />
39-
<property name="dist.src.gz.name" value="${basedir}/target/dist/${final.name}-src.tar.gz" />
40-
<property name="dist.src.zip.name" value="${basedir}/target/dist/${final.name}-src.zip" />
34+
<property name="dist.zip.dir" value="${basedir}/build/dist" />
35+
<property name="dist.bin.tar.name" value="${basedir}/build/dist/${final.name}.tar" />
36+
<property name="dist.bin.gz.name" value="${basedir}/build/dist/${final.name}.tar.gz" />
37+
<property name="dist.bin.zip.name" value="${basedir}/build/dist/${final.name}.zip" />
38+
<property name="dist.src.tar.name" value="${basedir}/build/dist/${final.name}-src.tar" />
39+
<property name="dist.src.gz.name" value="${basedir}/build/dist/${final.name}-src.tar.gz" />
40+
<property name="dist.src.zip.name" value="${basedir}/build/dist/${final.name}-src.zip" />
4141
<property name="proxy.host" value="">
4242
</property>
4343
<property name="proxy.port" value="">
@@ -91,26 +91,35 @@
9191
</fileset>
9292
</copy>
9393
</target>
94+
9495
<target name="jar" description="o Create the jar" depends="compile,test">
95-
<jar jarfile="${defaulttargetdir}/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}" manifest="${basedir}/src/conf/MANIFEST.MF">
96-
</jar>
96+
<jar jarfile="${defaulttargetdir}/${final.name}.jar" excludes="**/*.html" basedir="${classesdir}" manifest="${basedir}/src/conf/MANIFEST.MF" />
97+
</target>
98+
<target name="dist-jar" depends="compile">
99+
<jar jarfile="${defaulttargetdir}/${final.name}.jar" excludes="**/*.html" basedir="${classesdir}" manifest="${basedir}/src/conf/MANIFEST.MF" />
100+
<copy todir="${srcdir}">
101+
<fileset dir="${basedir}/src/java" includes="**/*.java" />
102+
</copy>
103+
<copy todir="${srcdir}/META-INF">
104+
<fileset dir="${basedir}" includes="LICENSE*, NOTICE*" />
105+
</copy>
106+
<jar jarfile="${defaulttargetdir}/${final.name}-src-ide.zip" basedir="${srcdir}" />
97107
</target>
108+
98109
<target name="clean" description="o Clean up the generated directories">
99110
<delete dir="${defaulttargetdir}">
100111
</delete>
101112
<delete dir="${dist.bin}">
102113
</delete>
103114
</target>
104115

105-
<target name="dist" description="o Create a distribution" depends="jar, javadoc">
116+
<target name="dist" description="o Create a distribution" depends="dist-jar, javadoc">
106117
<mkdir dir="${dist.bin}" />
107118
<mkdir dir="${dist.zip.dir}" />
108119
<!-- Binary -->
109120
<copy todir="${dist.bin}">
110-
<fileset dir="${defaulttargetdir}" includes="*.jar">
111-
</fileset>
112-
<fileset dir="${basedir}" includes="LICENSE*, NOTICE*, README*, RELEASE-NOTES*">
113-
</fileset>
121+
<fileset dir="${defaulttargetdir}" includes="*.jar,*.zip" />
122+
<fileset dir="${basedir}" includes="LICENSE*, NOTICE*, README*, RELEASE-NOTES*" />
114123
</copy>
115124
<!-- Unix tar gz binary -->
116125
<fixcrlf srcdir="${dist.bin}" eol="lf" includes="*.txt" />
@@ -134,15 +143,15 @@
134143
<fileset dir="${basedir}" includes="xdocs/**, src/**" />
135144
</copy>
136145
<!-- Unix tar gz source -->
137-
<fixcrlf srcdir="${dist.src}" eol="lf" includes="*.txt,*.xml,*.css" />
146+
<fixcrlf srcdir="${dist.src}" eol="lf" includes="*.txt,*.xml,*.css,*.properties" />
138147
<tar longfile="gnu" tarfile="${dist.src.tar.name}">
139148
<tarfileset dir="${dist.build.dir}"/>
140149
</tar>
141150
<gzip zipfile="${dist.src.gz.name}" src="${dist.src.tar.name}"/>
142151
<checksum file="${dist.src.gz.name}"/>
143152
<delete file="${dist.src.tar.name}" />
144153
<!-- Windows zip source -->
145-
<fixcrlf srcdir="${dist.src}" eol="crlf" includes="*.txt,*.xml,*.css" />
154+
<fixcrlf srcdir="${dist.src}" eol="crlf" includes="*.txt,*.xml,*.css,*.properties" />
146155
<zip zipfile="${dist.src.zip.name}" >
147156
<zipfileset dir="${dist.build.dir}"/>
148157
</zip>
@@ -152,8 +161,7 @@
152161
</target>
153162

154163
<target name="test" description="o Run the test cases" if="test.failure" depends="internal-test">
155-
<fail message="There were test failures.">
156-
</fail>
164+
<fail message="There were test failures." />
157165
</target>
158166
<target name="internal-test" if="Junit.present" depends="junit-present,compile-tests">
159167
<mkdir dir="${testreportdir}">
@@ -179,6 +187,8 @@
179187
</include>
180188
<exclude name="**/*AbstractTestCase*">
181189
</exclude>
190+
<exclude name="**/AllIOTestSuite*">
191+
</exclude>
182192
<exclude name="**/PackageTestSuite*">
183193
</exclude>
184194
<exclude name="**/testtools/**">

‎project.xml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
</description>
2828
<logo>/images/io-logo-white.png</logo>
2929

30-
<url>http://jakarta.apache.org/commons/${pom.artifactId.substring(8)}/</url>
31-
<package>org.apache.commons.${pom.artifactId.substring(8)}</package>
30+
<url>http://jakarta.apache.org/commons/io/</url>
31+
<package>org.apache.commons.io</package>
3232

3333
<organization>
3434
<name>The Apache Software Foundation</name>
@@ -47,12 +47,12 @@
4747
<gumpRepositoryId>jakarta</gumpRepositoryId>
4848
<issueTrackingUrl>http://issues.apache.org/bugzilla/</issueTrackingUrl>
4949
<siteAddress>jakarta.apache.org</siteAddress>
50-
<siteDirectory>/www/jakarta.apache.org/commons/${pom.artifactId.substring(8)}/</siteDirectory>
51-
<distributionDirectory>/www/jakarta.apache.org/builds/jakarta-commons/${pom.artifactId.substring(8)}/</distributionDirectory>
50+
<siteDirectory>/www/jakarta.apache.org/commons/io/</siteDirectory>
51+
<distributionDirectory>/www/jakarta.apache.org/builds/jakarta-commons/io/</distributionDirectory>
5252

5353
<repository>
54-
<connection>scm:svn:http://svn.apache.org/repos/asf/jakarta/commons/proper/${pom.artifactId.substring(8)}/trunk</connection>
55-
<url>http://svn.apache.org/repos/asf/jakarta/commons/proper/${pom.artifactId.substring(8)}/trunk</url>
54+
<connection>scm:svn:http://svn.apache.org/repos/asf/jakarta/commons/proper/io/trunk</connection>
55+
<url>http://svn.apache.org/repos/asf/jakarta/commons/proper/io/trunk</url>
5656
</repository>
5757

5858
<mailingLists>
@@ -214,6 +214,7 @@
214214
</includes>
215215
<excludes>
216216
<exclude>**/*AbstractTestCase*</exclude>
217+
<exclude>**/AllIOTestSuite*</exclude>
217218
<exclude>**/PackageTestSuite*</exclude>
218219
<exclude>**/testtools/**</exclude>
219220
</excludes>

0 commit comments

Comments
 (0)