From 0e40b51af1231a7981aaa2c78a49788de91aa6f6 Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Fri, 27 Apr 2007 17:53:28 +0000
Subject: [PATCH] Update the ant build script to fix the rebuild target which was broken with the recent addition of the ads package. Also, edit the file to replace all tabs with spaces.
---
opends/build.xml | 64 +++++++++++++++++++-------------
1 files changed, 38 insertions(+), 26 deletions(-)
diff --git a/opends/build.xml b/opends/build.xml
index 5a02e4a..42d935a 100644
--- a/opends/build.xml
+++ b/opends/build.xml
@@ -77,7 +77,7 @@
<property name="quicksetup.src.dir" location="src/quicksetup" />
<property name="quicksetup.classes.dir"
location="${build.dir}/quicksetup/classes" />
- <property name="ads.src.dir" location="src/ads" />
+ <property name="ads.src.dir" location="src/ads" />
<!-- Properties for use with the Status Panel. -->
<property name="statuspanel.src.dir" location="src/statuspanel" />
@@ -371,12 +371,12 @@
<formatter type="plain" />
</checkstyle>
- <checkstyle config="${checkstyle.dir}/opends-checkstyle.xml"
- failOnViolation="true">
- <fileset dir="${ads.src.dir}" includes="**/*.java" />
- <formatter type="plain" />
- </checkstyle>
-
+ <checkstyle config="${checkstyle.dir}/opends-checkstyle.xml"
+ failOnViolation="true">
+ <fileset dir="${ads.src.dir}" includes="**/*.java" />
+ <formatter type="plain" />
+ </checkstyle>
+
<checkstyle config="${checkstyle.dir}/opends-checkstyle.xml"
failOnViolation="true">
<fileset dir="${quicksetup.src.dir}" includes="**/*.java" />
@@ -419,7 +419,7 @@
depends="cleaninit,compilequicksetup,weave,compilestatuspanel"
description="Recompile the Directory Server source files.">
</target>
-
+
<!-- Compile the Directory Server source files. -->
<target name="compile"
@@ -478,24 +478,24 @@
<target name="compilequicksetup" depends="buildtools,weave"
description="Compile the Quick Setup source files.">
<mkdir dir="${quicksetup.classes.dir}" />
- <javac srcdir="${ads.src.dir}" destdir="${quicksetup.classes.dir}"
- optimize="true" debug="on" debuglevel="lines,source" source="1.5"
- target="1.5" deprecation="true" fork="true" memoryInitialSize="${MEM}"
- memoryMaximumSize="${MEM}">
- <compilerarg value="-Xlint:all" />
- <classpath>
- <fileset dir="${build.dir}/build-tools">
- <include name="build-tools.jar" />
- </fileset>
- <pathelement path="${classes.dir}"/>
- </classpath>
- </javac>
+ <javac srcdir="${ads.src.dir}" destdir="${quicksetup.classes.dir}"
+ optimize="true" debug="on" debuglevel="lines,source" source="1.5"
+ target="1.5" deprecation="true" fork="true" memoryInitialSize="${MEM}"
+ memoryMaximumSize="${MEM}">
+ <compilerarg value="-Xlint:all" />
+ <classpath>
+ <fileset dir="${build.dir}/build-tools">
+ <include name="build-tools.jar" />
+ </fileset>
+ <pathelement path="${classes.dir}"/>
+ </classpath>
+ </javac>
<javac srcdir="${src.dir}" destdir="${quicksetup.classes.dir}"
debug="on" debuglevel="${build.debuglevel}" source="1.5"
target="1.5" deprecation="true" fork="true" memoryInitialSize="${MEM}"
memoryMaximumSize="${MEM}">
<include name="**/org/opends/server/util/SetupUtils.java"/>
- <include name="**/org/opends/server/util/CertificateManager.java"/>
+ <include name="**/org/opends/server/util/CertificateManager.java"/>
<include name="**/org/opends/server/util/DynamicConstants.java"/>
<include name="**/org/opends/server/types/OperatingSystem.java"/>
<compilerarg value="-Xlint:all" />
@@ -597,12 +597,24 @@
<!-- Recreate the quicksetup classes directory and recompile into it. -->
<mkdir dir="${quicksetup.classes.dir}" />
+ <javac srcdir="${ads.src.dir}" destdir="${quicksetup.classes.dir}"
+ optimize="true" debug="on" debuglevel="lines,source" source="1.5"
+ target="1.5" deprecation="true" fork="true" memoryInitialSize="${MEM}"
+ memoryMaximumSize="${MEM}">
+ <compilerarg value="-Xlint:all" />
+ <classpath>
+ <fileset dir="${build.dir}/build-tools">
+ <include name="build-tools.jar" />
+ </fileset>
+ <pathelement path="${classes.dir}"/>
+ </classpath>
+ </javac>
<javac srcdir="${src.dir}" destdir="${quicksetup.classes.dir}"
debug="on" debuglevel="${build.debuglevel}" source="1.5"
target="1.5" deprecation="true" fork="true" memoryInitialSize="${MEM}"
memoryMaximumSize="${MEM}">
<include name="**/org/opends/server/util/SetupUtils.java"/>
- <include name="**/org/opends/server/util/CertificateManager.java"/>
+ <include name="**/org/opends/server/util/CertificateManager.java"/>
<include name="**/org/opends/server/util/DynamicConstants.java"/>
<include name="**/org/opends/server/types/OperatingSystem.java"/>
<compilerarg value="-Xlint:all" />
@@ -708,10 +720,10 @@
<antcall target="example-plugin" />
<fixcrlf srcDir="${scripts.dir}" destDir="${pdir}/bin" excludes="*.bat,_client-script.sh,_server-script.sh" eol="lf" />
- <fixcrlf srcDir="${scripts.dir}" destDir="${pdir}/lib" includes="_client-script.sh,_server-script.sh" eol="lf" />
+ <fixcrlf srcDir="${scripts.dir}" destDir="${pdir}/lib" includes="_client-script.sh,_server-script.sh" eol="lf" />
<fixcrlf srcDir="${scripts.dir}" destDir="${pdir}/bin" includes="README_WINDOWS.txt" eol="crlf" />
<fixcrlf srcDir="${scripts.dir}" destDir="${pdir}/bat" excludes="_client-script.bat,_server-script.bat,setcp.bat" includes="*.bat" eol="crlf" />
- <fixcrlf srcDir="${scripts.dir}" destDir="${pdir}/lib" includes="_client-script.bat,_server-script.bat,setcp.bat" eol="crlf" />
+ <fixcrlf srcDir="${scripts.dir}" destDir="${pdir}/lib" includes="_client-script.bat,_server-script.bat,setcp.bat" eol="crlf" />
<copy todir="${pdir}/config">
<fileset file="${config.dir}/*" />
@@ -783,8 +795,8 @@
<zipfileset dir="${package.dir}" includes="OpenDS-${pkgversion}/bin/*"
excludes="OpenDS-${pkgversion}/bin/README_WINDOWS.txt"
filemode="755" dirmode="755" />
- <zipfileset dir="${package.dir}" includes="OpenDS-${pkgversion}/bin/README_WINDOWS.txt"
- filemode="644" dirmode="755" />
+ <zipfileset dir="${package.dir}" includes="OpenDS-${pkgversion}/bin/README_WINDOWS.txt"
+ filemode="644" dirmode="755" />
<zipfileset dir="${package.dir}" includes="OpenDS-${pkgversion}/setup,OpenDS-${pkgversion}/uninstall"
filemode="755" dirmode="755" />
</zip>
--
Gitblit v1.10.0