OpenJDK / jdk / jdk
changeset 30813:302fa7e3d2f0
8074432: Move jdeps and javap to jdk.jdeps module
Reviewed-by: jjg, alanb, erikj
| author | mchung |
|---|---|
| date | Wed, 27 May 2015 13:25:32 -0700 |
| parents | 50187495b0c7 |
| children | 6ec190f2dcb9 |
| files | jdk/make/gendata/Gendata-jdk.dev.gmk jdk/make/gendata/Gendata-jdk.jdeps.gmk jdk/make/launcher/Launcher-jdk.compiler.gmk jdk/make/launcher/Launcher-jdk.dev.gmk jdk/make/launcher/Launcher-jdk.jdeps.gmk |
| diffstat | 5 files changed, 78 insertions(+), 52 deletions(-) [+] |
line wrap: on
line diff
--- a/jdk/make/gendata/Gendata-jdk.dev.gmk Wed May 27 15:57:10 2015 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,42 +0,0 @@ -# -# Copyright (c) 2014, 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. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# 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. -# - -include GendataCommon.gmk - -$(eval $(call IncludeCustomExtension, jdk, gendata/Gendata-jdk.dev.gmk)) - -JDEPS_MODULES_XML := $(JDK_OUTPUTDIR)/modules/jdk.dev/com/sun/tools/jdeps/resources/jdeps-modules.xml -MODULES_XML += $(TOPDIR)/modules.xml - -# -# Generate modules.xml for jdeps to use -# It augments $(TOPDIR)/modules.xml to include module membership -# -$(JDEPS_MODULES_XML): $(BUILD_TOOLS_JDK) $(MODULES_XML) - $(MKDIR) -p $(@D) - $(RM) $@ - $(TOOL_GENMODULESXML) -o $@ -mp $(JDK_OUTPUTDIR)/modules $(MODULES_XML) - -TARGETS += $(JDEPS_MODULES_XML)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/make/gendata/Gendata-jdk.jdeps.gmk Wed May 27 13:25:32 2015 -0700 @@ -0,0 +1,42 @@ +# +# Copyright (c) 2014, 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. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# 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. +# + +include GendataCommon.gmk + +$(eval $(call IncludeCustomExtension, jdk, gendata/Gendata-jdk.jdeps.gmk)) + +JDEPS_MODULES_XML := $(JDK_OUTPUTDIR)/modules/jdk.jdeps/com/sun/tools/jdeps/resources/jdeps-modules.xml +MODULES_XML += $(TOPDIR)/modules.xml + +# +# Generate modules.xml for jdeps to use +# It augments $(TOPDIR)/modules.xml to include module membership +# +$(JDEPS_MODULES_XML): $(BUILD_TOOLS_JDK) $(MODULES_XML) + $(MKDIR) -p $(@D) + $(RM) $@ + $(TOOL_GENMODULESXML) -o $@ -mp $(JDK_OUTPUTDIR)/modules $(MODULES_XML) + +TARGETS += $(JDEPS_MODULES_XML)
--- a/jdk/make/launcher/Launcher-jdk.compiler.gmk Wed May 27 15:57:10 2015 -0400 +++ b/jdk/make/launcher/Launcher-jdk.compiler.gmk Wed May 27 13:25:32 2015 -0700 @@ -35,11 +35,6 @@ -DNEVER_ACT_AS_SERVER_CLASS_MACHINE \ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.javah.Main"$(COMMA) }')) -$(eval $(call SetupLauncher,javap, \ - -DEXPAND_CLASSPATH_WILDCARDS \ - -DNEVER_ACT_AS_SERVER_CLASS_MACHINE \ - -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.javap.Main"$(COMMA) }')) - $(eval $(call SetupLauncher,serialver, \ -DEXPAND_CLASSPATH_WILDCARDS \ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.tools.serialver.SerialVer"$(COMMA) }'))
--- a/jdk/make/launcher/Launcher-jdk.dev.gmk Wed May 27 15:57:10 2015 -0400 +++ b/jdk/make/launcher/Launcher-jdk.dev.gmk Wed May 27 13:25:32 2015 -0700 @@ -25,10 +25,5 @@ include LauncherCommon.gmk -$(eval $(call SetupLauncher,jdeps, \ - -DEXPAND_CLASSPATH_WILDCARDS \ - -DNEVER_ACT_AS_SERVER_CLASS_MACHINE \ - -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.jdeps.Main"$(COMMA) }')) - $(eval $(call SetupLauncher,jimage,\ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "jdk.tools.jimage.Main"$(COMMA) }'))
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/make/launcher/Launcher-jdk.jdeps.gmk Wed May 27 13:25:32 2015 -0700 @@ -0,0 +1,36 @@ +# +# Copyright (c) 2015, 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. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# 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. +# + +include LauncherCommon.gmk + +$(eval $(call SetupLauncher,javap, \ + -DEXPAND_CLASSPATH_WILDCARDS \ + -DNEVER_ACT_AS_SERVER_CLASS_MACHINE \ + -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.javap.Main"$(COMMA) }')) + +$(eval $(call SetupLauncher,jdeps, \ + -DEXPAND_CLASSPATH_WILDCARDS \ + -DNEVER_ACT_AS_SERVER_CLASS_MACHINE \ + -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.jdeps.Main"$(COMMA) }'))