From 07888b587344de75f2546b553b15258d9c233b18 Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Tue, 11 Sep 2007 18:43:45 +0000
Subject: [PATCH] Revert the change to build.xml made in revision 3009, as it has broken the rebuild target.
---
opendj-sdk/opends/build.xml | 25 ++-----------------------
1 files changed, 2 insertions(+), 23 deletions(-)
diff --git a/opendj-sdk/opends/build.xml b/opendj-sdk/opends/build.xml
index aaf1a13..d3af905 100644
--- a/opendj-sdk/opends/build.xml
+++ b/opendj-sdk/opends/build.xml
@@ -134,7 +134,6 @@
<property name="admin.defn.dir" location="src/admin/defn" />
<property name="admin.src.dir" location="src/admin/generated" />
<property name="admin.rules.dir" location="resource/admin" />
- <property name="admin.gen.marker" location="${admin.src.dir}/.generated-successfully-marker" />
<!-- Properties for generating messages. -->
<property name="msg.prop.dir" location="src/messages/messages" />
@@ -1723,9 +1722,7 @@
<!-- Code generation for core administration components. -->
- <target name="compileadmin" depends="checkadminuptodate,validateadmin"
- description="Code generation for configuration Object."
- unless="generatedAdmin.upToDate">
+ <target name="compileadmin" depends="validateadmin" description="Code generation for configuration Object.">
<!-- The XSLT task creates a lot of noise.
I can't find any other way to shut it up. -->
@@ -1745,11 +1742,6 @@
<arg value="-quiet" />
<arg value="compileadminsubtask" />
</exec>
-
- <!-- Keeps track of the last time that we successfully generated
- the admin files so we only have to do it again if any of the
- source files are out of date. -->
- <touch file="${admin.gen.marker}" />
</target>
@@ -1826,21 +1818,8 @@
</delete>
</target>
-
- <!-- Keeps track of the last time that we successfully generated
- the admin files so we only have to do it again if any of the
- source files are out of date. -->
- <target name="checkadminuptodate">
- <uptodate property="generatedAdmin.upToDate">
- <srcfiles dir="${admin.defn.dir}" includes="**/*.xml" />
- <mapper type="merge" to="${admin.gen.marker}"/>
- </uptodate>
- </target>
-
<!-- Validate core administration component XML definition files. -->
- <target name="validateadmin" depends="checkadminuptodate"
- description="Validate core administration component XML definition files."
- unless="generatedAdmin.upToDate">
+ <target name="validateadmin" description="Validate core administration component XML definition files.">
<schemavalidate>
<fileset dir="${admin.defn.dir}" includes="**/*.xml" />
<schema namespace="http://www.opends.org/admin" file="${admin.rules.dir}/admin.xsd"/>
--
Gitblit v1.10.0