From 2ae75ccaa18a95b6bc852f67303883cb5de53e55 Mon Sep 17 00:00:00 2001 From: Mandy Chung Date: Fri, 6 Mar 2015 09:02:26 -0800 Subject: [PATCH] 8074428: Move pack200, unpack200, libpack200 to jdk.pack200 Reviewed-by: alanb, weijun, erikj, ihse --- ...{Launcher-jdk.runtime.gmk => Launcher-jdk.pack200.gmk} | 8 ++++---- jdk/make/lib/{Lib-jdk.runtime.gmk => Lib-jdk.pack200.gmk} | 6 +++--- .../share/native/common-unpack/bands.cpp | 0 .../share/native/common-unpack/bands.h | 0 .../share/native/common-unpack/bytes.cpp | 0 .../share/native/common-unpack/bytes.h | 0 .../share/native/common-unpack/coding.cpp | 0 .../share/native/common-unpack/coding.h | 0 .../share/native/common-unpack/constants.h | 0 .../share/native/common-unpack/defines.h | 0 .../share/native/common-unpack/unpack.cpp | 0 .../share/native/common-unpack/unpack.h | 0 .../share/native/common-unpack/utils.cpp | 0 .../share/native/common-unpack/utils.h | 0 .../share/native/common-unpack/zip.cpp | 0 .../share/native/common-unpack/zip.h | 0 .../share/native/libunpack/jni.cpp | 0 .../share/native/unpack200/main.cpp | 0 .../windows/native/unpack200/unpack200_proto.exe.manifest | 0 19 files changed, 7 insertions(+), 7 deletions(-) rename jdk/make/launcher/{Launcher-jdk.runtime.gmk => Launcher-jdk.pack200.gmk} (94%) rename jdk/make/lib/{Lib-jdk.runtime.gmk => Lib-jdk.pack200.gmk} (92%) rename jdk/src/{jdk.runtime => jdk.pack200}/share/native/common-unpack/bands.cpp (100%) rename jdk/src/{jdk.runtime => jdk.pack200}/share/native/common-unpack/bands.h (100%) rename jdk/src/{jdk.runtime => jdk.pack200}/share/native/common-unpack/bytes.cpp (100%) rename jdk/src/{jdk.runtime => jdk.pack200}/share/native/common-unpack/bytes.h (100%) rename jdk/src/{jdk.runtime => jdk.pack200}/share/native/common-unpack/coding.cpp (100%) rename jdk/src/{jdk.runtime => jdk.pack200}/share/native/common-unpack/coding.h (100%) rename jdk/src/{jdk.runtime => jdk.pack200}/share/native/common-unpack/constants.h (100%) rename jdk/src/{jdk.runtime => jdk.pack200}/share/native/common-unpack/defines.h (100%) rename jdk/src/{jdk.runtime => jdk.pack200}/share/native/common-unpack/unpack.cpp (100%) rename jdk/src/{jdk.runtime => jdk.pack200}/share/native/common-unpack/unpack.h (100%) rename jdk/src/{jdk.runtime => jdk.pack200}/share/native/common-unpack/utils.cpp (100%) rename jdk/src/{jdk.runtime => jdk.pack200}/share/native/common-unpack/utils.h (100%) rename jdk/src/{jdk.runtime => jdk.pack200}/share/native/common-unpack/zip.cpp (100%) rename jdk/src/{jdk.runtime => jdk.pack200}/share/native/common-unpack/zip.h (100%) rename jdk/src/{jdk.runtime => jdk.pack200}/share/native/libunpack/jni.cpp (100%) rename jdk/src/{jdk.runtime => jdk.pack200}/share/native/unpack200/main.cpp (100%) rename jdk/src/{jdk.runtime => jdk.pack200}/windows/native/unpack200/unpack200_proto.exe.manifest (100%) diff --git a/jdk/make/launcher/Launcher-jdk.runtime.gmk b/jdk/make/launcher/Launcher-jdk.pack200.gmk similarity index 94% rename from jdk/make/launcher/Launcher-jdk.runtime.gmk rename to jdk/make/launcher/Launcher-jdk.pack200.gmk index 366dc5cc9a2..1e6c21820cb 100644 --- a/jdk/make/launcher/Launcher-jdk.runtime.gmk +++ b/jdk/make/launcher/Launcher-jdk.pack200.gmk @@ -32,9 +32,9 @@ $(eval $(call SetupLauncher,pack200, \ # The order of the object files on the link command line affects the size of the resulting # binary (at least on linux) which causes the size to differ between old and new build. -UNPACKEXE_SRC := $(JDK_TOPDIR)/src/jdk.runtime/share/native/common-unpack \ - $(JDK_TOPDIR)/src/jdk.runtime/share/native/unpack200 -UNPACKEXE_CFLAGS := -I$(JDK_TOPDIR)/src/jdk.runtime/share/native/common-unpack \ +UNPACKEXE_SRC := $(JDK_TOPDIR)/src/jdk.pack200/share/native/common-unpack \ + $(JDK_TOPDIR)/src/jdk.pack200/share/native/unpack200 +UNPACKEXE_CFLAGS := -I$(JDK_TOPDIR)/src/jdk.pack200/share/native/common-unpack \ -I$(JDK_TOPDIR)/src/java.base/share/native/libjava \ -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjava @@ -96,7 +96,7 @@ $(eval $(call SetupNativeCompilation,BUILD_UNPACKEXE, \ -D "JDK_INTERNAL_NAME=unpack200" \ -D "JDK_FTYPE=0x1L", \ DEBUG_SYMBOLS := true, \ - MANIFEST := $(JDK_TOPDIR)/src/jdk.runtime/windows/native/unpack200/unpack200_proto.exe.manifest)) + MANIFEST := $(JDK_TOPDIR)/src/jdk.pack200/windows/native/unpack200/unpack200_proto.exe.manifest)) ifneq ($(USE_EXTERNAL_LIBZ), true) diff --git a/jdk/make/lib/Lib-jdk.runtime.gmk b/jdk/make/lib/Lib-jdk.pack200.gmk similarity index 92% rename from jdk/make/lib/Lib-jdk.runtime.gmk rename to jdk/make/lib/Lib-jdk.pack200.gmk index 4bf9b026cc1..eb8caa61485 100644 --- a/jdk/make/lib/Lib-jdk.runtime.gmk +++ b/jdk/make/lib/Lib-jdk.pack200.gmk @@ -30,14 +30,14 @@ include LibCommon.gmk $(eval $(call SetupNativeCompilation,BUILD_LIBUNPACK, \ LIBRARY := unpack, \ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ - SRC := $(JDK_TOPDIR)/src/jdk.runtime/share/native/libunpack \ - $(JDK_TOPDIR)/src/jdk.runtime/share/native/common-unpack, \ + SRC := $(JDK_TOPDIR)/src/jdk.pack200/share/native/libunpack \ + $(JDK_TOPDIR)/src/jdk.pack200/share/native/common-unpack, \ LANG := C++, \ OPTIMIZATION := LOW, \ CFLAGS := $(CXXFLAGS_JDKLIB) \ -DNO_ZLIB -DUNPACK_JNI -DFULL \ -I$(SUPPORT_OUTPUTDIR)/headers/java.base \ - -I$(JDK_TOPDIR)/src/jdk.runtime/share/native/common-unpack \ + -I$(JDK_TOPDIR)/src/jdk.pack200/share/native/common-unpack \ $(LIBJAVA_HEADER_FLAGS), \ CFLAGS_release := -DPRODUCT, \ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libunpack/mapfile-vers, \ diff --git a/jdk/src/jdk.runtime/share/native/common-unpack/bands.cpp b/jdk/src/jdk.pack200/share/native/common-unpack/bands.cpp similarity index 100% rename from jdk/src/jdk.runtime/share/native/common-unpack/bands.cpp rename to jdk/src/jdk.pack200/share/native/common-unpack/bands.cpp diff --git a/jdk/src/jdk.runtime/share/native/common-unpack/bands.h b/jdk/src/jdk.pack200/share/native/common-unpack/bands.h similarity index 100% rename from jdk/src/jdk.runtime/share/native/common-unpack/bands.h rename to jdk/src/jdk.pack200/share/native/common-unpack/bands.h diff --git a/jdk/src/jdk.runtime/share/native/common-unpack/bytes.cpp b/jdk/src/jdk.pack200/share/native/common-unpack/bytes.cpp similarity index 100% rename from jdk/src/jdk.runtime/share/native/common-unpack/bytes.cpp rename to jdk/src/jdk.pack200/share/native/common-unpack/bytes.cpp diff --git a/jdk/src/jdk.runtime/share/native/common-unpack/bytes.h b/jdk/src/jdk.pack200/share/native/common-unpack/bytes.h similarity index 100% rename from jdk/src/jdk.runtime/share/native/common-unpack/bytes.h rename to jdk/src/jdk.pack200/share/native/common-unpack/bytes.h diff --git a/jdk/src/jdk.runtime/share/native/common-unpack/coding.cpp b/jdk/src/jdk.pack200/share/native/common-unpack/coding.cpp similarity index 100% rename from jdk/src/jdk.runtime/share/native/common-unpack/coding.cpp rename to jdk/src/jdk.pack200/share/native/common-unpack/coding.cpp diff --git a/jdk/src/jdk.runtime/share/native/common-unpack/coding.h b/jdk/src/jdk.pack200/share/native/common-unpack/coding.h similarity index 100% rename from jdk/src/jdk.runtime/share/native/common-unpack/coding.h rename to jdk/src/jdk.pack200/share/native/common-unpack/coding.h diff --git a/jdk/src/jdk.runtime/share/native/common-unpack/constants.h b/jdk/src/jdk.pack200/share/native/common-unpack/constants.h similarity index 100% rename from jdk/src/jdk.runtime/share/native/common-unpack/constants.h rename to jdk/src/jdk.pack200/share/native/common-unpack/constants.h diff --git a/jdk/src/jdk.runtime/share/native/common-unpack/defines.h b/jdk/src/jdk.pack200/share/native/common-unpack/defines.h similarity index 100% rename from jdk/src/jdk.runtime/share/native/common-unpack/defines.h rename to jdk/src/jdk.pack200/share/native/common-unpack/defines.h diff --git a/jdk/src/jdk.runtime/share/native/common-unpack/unpack.cpp b/jdk/src/jdk.pack200/share/native/common-unpack/unpack.cpp similarity index 100% rename from jdk/src/jdk.runtime/share/native/common-unpack/unpack.cpp rename to jdk/src/jdk.pack200/share/native/common-unpack/unpack.cpp diff --git a/jdk/src/jdk.runtime/share/native/common-unpack/unpack.h b/jdk/src/jdk.pack200/share/native/common-unpack/unpack.h similarity index 100% rename from jdk/src/jdk.runtime/share/native/common-unpack/unpack.h rename to jdk/src/jdk.pack200/share/native/common-unpack/unpack.h diff --git a/jdk/src/jdk.runtime/share/native/common-unpack/utils.cpp b/jdk/src/jdk.pack200/share/native/common-unpack/utils.cpp similarity index 100% rename from jdk/src/jdk.runtime/share/native/common-unpack/utils.cpp rename to jdk/src/jdk.pack200/share/native/common-unpack/utils.cpp diff --git a/jdk/src/jdk.runtime/share/native/common-unpack/utils.h b/jdk/src/jdk.pack200/share/native/common-unpack/utils.h similarity index 100% rename from jdk/src/jdk.runtime/share/native/common-unpack/utils.h rename to jdk/src/jdk.pack200/share/native/common-unpack/utils.h diff --git a/jdk/src/jdk.runtime/share/native/common-unpack/zip.cpp b/jdk/src/jdk.pack200/share/native/common-unpack/zip.cpp similarity index 100% rename from jdk/src/jdk.runtime/share/native/common-unpack/zip.cpp rename to jdk/src/jdk.pack200/share/native/common-unpack/zip.cpp diff --git a/jdk/src/jdk.runtime/share/native/common-unpack/zip.h b/jdk/src/jdk.pack200/share/native/common-unpack/zip.h similarity index 100% rename from jdk/src/jdk.runtime/share/native/common-unpack/zip.h rename to jdk/src/jdk.pack200/share/native/common-unpack/zip.h diff --git a/jdk/src/jdk.runtime/share/native/libunpack/jni.cpp b/jdk/src/jdk.pack200/share/native/libunpack/jni.cpp similarity index 100% rename from jdk/src/jdk.runtime/share/native/libunpack/jni.cpp rename to jdk/src/jdk.pack200/share/native/libunpack/jni.cpp diff --git a/jdk/src/jdk.runtime/share/native/unpack200/main.cpp b/jdk/src/jdk.pack200/share/native/unpack200/main.cpp similarity index 100% rename from jdk/src/jdk.runtime/share/native/unpack200/main.cpp rename to jdk/src/jdk.pack200/share/native/unpack200/main.cpp diff --git a/jdk/src/jdk.runtime/windows/native/unpack200/unpack200_proto.exe.manifest b/jdk/src/jdk.pack200/windows/native/unpack200/unpack200_proto.exe.manifest similarity index 100% rename from jdk/src/jdk.runtime/windows/native/unpack200/unpack200_proto.exe.manifest rename to jdk/src/jdk.pack200/windows/native/unpack200/unpack200_proto.exe.manifest