7150324: Stop using drop bundles in jaxp

Reviewed-by: prr, joehw

1 files changed, 26 insertions, 31 deletions

diff --git a/build.xml b/build.xml
index 9a5897b..437ad0f 100644
--- a/build.xml
+++ b/build.xml
@@ -36,9 +36,6 @@
       javac.debug          - true or false for debug classfiles
       javac.target         - classfile version target
       javac.source         - source version
-      drops.dir            - directory that holds source drop bundles
-      allow.download       - permit downloads from public url (default is false)
-                             (used if bundles not found in drops.dir)
 
       Run 'make help' for help using the Makefile.
     </description>
@@ -46,15 +43,11 @@
     <!-- Project build properties. -->
     <property file="build.properties"/>
 
-    <!-- See if drop sources were included. -->
-    <condition property="drop.dir" 
-               value="${drop.included.dir}" 
-               else="${drop.expanded.dir}">
-        <available file="${drop.included.dir}" type="dir"/>
-    </condition>
-
-    <!-- Get shared targets. -->
-    <import file="build-defs.xml"/>
+    <!-- Source dir def -->
+    <property name="jaxp.src.dir" value="src/share/classes"/>
+    <path id="src.dir.id">
+      <pathelement path="${jaxp.src.dir}"/>
+    </path>
 
     <!-- Initialization of directories needed for build. -->
     <target name="init">
@@ -82,11 +75,11 @@
 
     <!-- Creation of distribution files to jdk build process. -->
     <target name="dist"
-	    depends="init, -init-src-dirs, build, -dist-classes-jar, -dist-src-zip"
+	    depends="init, build, -dist-classes-jar, -dist-src-zip"
             description="Create all built distribution files.">
     </target>
     <target name="-dist-classes-jar-uptodate"
-	    depends="init, -init-src-dirs">
+	    depends="init">
         <condition property="dist.classes.jar.uptodate">
             <and>
                 <available file="${dist.classes.jar}" type="file"/>
@@ -97,22 +90,35 @@
         </condition>
     </target>
     <target name="-dist-classes-jar"
-	    depends="init, -init-src-dirs, -dist-classes-jar-uptodate"
+	    depends="init, -dist-classes-jar-uptodate"
             unless="dist.classes.jar.uptodate">
         <delete file="${dist.classes.jar}"/>
         <jar file="${dist.classes.jar}" basedir="${build.classes.dir}"/>
     </target>
 
-    <target name="-build-setup"
-	    depends="init, -init-src-dirs, -drop-build-setup">
+    <!-- Special build area setup. -->
+    <target name="-build-setup" depends="init">
+        <mkdir dir="${build.classes.dir}"/>
+        <copy todir="${build.classes.dir}">
+            <fileset dir="${jaxp.src.dir}"
+                     includes="**/*.properties"/>
+        </copy>
+        <replaceregexp match="#(.*)$" replace="#" flags="gm">
+            <fileset dir="${build.classes.dir}" includes="**/*.properties"/>
+        </replaceregexp>
     </target>
 
+    <!-- Create src.zip. -->
+    <target name="-dist-src-zip" depends="init">
+        <zip file="${dist.src.zip}" basedir="${jaxp.src.dir}"/>
+    </target>
+    
     <!-- Build (compilation) of sources to class files. -->
     <target name="build"
 	    depends="compile, -build-setup">
     </target>
     <target name="compile"
-	    depends="init, -init-src-dirs">
+	    depends="init">
         <mkdir dir="${build.classes.dir}"/>
         <javac 
 	     includeAntRuntime="false" 
@@ -132,24 +138,14 @@
 
     <!-- Test. (FIXME: Need to know how to run tests.) -->
     <target name="test"
-	    depends="init, -init-src-dirs, dist">
+	    depends="init, dist">
         <echo message="FIXME: How do you run the tests"/>
     </target>
     
     <!-- Populate source area if needed. -->
     <target name="source"
-            depends="init, -init-src-dirs"
-            description="Populate all source file directories">
-    </target>
-
-    <!-- Populate drop_included area. -->
-    <target name="drop_included"
-            depends="clobber"
+            depends="init"
             description="Populate all source file directories">
-        <delete dir="${drop.included.dir}"/>
-        <antcall target="source"/>
-        <move file="${drop.expanded.dir}" tofile="${drop.included.dir}"/>
-        <delete dir="${drop.included.dir}/bundles"/>
     </target>
 
     <!-- Clean up compiled files. -->
@@ -163,7 +159,6 @@
     <target name="clobber"
 	    depends="clean"
             description="Delete all generated files, including imported sources">
-        <delete dir="${drop.expanded.dir}"/>
     </target>
 
     <target name="-banner">