1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115
|
From: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
Date: Sun, 17 Jun 2012 23:28:03 +0200
Subject: packaging-changes
---
build.xml | 31 +++++++++++++++----------------
1 file changed, 15 insertions(+), 16 deletions(-)
diff --git a/build.xml b/build.xml
index 20126dd..0b6c326 100644
--- a/build.xml
+++ b/build.xml
@@ -18,13 +18,13 @@
<!-- ================================================================= -->
<target name="clean" description="Clean everything">
<delete dir="${build.dir}"/>
- <mkdir dir="${build.dir}" />
</target>
<!-- ================================================================= -->
<!-- compile -->
<!-- ================================================================= -->
<target name="compile" description="Compile all sources files">
+ <mkdir dir="${build.dir}" />
<mkdir dir="${build.classes.dir}" />
<depend srcDir="${src.main.dir}"
destDir="${build.classes.dir}"
@@ -44,7 +44,8 @@
source="${targetJvm}"
target="${targetJvm}"
includes="**"
- classpathref="project.classpath">
+ classpathref="project.classpath"
+ encoding="ISO-8859-1">
</javac>
<javac srcdir="${src.javahl.dir}"
destdir="${build.classes.dir}"
@@ -52,7 +53,8 @@
source="${targetJvm}"
target="${targetJvm}"
includes="**"
- classpathref="project.classpath">
+ classpathref="project.classpath"
+ encoding="ISO-8859-1">
</javac>
<javac srcdir="${src.svnkit.dir}"
destdir="${build.classes.dir}"
@@ -60,7 +62,8 @@
source="${targetJvm}"
target="${targetJvm}"
includes="**"
- classpathref="project.classpath">
+ classpathref="project.classpath"
+ encoding="ISO-8859-1">
</javac>
<javac srcdir="${src.cmdline.dir}"
destdir="${build.classes.dir}"
@@ -68,7 +71,8 @@
source="${targetJvm}"
target="${targetJvm}"
includes="**"
- classpathref="project.classpath">
+ classpathref="project.classpath"
+ encoding="ISO-8859-1">
</javac>
<copy todir="${build.classes.dir}">
<fileset dir="${src.main.dir}">
@@ -87,7 +91,8 @@
destdir="${build.javadoc.dir}"
packagenames="org.*"
windowtitle="svnClientAdapter API"
- doctitle="svnClientAdapter">
+ doctitle="svnClientAdapter"
+ encoding="ISO-8859-1">
</javadoc>
</target>
@@ -97,7 +102,7 @@
<target name="svnClientAdapter.jar" depends="compile" description="Generate svnClientAdapter.jar">
<tstamp/>
<mkdir dir="${build.lib.dir}" />
- <jar jarfile="${build.lib.dir}/svnClientAdapter.jar"
+ <jar jarfile="${build.lib.dir}/svnClientAdapter-${svnClientAdapter.version}.jar"
basedir="${build.classes.dir}"
includes="**/*"
excludes="**/*Test*.class">
@@ -119,17 +124,10 @@
<delete dir="${build.distrib.dir}"/>
<mkdir dir="${build.distrib.dir}"/>
<mkdir dir="${build.distrib.dir}/lib"/>
- <copy file="${build.lib.dir}/svnClientAdapter.jar" todir="${build.distrib.dir}/lib"/>
+ <copy file="${build.lib.dir}/svnClientAdapter-${svnClientAdapter.version}.jar" todir="${build.distrib.dir}/lib"/>
<copy file="readme.txt" todir="${build.distrib.dir}"/>
<copy file="license.txt" todir="${build.distrib.dir}"/>
<copy file="changelog.txt" todir="${build.distrib.dir}"/>
- <!-- required libs -->
- <copy file="${svnjavahl.jar}" todir="${build.distrib.dir}/lib"/>
- <copy file="${lib.dir}/JAVAHL-LICENSE" todir="${build.distrib.dir}/lib"/>
- <!-- SVNKit files -->
- <copy todir="${build.distrib.dir}/lib">
- <fileset dir="${lib.dir}/svnkit"/>
- </copy>
<!-- Javadoc files -->
<copy todir="${build.distrib.dir}/javadoc">
<fileset dir="${build.javadoc.dir}"/>
@@ -213,7 +211,8 @@
<javac srcdir="${src.tests.dir}"
destdir="${build.testClasses.dir}"
debug="${debug}"
- includes="**">
+ includes="**"
+ encoding="ISO-8859-1">
<classpath>
<pathelement location="${build.classes.dir}"/>
<path refid="project.classpath"/>
|