From 5c118604bf96e4aff22e3d4e3e88e103fce6dd4d Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Thu, 15 Mar 2007 14:34:13 +0000
Subject: [PATCH] Fix for Issue 1349.
---
opends/build.xml | 33 +++++++++++++++++++++------------
1 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/opends/build.xml b/opends/build.xml
index f87d924..78d6fe4 100644
--- a/opends/build.xml
+++ b/opends/build.xml
@@ -375,7 +375,7 @@
<!-- Compile the Directory Server source files. -->
<target name="cleancompile"
- depends="cleaninit,weave,compilequicksetup,compilestatuspanel"
+ depends="cleaninit,compilequicksetup,weave,compilestatuspanel"
description="Recompile the Directory Server source files.">
</target>
@@ -421,11 +421,20 @@
<!-- Compile the Quick Setup source files. -->
- <target name="compilequicksetup" depends="buildtools,weave"
+ <target name="compilequicksetup" depends="buildtools,compile"
description="Compile the Quick Setup source files.">
<mkdir dir="${quicksetup.classes.dir}" />
- <javac srcdir="${quicksetup.src.dir}" destdir="${quicksetup.classes.dir}"
+ <javac srcdir="${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}">
+ <include name="**/org/opends/server/util/SetupUtils.java"/>
+ <include name="**/org/opends/server/util/DynamicConstants.java"/>
+ <include name="**/org/opends/server/types/OperatingSystem.java"/>
+ <compilerarg value="-Xlint:all" />
+ </javac>
+ <javac srcdir="${quicksetup.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}">
@@ -442,10 +451,6 @@
<fileset dir="${quicksetup.src.dir}"
includes="**/*.properties, **/*.gif, **/*.png" />
</copy>
- <copy todir="${quicksetup.classes.dir}">
- <fileset dir="${classes.dir}"
- includes="**/DynamicConstants.class **/SetupUtils.class **/OperatingSystem.class" />
- </copy>
</target>
<!-- Compile the Status Panel source files. -->
@@ -521,6 +526,15 @@
<!-- Recreate the quicksetup classes directory and recompile into it. -->
<mkdir dir="${quicksetup.classes.dir}" />
+ <javac srcdir="${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}">
+ <include name="**/org/opends/server/util/SetupUtils.java"/>
+ <include name="**/org/opends/server/util/DynamicConstants.java"/>
+ <include name="**/org/opends/server/types/OperatingSystem.java"/>
+ <compilerarg value="-Xlint:all" />
+ </javac>
<javac srcdir="${quicksetup.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}"
@@ -541,11 +555,6 @@
includes="**/*.properties, **/*.gif, **/*.png"/>
</copy>
- <copy todir="${quicksetup.classes.dir}">
- <fileset dir="${classes.dir}"
- includes="**/DynamicConstants.class **/SetupUtils.class **/OperatingSystem.class"/>
- </copy>
-
<!-- Generate the quicksetup.jar file -->
<jar jarfile="${pdir}/lib/quicksetup.jar"
basedir="${quicksetup.classes.dir}" compress="true" index="true" />
--
Gitblit v1.10.0