You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by fu...@apache.org on 2005/10/14 07:33:05 UTC
svn commit: r321016 - in /db/derby/code/branches/10.1: BUILDING.txt build.xml
Author: fuzzylogic
Date: Thu Oct 13 22:33:03 2005
New Revision: 321016
URL: http://svn.apache.org/viewcvs?rev=321016&view=rev
Log:
Merge recent build fixes from revisions 225581 and 234508 to 10.1 branch
Modified:
db/derby/code/branches/10.1/BUILDING.txt
db/derby/code/branches/10.1/build.xml
Modified: db/derby/code/branches/10.1/BUILDING.txt
URL: http://svn.apache.org/viewcvs/db/derby/code/branches/10.1/BUILDING.txt?rev=321016&r1=321015&r2=321016&view=diff
==============================================================================
--- db/derby/code/branches/10.1/BUILDING.txt (original)
+++ db/derby/code/branches/10.1/BUILDING.txt Thu Oct 13 22:33:03 2005
@@ -609,11 +609,10 @@
is then generated from a template. The sanity state defaults to
true. This also directs the compiler to turn on all debugging
options on the compiler. The sanity state can be set to insane
-by running 'ant insane' or passing in the value -Dsane=false or
--Dsanity=false. Note that this file will be removed after
-'ant clobber,' so if you are rebuilding from scratch and want
-the build to be a non-debug build, run 'ant insane' before
-building.
+by running 'ant insane' or passing in the value -Dsane=false.
+Note that this file will be removed after 'ant clobber,' so if
+you are rebuilding from scratch and want the build to be a
+non-debug build, run 'ant insane' before building.
Once the sanity state has been generated, Ant prints out for
reference the current properties that affect the build,
Modified: db/derby/code/branches/10.1/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/branches/10.1/build.xml?rev=321016&r1=321015&r2=321016&view=diff
==============================================================================
--- db/derby/code/branches/10.1/build.xml (original)
+++ db/derby/code/branches/10.1/build.xml Thu Oct 13 22:33:03 2005
@@ -47,8 +47,26 @@
</target>
<target name="ensuresanitystate" unless="state.available">
+ <antcall target="evaluate.sane"/>
+ </target>
+ <target name="evaluate.sane">
+ <condition property="generate.sane">
+ <or>
+ <equals arg1="${sane}" arg2="true"/>
+ <not>
+ <isset property="${sane}"/>
+ </not>
+ </or>
+ </condition>
+ <antcall target="ensuresanitystate.sane"/>
+ <antcall target="ensuresanitystate.insane"/>
+ </target>
+ <target name="ensuresanitystate.sane" if="generate.sane">
<antcall target="sane"/>
</target>
+ <target name="ensuresanitystate.insane" unless="generate.sane">
+ <antcall target="insane"/>
+ </target>
<target name="showenv" depends="init" unless="showenv.done">
<echo message=""/>
@@ -482,11 +500,15 @@
<propertyfile file="${state.file}" comment="${header}">
<entry key="sanity" value="true" type="string"/>
</propertyfile>
+ <delete file="${sanity.dir}/SanityState.java"/>
+ <delete dir="${sanity.out.dir}"/>
</target>
<target name="insane">
<propertyfile file="${state.file}" comment="${header}">
<entry key="sanity" value="false" type="string"/>
</propertyfile>
+ <delete file="${sanity.dir}/SanityState.java"/>
+ <delete dir="${sanity.out.dir}"/>
</target>