OpenJDK / jdk / jdk
changeset 31445:0ed42e9e7694
8081814: Modularize the deploy build
Reviewed-by: ihse, ddehaven
| author | erikj |
|---|---|
| date | Thu, 04 Jun 2015 18:28:52 +0200 |
| parents | 9d3d98a1adcb |
| children | b4b7fd7c100d |
| files | jdk/make/CopySamples.gmk jdk/make/lib/LibCommon.gmk jdk/make/src/classes/build/tools/module/ModuleArchive.java |
| diffstat | 3 files changed, 3 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/jdk/make/CopySamples.gmk Thu Jun 18 14:45:44 2015 -0500 +++ b/jdk/make/CopySamples.gmk Thu Jun 04 18:28:52 2015 +0200 @@ -28,7 +28,7 @@ include $(SPEC) include MakeBase.gmk -SAMPLE_TARGET_DIR := $(SUPPORT_OUTPUTDIR)/sample +SAMPLE_TARGET_DIR := $(SUPPORT_OUTPUTDIR)/sample/image SAMPLE_SOURCE_DIR := $(JDK_TOPDIR)/src/sample/share SAMPLE_CLOSED_SOURCE_DIR := $(JDK_TOPDIR)/src/closed/sample/share SAMPLE_SOLARIS_SOURCE_DIR := $(JDK_TOPDIR)/src/sample/solaris
--- a/jdk/make/lib/LibCommon.gmk Thu Jun 18 14:45:44 2015 -0500 +++ b/jdk/make/lib/LibCommon.gmk Thu Jun 04 18:28:52 2015 +0200 @@ -60,17 +60,6 @@ $(JDK_TOPDIR)/src/$(strip $1)/share/native/lib$(strip $2))) ################################################################################ -# Find lib dir for module -# Param 1 - module name -ifeq ($(OPENJDK_TARGET_OS_TYPE), unix) - FindLibDirForModule = \ - $(SUPPORT_OUTPUTDIR)/modules_libs/$(strip $1)$(OPENJDK_TARGET_CPU_LIBDIR) -else - FindLibDirForModule = \ - $(SUPPORT_OUTPUTDIR)/modules_libs/$(strip $1) -endif - -################################################################################ # Find a library # Param 1 - module name # Param 2 - library name
--- a/jdk/make/src/classes/build/tools/module/ModuleArchive.java Thu Jun 18 14:45:44 2015 -0500 +++ b/jdk/make/src/classes/build/tools/module/ModuleArchive.java Thu Jun 04 18:28:52 2015 +0200 @@ -228,7 +228,8 @@ private static String nativeDir(String filename) { if (System.getProperty("os.name").startsWith("Windows")) { if (filename.endsWith(".dll") || filename.endsWith(".diz") - || filename.endsWith(".pdb") || filename.endsWith(".map")) { + || filename.endsWith(".pdb") || filename.endsWith(".map") + || filename.endsWith(".cpl")) { return "bin"; } else { return "lib";