From a3c19f43bedf3a5f6af3d1841399ebf073588678 Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Fri, 17 Nov 2006 21:03:01 +0000
Subject: [PATCH] Update the build script to ensure that the class files and the JAR file created by build-tools get created under the build directory so they do not get accidentally checked into the repository and get properly cleaned up by the "clean" target.
---
/dev/null | 0
opends/build.xml | 12 ++++++------
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/opends/build.xml b/opends/build.xml
index 4ba6399..cd6c248 100644
--- a/opends/build.xml
+++ b/opends/build.xml
@@ -49,7 +49,7 @@
<!-- Properties for build tools -->
<property name="buildtools.dir" location="build-tools" />
<property name="buildtools.src.dir" location="${buildtools.dir}/src" />
- <property name="buildtools.classes.dir" location="${buildtools.dir}/classes" />
+ <property name="buildtools.classes.dir" location="${build.dir}/build-tools/classes" />
<!-- Properties for use in unit testing. -->
<property name="unittest.testng.dir" location="tests/unit-tests-testng"/>
@@ -307,7 +307,7 @@
<compilerarg value="-Xlint:all" />
<classpath>
- <fileset dir="${ext.dir}">
+ <fileset dir="${build.dir}/build-tools">
<include name="build-tools.jar" />
</fileset>
<pathelement path="${classes.dir}"/>
@@ -378,7 +378,7 @@
memoryMaximumSize="${MEM}">
<compilerarg value="-Xlint:all" />
<classpath>
- <fileset dir="${ext.dir}">
+ <fileset dir="${build.dir}/build-tools">
<include name="build-tools.jar" />
</fileset>
<fileset dir="${pdir}/lib">
@@ -628,7 +628,7 @@
<!-- Prepare to execute the Directory Server TestNG unit tests. -->
- <target name="testinit" depends="compile"
+ <target name="testinit" depends="buildtools,compile"
description="Prepare to execute the Directory Server TestNG unit tests.">
<!-- If we are to perform coverage tests, then set that up. -->
@@ -668,7 +668,7 @@
<!-- Prep the TestNG XML file -->
<mkdir dir="${unittest.resource.dir}" />
<typedef name="preptestng" classname="org.opends.build.tools.PrepTestNG"
- classpath="${ext.dir}/build-tools.jar" />
+ classpath="${build.dir}/build-tools/build-tools.jar" />
<preptestng file="${testng.dir}/testng.xml"
@@ -857,7 +857,7 @@
</classpath>
</javac>
- <jar jarfile="${ext.dir}/build-tools.jar"
+ <jar jarfile="${build.dir}/build-tools/build-tools.jar"
basedir="${buildtools.classes.dir}" compress="true" index="true" />
</target>
diff --git a/opends/ext/build-tools.jar b/opends/ext/build-tools.jar
deleted file mode 100644
index dee1b38..0000000
--- a/opends/ext/build-tools.jar
+++ /dev/null
Binary files differ
--
Gitblit v1.10.0