Mercurial > hg > release > icedtea-1.10
view patches/icedtea-javac-debuginfo.patch @ 1842:31b0ba36a6b7
Completely restructure the building and inclusion of netx and plugin code.
We were relying on the binary plugs process (and thus importing unneeded
SNMP classes). We now use the same method as jaxws, jaxp, langtools and corba,
and the binary plugs process is turned off (the default, we were turning
it on by setting ALT_BINARY_PLUGS_PATH).
2009-05-27 Andrew John Hughes <ahughes@redhat.com>
* overlays/openjdk/jdk/src/share/classes/javax/jnlp/BasicService.java,
* overlays/openjdk/jdk/src/share/classes/javax/jnlp/ClipboardService.java,
* overlays/openjdk/jdk/src/share/classes/javax/jnlp/DownloadService.java,
* overlays/openjdk/jdk/src/share/classes/javax/jnlp/DownloadServiceListener.java,
* overlays/openjdk/jdk/src/share/classes/javax/jnlp/ExtensionInstallerService.java,
* overlays/openjdk/jdk/src/share/classes/javax/jnlp/FileContents.java,
* overlays/openjdk/jdk/src/share/classes/javax/jnlp/FileOpenService.java,
* overlays/openjdk/jdk/src/share/classes/javax/jnlp/FileSaveService.java,
* overlays/openjdk/jdk/src/share/classes/javax/jnlp/JNLPRandomAccessFile.java,
* overlays/openjdk/jdk/src/share/classes/javax/jnlp/PersistenceService.java,
* overlays/openjdk/jdk/src/share/classes/javax/jnlp/PrintService.java,
* overlays/openjdk/jdk/src/share/classes/javax/jnlp/ServiceManager.java,
* overlays/openjdk/jdk/src/share/classes/javax/jnlp/ServiceManagerStub.java,
* overlays/openjdk/jdk/src/share/classes/javax/jnlp/UnavailableServiceException.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/AppletDesc.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/ApplicationDesc.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/ComponentDesc.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/DefaultLaunchHandler.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/ExtensionDesc.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/IconDesc.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/InformationDesc.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/InstallerDesc.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/JARDesc.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/JNLPFile.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/JNLPSplashScreen.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/JREDesc.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/LaunchException.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/LaunchHandler.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/Launcher.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/NetxPanel.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/Node.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/PackageDesc.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/ParseException.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/Parser.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/PluginBridge.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/PropertyDesc.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/ResourcesDesc.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/SecurityDesc.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/Version.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/cache/CacheEntry.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/cache/CacheUtil.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/cache/DownloadIndicator.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/cache/Resource.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/cache/ResourceTracker.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/cache/UpdatePolicy.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/cache/package.html,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/event/ApplicationEvent.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/event/ApplicationListener.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/event/DownloadEvent.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/event/DownloadListener.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/event/package.html,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/package.html,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/resources/Manifest.mf,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/resources/Messages.properties,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/resources/about.jnlp,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/resources/default.jnlp,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/AppThreadGroup.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/AppletAudioClip.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/AppletEnvironment.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/AppletInstance.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/ApplicationInstance.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/Boot.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/Boot13.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/JNLPClassLoader.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/JNLPPolicy.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/JNLPRuntime.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/package.html,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/AccessWarningPane.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/AppletWarningPane.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/CertVerifier.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/CertWarningPane.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/CertsInfoPane.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/HttpsCertVerifier.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/MoreInfoPane.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/SecurityDialogUI.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/SecurityUtil.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/SecurityWarningDialog.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/SingleCertInfoPane.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/VariableX509TrustManager.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/viewer/CertificatePane.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/viewer/CertificateViewer.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/ServiceUtil.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XBasicService.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XClipboardService.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XDownloadService.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XExtensionInstallerService.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XFileContents.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XFileOpenService.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XFileSaveService.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XJNLPRandomAccessFile.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XPersistenceService.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XPrintService.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XServiceManagerStub.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/package.html,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/tools/CharacterEncoder.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/tools/HexDumpEncoder.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/tools/JarRunner.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/tools/JarSigner.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/tools/JarSignerResources.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/tools/KeyStoreUtil.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/tools/KeyTool.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/util/PropertiesFile.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/util/Reflect.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/util/WeakList.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/nanoxml/XMLElement.java,
* overlays/openjdk/jdk/src/share/classes/net/sourceforge/nanoxml/XMLParseException.java:
Moved to...
* Makefile.am:
Remove use of ALT_BINARY_PLUGS_PATH (and thus turn off the binary plugs build),
add a INITIAL_BOOTSTRAP_LINK_STAMP target which allows us to depend on $(ICEDTEA_BOOT_DIR)
for both types of build, output to lib/tools.jar not jre/lib/tools.jar, add targets
for building netx and liveconnect classes and make icedtea targets dependent on this.
* netx/javax/jnlp/BasicService.java,
* netx/javax/jnlp/ClipboardService.java,
* netx/javax/jnlp/DownloadService.java,
* netx/javax/jnlp/DownloadServiceListener.java,
* netx/javax/jnlp/ExtensionInstallerService.java,
* netx/javax/jnlp/FileContents.java,
* netx/javax/jnlp/FileOpenService.java,
* netx/javax/jnlp/FileSaveService.java,
* netx/javax/jnlp/JNLPRandomAccessFile.java,
* netx/javax/jnlp/PersistenceService.java,
* netx/javax/jnlp/PrintService.java,
* netx/javax/jnlp/ServiceManager.java,
* netx/javax/jnlp/ServiceManagerStub.java,
* netx/javax/jnlp/UnavailableServiceException.java,
* netx/net/sourceforge/jnlp/AppletDesc.java,
* netx/net/sourceforge/jnlp/ApplicationDesc.java,
* netx/net/sourceforge/jnlp/ComponentDesc.java,
* netx/net/sourceforge/jnlp/DefaultLaunchHandler.java,
* netx/net/sourceforge/jnlp/ExtensionDesc.java,
* netx/net/sourceforge/jnlp/IconDesc.java,
* netx/net/sourceforge/jnlp/InformationDesc.java,
* netx/net/sourceforge/jnlp/InstallerDesc.java,
* netx/net/sourceforge/jnlp/JARDesc.java,
* netx/net/sourceforge/jnlp/JNLPFile.java,
* netx/net/sourceforge/jnlp/JNLPSplashScreen.java,
* netx/net/sourceforge/jnlp/JREDesc.java,
* netx/net/sourceforge/jnlp/LaunchException.java,
* netx/net/sourceforge/jnlp/LaunchHandler.java,
* netx/net/sourceforge/jnlp/Launcher.java,
* netx/net/sourceforge/jnlp/NetxPanel.java,
* netx/net/sourceforge/jnlp/Node.java,
* netx/net/sourceforge/jnlp/PackageDesc.java,
* netx/net/sourceforge/jnlp/ParseException.java,
* netx/net/sourceforge/jnlp/Parser.java,
* netx/net/sourceforge/jnlp/PluginBridge.java,
* netx/net/sourceforge/jnlp/PropertyDesc.java,
* netx/net/sourceforge/jnlp/ResourcesDesc.java,
* netx/net/sourceforge/jnlp/SecurityDesc.java,
* netx/net/sourceforge/jnlp/Version.java,
* netx/net/sourceforge/jnlp/cache/CacheEntry.java,
* netx/net/sourceforge/jnlp/cache/CacheUtil.java,
* netx/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java,
* netx/net/sourceforge/jnlp/cache/DownloadIndicator.java,
* netx/net/sourceforge/jnlp/cache/Resource.java,
* netx/net/sourceforge/jnlp/cache/ResourceTracker.java,
* netx/net/sourceforge/jnlp/cache/UpdatePolicy.java,
* netx/net/sourceforge/jnlp/cache/package.html,
* netx/net/sourceforge/jnlp/event/ApplicationEvent.java,
* netx/net/sourceforge/jnlp/event/ApplicationListener.java,
* netx/net/sourceforge/jnlp/event/DownloadEvent.java,
* netx/net/sourceforge/jnlp/event/DownloadListener.java,
* netx/net/sourceforge/jnlp/event/package.html,
* netx/net/sourceforge/jnlp/package.html,
* netx/net/sourceforge/jnlp/resources/Manifest.mf,
* netx/net/sourceforge/jnlp/resources/Messages.properties,
* netx/net/sourceforge/jnlp/resources/about.jnlp,
* netx/net/sourceforge/jnlp/resources/default.jnlp,
* netx/net/sourceforge/jnlp/runtime/AppThreadGroup.java,
* netx/net/sourceforge/jnlp/runtime/AppletAudioClip.java,
* netx/net/sourceforge/jnlp/runtime/AppletEnvironment.java,
* netx/net/sourceforge/jnlp/runtime/AppletInstance.java,
* netx/net/sourceforge/jnlp/runtime/ApplicationInstance.java,
* netx/net/sourceforge/jnlp/runtime/Boot.java,
* netx/net/sourceforge/jnlp/runtime/Boot13.java,
* netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java,
* netx/net/sourceforge/jnlp/runtime/JNLPPolicy.java,
* netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java,
* netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java,
* netx/net/sourceforge/jnlp/runtime/package.html,
* netx/net/sourceforge/jnlp/security/AccessWarningPane.java,
* netx/net/sourceforge/jnlp/security/AppletWarningPane.java,
* netx/net/sourceforge/jnlp/security/CertVerifier.java,
* netx/net/sourceforge/jnlp/security/CertWarningPane.java,
* netx/net/sourceforge/jnlp/security/CertsInfoPane.java,
* netx/net/sourceforge/jnlp/security/HttpsCertVerifier.java,
* netx/net/sourceforge/jnlp/security/MoreInfoPane.java,
* netx/net/sourceforge/jnlp/security/SecurityDialogUI.java,
* netx/net/sourceforge/jnlp/security/SecurityUtil.java,
* netx/net/sourceforge/jnlp/security/SecurityWarningDialog.java,
* netx/net/sourceforge/jnlp/security/SingleCertInfoPane.java,
* netx/net/sourceforge/jnlp/security/VariableX509TrustManager.java,
* netx/net/sourceforge/jnlp/security/viewer/CertificatePane.java,
* netx/net/sourceforge/jnlp/security/viewer/CertificateViewer.java,
* netx/net/sourceforge/jnlp/services/ServiceUtil.java,
* netx/net/sourceforge/jnlp/services/XBasicService.java,
* netx/net/sourceforge/jnlp/services/XClipboardService.java,
* netx/net/sourceforge/jnlp/services/XDownloadService.java,
* netx/net/sourceforge/jnlp/services/XExtensionInstallerService.java,
* netx/net/sourceforge/jnlp/services/XFileContents.java,
* netx/net/sourceforge/jnlp/services/XFileOpenService.java,
* netx/net/sourceforge/jnlp/services/XFileSaveService.java,
* netx/net/sourceforge/jnlp/services/XJNLPRandomAccessFile.java,
* netx/net/sourceforge/jnlp/services/XPersistenceService.java,
* netx/net/sourceforge/jnlp/services/XPrintService.java,
* netx/net/sourceforge/jnlp/services/XServiceManagerStub.java,
* netx/net/sourceforge/jnlp/services/package.html,
* netx/net/sourceforge/jnlp/tools/CharacterEncoder.java,
* netx/net/sourceforge/jnlp/tools/HexDumpEncoder.java,
* netx/net/sourceforge/jnlp/tools/JarRunner.java,
* netx/net/sourceforge/jnlp/tools/JarSigner.java,
* netx/net/sourceforge/jnlp/tools/JarSignerResources.java,
* netx/net/sourceforge/jnlp/tools/KeyStoreUtil.java,
* netx/net/sourceforge/jnlp/tools/KeyTool.java,
* netx/net/sourceforge/jnlp/util/PropertiesFile.java,
* netx/net/sourceforge/jnlp/util/Reflect.java,
* netx/net/sourceforge/jnlp/util/WeakList.java,
* netx/net/sourceforge/nanoxml/XMLElement.java,
* netx/net/sourceforge/nanoxml/XMLParseException.java: to here.
* patches/ecj/icedtea.patch:
Recreated.
* patches/icedtea-ant.patch:
Remove hack to jaxws which uses plugs directory (now undefined).
* patches/icedtea-javac-debuginfo.patch: Recreated.
* patches/icedtea-netx.patch:
Include netx and netscape classes via the same import mechanism
as jaxws, jaxp, corba and langtools (extracting a classes.zip).
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Thu, 28 May 2009 10:18:19 +0100 |
| parents | be559c26fdbc |
| children |
line wrap: on
line source
diff -Nru openjdk.orig/corba/make/common/shared/Defs-java.gmk openjdk/corba/make/common/shared/Defs-java.gmk --- openjdk.orig/corba/make/common/shared/Defs-java.gmk 2009-03-30 23:07:09.000000000 +0100 +++ openjdk/corba/make/common/shared/Defs-java.gmk 2009-05-28 03:37:15.000000000 +0100 @@ -91,15 +91,8 @@ # -- Use JAVAC_CMD if you want to take the defaults given to you. # -ifndef DEBUG_CLASSFILES - ifeq ($(VARIANT), DBG) - DEBUG_CLASSFILES = true - endif -endif -JAVACFLAGS = -ifeq ($(DEBUG_CLASSFILES),true) - JAVACFLAGS += -g -endif +# Always include debug info +JAVACFLAGS += -g ifeq ($(COMPILER_WARNINGS_FATAL), true) JAVACFLAGS += -Werror endif diff -Nru openjdk.orig/jaxp/make/build.xml openjdk/jaxp/make/build.xml --- openjdk.orig/jaxp/make/build.xml 2009-03-30 17:16:08.000000000 +0100 +++ openjdk/jaxp/make/build.xml 2009-05-28 03:37:15.000000000 +0100 @@ -85,7 +85,8 @@ destdir="${build.classes.dir}" memoryInitialSize="${javac.memoryInitialSize}" memoryMaximumSize="${javac.memoryMaximumSize}" - target="${javac.target}"> + target="${javac.target}" + debug="${javac.debug}"> <compilerarg value="-J-Xbootclasspath/p:${bootstrap.dir}/lib/javac.jar"/> <compilerarg line="${javac.version.opt}"/> </javac> diff -Nru openjdk.orig/jaxp/make/Makefile openjdk/jaxp/make/Makefile --- openjdk.orig/jaxp/make/Makefile 2009-05-28 03:31:22.000000000 +0100 +++ openjdk/jaxp/make/Makefile 2009-05-28 03:37:15.000000000 +0100 @@ -61,13 +61,8 @@ endif endif -ifeq ($(VARIANT), DBG) - ANT_OPTIONS += -Djavac.debug=true -else - ifeq ($(VARIANT), OPT) - ANT_OPTIONS += -Djavac.debug=false - endif -endif +# Always include debug info +ANT_OPTIONS += -Djavac.debug=true # Note: jdk/make/common/Defs.gmk uses LANGUAGE_VERSION (-source NN) # and the somewhat misnamed CLASS_VERSION (-target NN) diff -Nru openjdk.orig/jaxws/make/build.xml openjdk/jaxws/make/build.xml --- openjdk.orig/jaxws/make/build.xml 2009-05-08 17:49:56.000000000 +0100 +++ openjdk/jaxws/make/build.xml 2009-05-28 03:37:15.000000000 +0100 @@ -108,6 +108,7 @@ memoryInitialSize="${javac.memoryInitialSize}" memoryMaximumSize="${javac.memoryMaximumSize}" target="${javac.target}" + debug="${javac.debug}" excludes="com/sun/tools/internal/txw2/**"> <compilerarg value="-J-Xbootclasspath/p:${bootstrap.dir}/lib/javac.jar"/> <compilerarg line="${javac.version.opt}"/> diff -Nru openjdk.orig/jaxws/make/Makefile openjdk/jaxws/make/Makefile --- openjdk.orig/jaxws/make/Makefile 2009-05-28 03:31:22.000000000 +0100 +++ openjdk/jaxws/make/Makefile 2009-05-28 03:37:15.000000000 +0100 @@ -61,13 +61,8 @@ endif endif -ifeq ($(VARIANT), DBG) - ANT_OPTIONS += -Djavac.debug=true -else - ifeq ($(VARIANT), OPT) - ANT_OPTIONS += -Djavac.debug=false - endif -endif +# Always include debug info +ANT_OPTIONS += -Djavac.debug=true # Note: jdk/make/common/Defs.gmk uses LANGUAGE_VERSION (-source NN) # and the somewhat misnamed CLASS_VERSION (-target NN) diff -Nru openjdk.orig/langtools/make/Makefile openjdk/langtools/make/Makefile --- openjdk.orig/langtools/make/Makefile 2009-05-28 03:31:22.000000000 +0100 +++ openjdk/langtools/make/Makefile 2009-05-28 03:37:15.000000000 +0100 @@ -97,13 +97,8 @@ endif endif -ifeq ($(VARIANT), DBG) - ANT_OPTIONS += -Djavac.debug=true -else - ifeq ($(VARIANT), OPT) - ANT_OPTIONS += -Djavac.debug=false - endif -endif +# Always include debug info +ANT_OPTIONS += -Djavac.debug=true # Note: jdk/make/common/Defs.gmk uses LANGUAGE_VERSION (-source NN) # and the somewhat misnamed CLASS_VERSION (-target NN)