There problems appears to be confusion in the ant build files
about ${drops.dir} vs ${drop.dir}. It's *possible* it is intentional
for there to be two distinct variables (since both are mentioned on
successive lines in the sanity.into definition in jaxp/build.properties),
but it seems like it's a bug.
The attachments seem to fix the problem.
--
--Per Bothner
per.both...@oracle.com p...@bothner.com http://per.bothner.com/
diff -r d1cb3e473c32 build-defs.xml
--- a/build-defs.xml Tue Nov 23 10:04:15 2010 -0800
+++ b/build-defs.xml Sun Dec 05 13:44:24 2010 -0800
@@ -94,7 +94,7 @@
jaxp_src-update">
</target>
- <!-- Set up source to use drop.dir. -->
+ <!-- Set up source to use drops.dir. -->
<target name="-use-drop" depends="-set-props">
<property name="primary.src.dir" value="${jaxp_src.src.dir}"/>
<path id="src.dir.id">
diff -r d1cb3e473c32 build-drop-template.xml
--- a/build-drop-template.xml Tue Nov 23 10:04:15 2010 -0800
+++ b/build-drop-template.xml Sun Dec 05 13:44:24 2010 -0800
@@ -37,7 +37,7 @@
value="${drop.expanded.dir}/bundles/$...@drop@.bundle.name}"/>
<!-- Root of exploded area. -->
- <property name="@d...@.root.dir" value="${drop.dir}/@DROP@"/>
+ <property name="@d...@.root.dir" value="${drops.dir}/@DROP@"/>
<property name="@d...@.src.dir" value="$...@drop@.root.dir}/src"/>
<!-- To see if the drop areas are ready. (ignoring bundles) -->
diff -r d1cb3e473c32 build.properties
--- a/build.properties Tue Nov 23 10:04:15 2010 -0800
+++ b/build.properties Sun Dec 05 13:44:24 2010 -0800
@@ -22,7 +22,7 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
#
-
+bootstrap.dir=/home/bothner/Java/jdk1.7.0
# Base locations where bundles are located
slashjava=/java
drops.dir=${slashjava}/devtools/share/jdk7-drops
@@ -100,7 +100,6 @@
output.dir=${output.dir}${line.separator}\
build.dir=${build.dir}${line.separator}\
dist.dir=${dist.dir}${line.separator}\
- drop.dir=${drop.dir}${line.separator}\
drops.dir=${drops.dir}${line.separator}\
${line.separator}
diff -r d1cb3e473c32 build.xml
--- a/build.xml Tue Nov 23 10:04:15 2010 -0800
+++ b/build.xml Sun Dec 05 13:44:24 2010 -0800
@@ -55,7 +55,7 @@
<property file="build.properties"/>
<!-- See if drop sources were included. -->
- <condition property="drop.dir"
+ <condition property="drops.dir"
value="${drop.included.dir}"
else="${drop.expanded.dir}">
<available file="${drop.included.dir}" type="dir"/>
diff -r f258bef45f3b build-defs.xml
--- a/build-defs.xml Tue Nov 23 10:04:43 2010 -0800
+++ b/build-defs.xml Sun Dec 05 13:44:32 2010 -0800
@@ -115,7 +115,7 @@
jaf_src-update">
</target>
- <!-- Set up source to use drop.dir. -->
+ <!-- Set up source to use drops.dir. -->
<target name="-use-drop" depends="-set-props">
<property name="primary.src.dir" value="${jaxws_src.src.dir}"/>
<path id="src.dir.id">
diff -r f258bef45f3b build-drop-template.xml
--- a/build-drop-template.xml Tue Nov 23 10:04:43 2010 -0800
+++ b/build-drop-template.xml Sun Dec 05 13:44:32 2010 -0800
@@ -37,7 +37,7 @@
value="${drop.expanded.dir}/bundles/$...@drop@.bundle.name}"/>
<!-- Root of exploded area. -->
- <property name="@d...@.root.dir" value="${drop.dir}/@DROP@"/>
+ <property name="@d...@.root.dir" value="${drops.dir}/@DROP@"/>
<property name="@d...@.src.dir" value="$...@drop@.root.dir}/src"/>
<!-- To see if the drop areas are ready. (ignoring bundles) -->
diff -r f258bef45f3b build.properties
--- a/build.properties Tue Nov 23 10:04:43 2010 -0800
+++ b/build.properties Sun Dec 05 13:44:32 2010 -0800
@@ -100,10 +100,9 @@
output.dir=${output.dir}${line.separator}\
build.dir=${build.dir}${line.separator}\
dist.dir=${dist.dir}${line.separator}\
- drop.dir=${drop.dir}${line.separator}\
drops.dir=${drops.dir}${line.separator}\
${line.separator}
-
+allow.downloads=true
# Failure messages when source cannot be found on the file system
failed.nourl.src.message=\
ERROR: Cannot find source for project ${ant.project.name}.\
diff -r f258bef45f3b build.xml
--- a/build.xml Tue Nov 23 10:04:43 2010 -0800
+++ b/build.xml Sun Dec 05 13:44:32 2010 -0800
@@ -55,7 +55,7 @@
<property file="build.properties"/>
<!-- See if drop sources were included. -->
- <condition property="drop.dir"
+ <condition property="drops.dir"
value="${drop.included.dir}"
else="${drop.expanded.dir}">
<available file="${drop.included.dir}" type="dir"/>
