changeset 293:0366c81f7862

Merge from main OpenJDK repository
author glewis@misty.eyesbeyond.com
date Sun, 07 Jun 2009 03:35:54 -0700
parents 0ae251a31ec3 5cdce469ea2a
children da5e8ebe09cd
files make/README
diffstat 4 files changed, 13 insertions(+), 44 deletions(-) [+]
line wrap: on
line diff
--- a/README	Wed May 20 18:52:17 2009 -0400
+++ b/README	Sun Jun 07 03:35:54 2009 -0700
@@ -15,7 +15,7 @@
 
 System Requirements:
   Ant:      version 1.6.5 or later
-  NetBeans: version 5.0 or later (optional)
+  NetBeans: version 6.0 or later (optional)
   JDK:      currently version 1.5.0, although 1.6.0 is recommended
   OS:       any system supporting the above tools
 
--- a/make/Makefile	Wed May 20 18:52:17 2009 -0400
+++ b/make/Makefile	Sun Jun 07 03:35:54 2009 -0700
@@ -105,6 +105,11 @@
   endif
 endif
 
+ifeq ($(DEBUG_CLASSFILES), true)
+  ANT_OPTIONS += -Djavac.debug=true
+  ANT_OPTIONS += -Ddebug.classfiles=true
+endif
+
 # Note: jdk/make/common/Defs.gmk uses LANGUAGE_VERSION (-source NN)
 # and the somewhat misnamed CLASS_VERSION (-target NN)
 ifdef TARGET_CLASS_VERSION
--- a/make/README	Wed May 20 18:52:17 2009 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-Building the "langtools" workspace.
-
-The "langtools" workspace can be built from the command line with Ant.
-The build file is make/build.xml, in conjunction with make/build.properties.
-Some additional user-specific properties files are also read, to allow
-you to customize selected properties as needed.
-
-Individual tools within the workspace can also be built and worked on
-with NetBeans, using the projects in the make/netbeans directory.
-
-The "langtools" workspace can also be built from the command line with
-GNU Make, although the Makefile is simply a wrapper around the Ant
-build file. This is provided for systems (such as the full OpenJDK build)
-that expect to be able to build this workspace with GNU Make.
-
-System Requirements:
-  Ant:      version 1.6.5 or later
-  NetBeans: version 6.0 or later (optional)
-  JDK:      currently version 1.5.0, although 1.6.0 is recommended
-  OS:       any system supporting the above tools
-
-For more information:
-  Ant:      http://ant.apache.org/
-  GNU Make: http://www.gnu.org/software/make/
-  NetBeans: http://www.netbeans.org/
-
-
-Testing the "langtools" workspace.
-
-The primary set of tests for the compiler is the compiler TCK. This
-tests that the compiler performs according to the specifications in
-JLS and JVMS.
-
-In addition, there is a substantial collection of regression and unit
-tests for all the tools in the maain langtools test/ directory.
-
-Finally, there is a small set of tests to do basic validation of a build
-of the langtools workspace for use by JDK. These tests check the contents
-of the dist/ directory generated by the build, and verify that the various
-tools can do basic "Hello World"-style processing. These tests should be
-run by jtreg, with the -jdk option set a version of JDK capable of running
-the default output of the javac compiler in this workspace. Currently, 
-this means JDK 6 or better.
--- a/make/build.xml	Wed May 20 18:52:17 2009 -0400
+++ b/make/build.xml	Sun Jun 07 03:35:54 2009 -0700
@@ -32,6 +32,13 @@
 
 <project name="langtools" default="build" basedir="..">
     
+    <!-- Force full debuginfo for javac if the debug.classfiles
+    property is set.  This must be BEFORE the include of
+    build.properties because it sets javac.debuglevel.  -->
+    <condition property="javac.debuglevel" value="source,lines,vars">
+        <equals arg1="${debug.classfiles}" arg2="true"/>
+    </condition>
+
     <!-- The following locations can be used to override default property values. -->
 
     <!-- Use this location for customizations specific to this instance of this workspace -->