Changeset 278 for trunk/openjdk/jaxp/build.xml

Timestamp:

Mar 26, 2011, 8:39:20 PM (14 years ago)

Author:

dmik

Message:

trunk: Merged in openjdk6 b22 from branches/vendor/oracle.

Location:

trunk/openjdk

Files:

• . (modified) (2 props)
• jaxp/build.xml (modified) (4 diffs)

trunk/openjdk

@@ -1 +1 @@
 build
+build-product-release

@@ -1 +1 @@
 build
+build-product-release

trunk/openjdk/jaxp/build.xml

@@ -1 +1 @@
 <?xml version="1.0"?>
 <!--
- Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
+ Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 
  This code is free software; you can redistribute it and/or modify it
  under the terms of the GNU General Public License version 2 only, as
- published by the Free Software Foundation.  Sun designates this
+ published by the Free Software Foundation.  Oracle designates this
  particular file as subject to the "Classpath" exception as provided
- by Sun in the LICENSE file that accompanied this code.
+ by Oracle in the LICENSE file that accompanied this code.
 
  This code is distributed in the hope that it will be useful, but WITHOUT
@@ -20 +20 @@
  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 
- Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- CA 95054 USA or visit www.sun.com if you need additional information or
- have any questions.
+ Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ or visit www.oracle.com if you need additional information or have any
+ questions.
 -->
 
@@ -37 +37 @@
       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>
 
@@ -107 +112 @@
     </target>
 
-    <target name="-build-prep"
-            depends="init, -init-src-dirs, -drop-build-prep">
+    <target name="-build-setup"
+            depends="init, -init-src-dirs, -drop-build-setup">
     </target>
 
     <!-- Build (compilation) of sources to class files. -->
     <target name="build"
-            depends="init, -init-src-dirs, -build-prep">
+            depends="compile, -build-setup">
+    </target>
+    <target name="compile"
+            depends="init, -init-src-dirs">
+        <mkdir dir="${build.classes.dir}"/>
         <javac 
-             includeAntRuntime="false"
-             classpath="${build.classes.dir}"
+             includeAntRuntime="false" 
+             classpath="${build.classes.dir}:${tools.jar}"
              fork="true"
              destdir="${build.classes.dir}"

@@ -1 +1 @@
 build
+build-product-release