Wed, 06 May 2009 18:04:08 +0100
6837665: Deal with windows ant problem where commas in -D options do not work
Summary: Rewrite to avoid commas in -D options
Reviewed-by: ohair
make/Makefile | file | annotate | diff | comparison | revisions | |
make/build.xml | file | annotate | diff | comparison | revisions |
1.1 --- a/make/Makefile Mon Apr 20 19:01:35 2009 +0100 1.2 +++ b/make/Makefile Wed May 06 18:04:08 2009 +0100 1.3 @@ -107,7 +107,7 @@ 1.4 1.5 ifeq ($(DEBUG_CLASSFILES), true) 1.6 ANT_OPTIONS += -Djavac.debug=true 1.7 - ANT_OPTIONS += -Djavac.debuglevel=source,lines,vars 1.8 + ANT_OPTIONS += -Ddebug.classfiles=true 1.9 endif 1.10 1.11 # Note: jdk/make/common/Defs.gmk uses LANGUAGE_VERSION (-source NN)
2.1 --- a/make/build.xml Mon Apr 20 19:01:35 2009 +0100 2.2 +++ b/make/build.xml Wed May 06 18:04:08 2009 +0100 2.3 @@ -32,6 +32,13 @@ 2.4 2.5 <project name="langtools" default="build" basedir=".."> 2.6 2.7 + <!-- Force full debuginfo for javac if the debug.classfiles 2.8 + property is set. This must be BEFORE the include of 2.9 + build.properties because it sets javac.debuglevel. --> 2.10 + <condition property="javac.debuglevel" value="source,lines,vars"> 2.11 + <equals arg1="${debug.classfiles}" arg2="true"/> 2.12 + </condition> 2.13 + 2.14 <!-- The following locations can be used to override default property values. --> 2.15 2.16 <!-- Use this location for customizations specific to this instance of this workspace -->