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 rh...@apache.org on 2020/01/12 17:49:05 UTC
svn commit: r1872681 - in /db/derby/code/branches/10.15: ./ build.xml
Author: rhillegas
Date: Sun Jan 12 17:49:04 2020
New Revision: 1872681
URL: http://svn.apache.org/viewvc?rev=1872681&view=rev
Log:
DERBY-7052: Port 1865408 from trunk to 10.15 branch.
Modified:
db/derby/code/branches/10.15/ (props changed)
db/derby/code/branches/10.15/build.xml
Propchange: db/derby/code/branches/10.15/
------------------------------------------------------------------------------
Merged /db/derby/code/trunk:r1865408
Modified: db/derby/code/branches/10.15/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.15/build.xml?rev=1872681&r1=1872680&r2=1872681&view=diff
==============================================================================
--- db/derby/code/branches/10.15/build.xml (original)
+++ db/derby/code/branches/10.15/build.xml Sun Jan 12 17:49:04 2020
@@ -55,10 +55,9 @@
<!-- <echoproperties/> -->
<!-- Targets -->
-
<target
name="buildsource"
- depends="checkCompilerLevel,init,prebuild,setCompilerProperties,felixStubs,shared,client,engine,storeless,tools,drda,optional,runner,build,versioninfo,localeinfo,binscripts,generateSecurityPolicies"
+ depends="checkCompilerLevel,storeless,optional,runner,versioninfo,localeinfo,binscripts,generateSecurityPolicies"
description="Compile the product source (does not build the tests)."
/>
<target
@@ -101,7 +100,7 @@
</fail>
</target>
- <target name="init" unless="init.done" depends="version_check,makeOutDirs,install_junit,setCompilerProperties">
+ <target name="init" unless="init.done" depends="version_check,install_junit,setCompilerProperties">
<tstamp/>
<antcall target="make-generated-dirs"/>
<antcall target="make-release-dirs"/>
@@ -599,7 +598,7 @@
<!-- Derby Engine build target -->
<!-- ==================================================================== -->
- <target name="engine" depends="shared,state">
+ <target name="engine" depends="shared,felixStubs">
<ant dir="${derby.engine.src.dir}"/>
<antcall target="build"/>
<ant dir="${derby.engine.dir}/loc"/>
@@ -609,15 +608,15 @@
<ant dir="${derby.engine.src.dir}" target="engine_169_opt"/>
</target>
- <target name="tools" depends="engine">
+ <target name="tools" depends="engine,client">
<ant dir="${derby.tools.src.dir}"/>
</target>
- <target name="optional" depends="engine">
+ <target name="optional" depends="tools">
<ant dir="${derby.optional.src.dir}"/>
</target>
- <target name="runner" depends="optional">
+ <target name="runner" depends="drda">
<ant dir="${derby.run.src.dir}"/>
</target>
@@ -625,11 +624,11 @@
<ant dir="${derby.storeless.src.dir}"/>
</target>
- <target name="shared" depends="init,state">
+ <target name="shared" depends="state">
<ant dir="${derby.shared.src.dir}"/>
</target>
- <target name="drda" depends="engine">
+ <target name="drda" depends="tools">
<ant dir="${derby.drda.src.dir}"/>
</target>
@@ -807,7 +806,7 @@
<!-- =================================================================== -->
<!-- Build the stub FELIX (OSGI) implementation -->
<!-- =================================================================== -->
- <target name="felixStubs">
+ <target name="felixStubs" depends="state">
<mkdir dir="${out.stubs.dir}"/>
<mkdir dir="${out.felix.dir}"/>