6911737: Module build: generate modules with native libraries and any other files not in jar
Summary: create modules under OUTPUTDIR/modules directory containing resources, native libraries
Reviewed-by: alanb, ohair
--- a/jdk/make/com/sun/crypto/provider/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/com/sun/crypto/provider/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -249,7 +249,7 @@
else
$(JAR_DESTFILE): $(SIGNED_DIR)/sunjce_provider.jar
endif
- $(install-file)
+ $(install-non-module-file)
ifndef OPENJDK
install-prebuilt:
--- a/jdk/make/com/sun/java/pack/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/com/sun/java/pack/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -28,6 +28,7 @@
#
BUILDDIR = ../../../..
+MODULE = pack200
PACKAGE = com.sun.java.util.jar.pack
LIBRARY = unpack
PRODUCT = sun
@@ -123,11 +124,14 @@
all: build
-build: prop
+build: prop pack200-tool
prop:
$(MAKE) -C prop
+pack200-tool:
+ $(call make-launcher, pack200, com.sun.java.util.jar.pack.Driver, , --pack)
+
unpacker:
$(MAKE) $(UNPACK_EXE) STANDALONE=true LDMAPFLAGS_OPT= LDMAPFLAGS_DBG=
@@ -151,6 +155,7 @@
$(MT) /manifest $(TEMPDIR)/unpack200$(EXE_SUFFIX).manifest /outputresource:$(TEMPDIR)/unpack200$(EXE_SUFFIX);#1
endif
$(CP) $(TEMPDIR)/unpack200$(EXE_SUFFIX) $(UNPACK_EXE)
+ $(install-module-file)
ifeq ($(PLATFORM), windows)
$(RES):: $(VERSIONINFO_RESOURCE)
--- a/jdk/make/com/sun/java/pack/prop/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/com/sun/java/pack/prop/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -29,6 +29,7 @@
# to a collision of rules with Classes.gmk and Library.gmk
BUILDDIR = ../../../../..
+MODULE = pack200
PACKAGE = com.sun.java.util.jar.pack
PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk
--- a/jdk/make/com/sun/jndi/cosnaming/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/com/sun/jndi/cosnaming/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -28,6 +28,7 @@
#
BUILDDIR = ../../../..
+MODULE = jndi-cosnaming
PACKAGE = com.sun.jndi.cosnaming
PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk
--- a/jdk/make/com/sun/jndi/dns/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/com/sun/jndi/dns/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -28,6 +28,7 @@
#
BUILDDIR = ../../../..
+MODULE = jndi-dns
PACKAGE = com.sun.jndi.dns
PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk
--- a/jdk/make/com/sun/jndi/ldap/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/com/sun/jndi/ldap/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -28,6 +28,7 @@
#
BUILDDIR = ../../../..
+MODULE = jndi-ldap
PACKAGE = com.sun.jndi.ldap
PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk
--- a/jdk/make/com/sun/jndi/rmi/registry/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/com/sun/jndi/rmi/registry/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -28,6 +28,7 @@
#
BUILDDIR = ../../../../..
+MODULE = jndi-rmiregistry
PACKAGE = com.sun.jndi.rmi.registry
PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk
--- a/jdk/make/com/sun/nio/sctp/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/com/sun/nio/sctp/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -28,6 +28,7 @@
#
BUILDDIR = ../../../..
+MODULE = sctp
PACKAGE = com.sun.nio.sctp
LIBRARY = sctp
PRODUCT = sun
--- a/jdk/make/com/sun/org/apache/xml/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/com/sun/org/apache/xml/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -28,6 +28,7 @@
#
BUILDDIR = ../../../../..
+MODULE = security-xmldsig
PACKAGE = com.sun.org.apache.xml
PRODUCT = xml
include $(BUILDDIR)/common/Defs.gmk
--- a/jdk/make/com/sun/rowset/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/com/sun/rowset/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -28,6 +28,7 @@
#
BUILDDIR = ../../..
+MODULE = jdbc-enterprise
PACKAGE = com.sun.rowset
PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk
--- a/jdk/make/com/sun/script/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/com/sun/script/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -25,6 +25,7 @@
BUILDDIR = ../../..
+MODULE = scripting-rhino
PACKAGE = com.sun.script
PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk
--- a/jdk/make/com/sun/security/auth/module/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/com/sun/security/auth/module/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -26,6 +26,7 @@
# Makefile for building auth modules.
BUILDDIR = ../../../../..
+MODULE = security-auth
PACKAGE = com.sun.security.auth.module
PRODUCT = sun
--- a/jdk/make/com/sun/servicetag/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/com/sun/servicetag/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -22,6 +22,7 @@
# have any questions.
BUILDDIR = ../../..
+MODULE = servicetag
PACKAGE = com.sun.servicetag
PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk
@@ -68,7 +69,7 @@
$(SERVICETAG_LIBDIR)/jdk_header.png: $(SHARE_SRC)/classes/com/sun/servicetag/resources/jdk_header.png
$(install-file)
- $(CHMOD) 444 $@
+ $(call chmod-file, 444)
install-servicetag-lib:
@$(RM) -rf $(SERVICETAG_LIBDIR)
--- a/jdk/make/com/sun/tools/attach/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/com/sun/tools/attach/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -25,6 +25,7 @@
BUILDDIR = ../../../..
+MODULE = attach
PACKAGE = com.sun.tools.attach
LIBRARY = attach
PRODUCT = sun
@@ -65,6 +66,7 @@
@$(MKDIR) -p $(@D)
@$(RM) $@
@$(CAT) $< | $(SED) -e "s/^#\[$(PLATFORM)\]//" > $@
+ @$(install-module-file)
.PHONY: copy-files
--- a/jdk/make/common/Defs.gmk Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/common/Defs.gmk Thu Jan 07 08:14:48 2010 -0800
@@ -225,12 +225,6 @@
endif
endif
- ifeq ($(PLATFORM), windows)
- FREETYPE_LIB = $(FREETYPE_LIB_PATH)/freetype.lib
- else
- FREETYPE_LIB = -L$(FREETYPE_LIB_PATH) -lfreetype
- endif
-
ifdef ALT_FREETYPE_HEADERS_PATH
FREETYPE_HEADERS_PATH = $(ALT_FREETYPE_HEADERS_PATH)
else
@@ -388,6 +382,14 @@
UNIQUE_LOCATION_STRING += /$(THREADDIR)
endif
+#
+# Build units may or may not define MODULE. Default to "other".
+#
+ifndef MODULE
+ MODULE = other
+endif
+override MODULE_DEST_DIR = $(OUTPUTDIR)/tmp/modules/$(MODULE)
+
# the use of += above makes a space separated list which we need to
# remove for filespecs.
#
@@ -498,6 +500,58 @@
include $(JDK_MAKE_SHARED_DIR)/Defs-java.gmk
#
+# Macros to find the module that $@ belongs to
+#
+
+UNIQUE_PATH_PATTERN = $(subst /,.,$(UNIQUE_PATH))
+MODULE_PATH_PATTERN = -e 's%.*\/classes\/%classes\/%' \
+ -e 's%.*\/$(UNIQUE_PATH_PATTERN)\/%classes\/%' \
+ -e 's%.*\/lib\/%lib\/%' \
+ -e 's%.*\/bin\/%bin\/%' \
+ -e 's%.*\/include\/%include\/%' \
+ -e 's%.*\/demo\/%demo\/%' \
+ -e 's%.*\/sample\/%sample\/%'
+
+# Install a file to its module
+define install-module-file
+dest=`echo $(@D)/ | $(SED) $(MODULE_PATH_PATTERN)` ; \
+$(MKDIR) -p $(MODULE_DEST_DIR)/$$dest; \
+$(CP) $@ $(MODULE_DEST_DIR)/$$dest
+endef
+
+# Install all files from the directory to its module
+define install-module-dir
+dest=`echo $(@D)/ | $(SED) $(MODULE_PATH_PATTERN)` ; \
+$(MKDIR) -p $(MODULE_DEST_DIR)/$$dest; \
+$(CP) -rf $(@D)/* $(MODULE_DEST_DIR)/$$dest
+endef
+
+# chmod the file in its module
+define chmod-module-file
+dest=`echo $@ | $(SED) $(MODULE_PATH_PATTERN)` ; \
+$(CHMOD) $1 $(MODULE_DEST_DIR)/$$dest
+endef
+
+# install a sym link in its module
+define install-module-sym-link
+dest=`echo $@ | $(SED) $(MODULE_PATH_PATTERN)` ; \
+$(LN) -s $1 $(MODULE_DEST_DIR)/$$dest
+endef
+
+
+# Run MAKE $@ for a launcher:
+# $(call make-launcher, name, mainclass, java-args, main-args)
+define make-launcher
+$(CD) $(BUILDDIR)/launchers && \
+$(MAKE) -f Makefile.launcher \
+ MODULE=$(MODULE) \
+ PROGRAM=$(strip $1) \
+ MAIN_CLASS=$(strip $2) \
+ MAIN_JAVA_ARGS="$(strip $3)" \
+ MAIN_ARGS="$(strip $4)"
+endef
+
+#
# Convenient macros
#
@@ -511,6 +565,28 @@
define install-file
$(prep-target)
$(CP) $< $@
+$(install-module-file)
+endef
+
+define chmod-file
+$(CHMOD) $1 $@
+$(call chmod-module-file, $1)
+endef
+
+define install-sym-link
+$(LN) -s $1 $@
+$(call install-module-sym-link, $1)
+endef
+
+#
+# Marcos for files not belonging to any module
+define install-non-module-file
+$(prep-target)
+$(CP) $< $@
+endef
+
+define install-manifest-file
+$(install-non-module-file)
endef
# Cleanup rule for after debug java run (hotspot.log file is left around)
@@ -712,7 +788,7 @@
endif
# Install of imported file (JDK_IMPORT_PATH, or some other external location)
-define install-import-file
+define install-importonly-file
@$(ECHO) "ASSEMBLY_IMPORT: $@"
$(prep-target)
$(CP) $< $@
@@ -730,4 +806,9 @@
fi
endef
+define install-import-file
+$(install-importonly-file)
+$(install-module-file)
+endef
+
.PHONY: all build clean clobber
--- a/jdk/make/common/Demo.gmk Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/common/Demo.gmk Thu Jan 07 08:14:48 2010 -0800
@@ -25,6 +25,8 @@
# JDK Demo building jar file.
+MODULE = demos
+
# Some names are defined with LIBRARY inside the Defs.gmk file
LIBRARY=$(DEMONAME)
OBJDIR=$(TEMPDIR)/$(DEMONAME)
--- a/jdk/make/common/Library.gmk Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/common/Library.gmk Thu Jan 07 08:14:48 2010 -0800
@@ -193,9 +193,18 @@
$(MT) /manifest $(OBJDIR)/$(@F).manifest /outputresource:$(OBJDIR)/$(@F);#2
endif
$(CP) $(OBJDIR)/$(@F) $@
+ $(install-module-file)
$(CP) $(OBJDIR)/$(LIBRARY).map $(@D)
$(CP) $(OBJDIR)/$(LIBRARY).pdb $(@D)
+$(ACTUAL_LIBRARY):: $(ACTUAL_LIBRARY_DIR)/$(LIBRARY).map $(ACTUAL_LIBRARY_DIR)/$(LIBRARY).pdb
+
+$(ACTUAL_LIBRARY_DIR)/%.map: FORCE
+ $(install-module-file)
+
+$(ACTUAL_LIBRARY_DIR)/%.pdb: FORCE
+ $(install-module-file)
+
endif # LIBRARY
$(OBJDIR)/$(LIBRARY).lcf: $(OBJDIR)/$(LIBRARY).res $(COMPILE_FILES_o) $(FILES_m)
@@ -250,6 +259,7 @@
$(AR) -r $@ $(FILES_o)
else # LIBRARY
$(LINKER) $(SHARED_LIBRARY_FLAG) -o $@ $(FILES_o) $(LDLIBS)
+ $(install-module-file)
ifeq ($(WRITE_LIBVERSION),true)
$(MCS) -d -a "$(FULL_VERSION)" $@
endif # WRITE_LIBVERSION
@@ -353,5 +363,7 @@
openjdk:
$(MAKE) OPENJDK=true build
+FORCE:
+
.PHONY: all build debug fastdebug
--- a/jdk/make/common/Modules.gmk Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/common/Modules.gmk Thu Jan 07 08:14:48 2010 -0800
@@ -34,12 +34,10 @@
#
# Open issues that need further investigation:
# 1. Classes in jre/lib/ext/dnsns.jar are currently put in jre/lib/jndi-dns
-# module.
+# module. META-INF/services file is not installed.
# 2. Signed jars
# For JDK build, signed jars are copied to the build.
# All jars in the module image are unsigned.
-# 3. jre/lib/security/US_export_policy.jar and local_policy.jar
-# are not included in the module image yet.
MODULE_IMAGEBINDIR = bin
@@ -63,7 +61,8 @@
@$(ECHO) ">>>Making "$@" @ `$(DATE)` ..."
# Order is important here, trim jre after jdk image is created
-modules:: sanity-module-images post-sanity-module-images \
+modules:: gen-modules \
+ sanity-module-images post-sanity-module-images \
$(INITIAL_MODULE_IMAGE_JRE) $(INITIAL_MODULE_IMAGE_JDK) \
trim-module-image-jre trim-module-image-jdk \
process-module-image-jre process-module-image-jdk
@@ -124,6 +123,33 @@
MODULES_TEMPDIR=$(ABS_TEMPDIR)/modules
MODULES_LIB = $(ABS_OUTPUTDIR)/modules
+MODULES_LIST = $(MODULES_TEMPDIR)/classlist/modules.list
+
+# Modules in the jre/lib/security directory
+POLICY_MODULES = US_export_policy local_policy
+
+# Modules in the modules/ext directory
+EXT_MODULES = localedata security-sunec security-sunjce
+
+# Build PKCS#11 on all platforms except 64-bit Windows.
+PKCS11 = security-sunpkcs11
+ifeq ($(ARCH_DATA_MODEL), 64)
+ ifeq ($(PLATFORM), windows)
+ PKCS11 =
+ endif
+endif
+
+EXT_MODULES += $(PKCS11)
+
+# Build Microsoft CryptoAPI provider only on (non-64-bit) Windows platform.
+ifeq ($(PLATFORM), windows)
+ ifneq ($(ARCH_DATA_MODEL), 64)
+ EXT_MODULES += security-sunmscapi
+ endif
+endif
+
+# Modules for JDK only
+JDK_MODULES = tools
gen-modules:
$(CD) modules; $(MAKE) all
@@ -151,7 +177,6 @@
# Construct an initial jre image (initial jdk jre) no trimming or stripping
initial-module-image-jre:: initial-module-image-jre-setup \
$(JRE_LICENSES) $(JRE_MODULE_DOCFILES) \
- gen-modules \
$(BUILDMETAINDEX_JARFILE)
@# Copy in bin directory
$(CD) $(OUTPUTDIR) && $(FIND) bin -depth | $(CPIO) -pdum $(JRE_MODULE_IMAGE_DIR)
@@ -162,7 +187,21 @@
@#
@# copy modules to jre/lib
@#
- $(CP) -rf $(MODULES_LIB)/jre/lib/* $(JRE_MODULE_IMAGE_DIR)/lib
+ for m in `$(NAWK) '{print $$1}' $(MODULES_LIST)` ; do \
+ $(CP) $(MODULES_LIB)/$$m/lib/$$m.jar $(JRE_MODULE_IMAGE_DIR)/lib ; \
+ done
+ $(MKDIR) -p $(JRE_MODULE_IMAGE_DIR)/lib/ext
+ for m in $(EXT_MODULES) ; do \
+ $(MV) $(JRE_MODULE_IMAGE_DIR)/lib/$$m.jar $(JRE_MODULE_IMAGE_DIR)/lib/ext ; \
+ done
+ for m in $(POLICY_MODULES) ; do \
+ $(MV) $(JRE_MODULE_IMAGE_DIR)/lib/$$m.jar $(JRE_MODULE_IMAGE_DIR)/lib/security; \
+ done
+ @# Remove jdk modules
+ for m in $(JDK_MODULES) ; do \
+ $(RM) $(JRE_MODULE_IMAGE_DIR)/lib/$$m.jar ; \
+ done
+
@# Make sure all directories are read/execute for everyone
$(CHMOD) a+rx `$(FIND) $(JRE_MODULE_IMAGE_DIR) -type d`
@# Remove some files from the jre area
@@ -304,7 +343,9 @@
@# copy jdk modules to jdk/lib
@#
$(MKDIR) -p $(JDK_MODULE_IMAGE_DIR)/lib
- $(CP) -rf $(MODULES_LIB)/lib/* $(JDK_MODULE_IMAGE_DIR)/lib
+ for m in $(JDK_MODULES) ; do \
+ $(CP) $(MODULES_LIB)/$$m/lib/$$m.jar $(JDK_MODULE_IMAGE_DIR)/lib ; \
+ done
ifeq ($(PLATFORM), windows)
@#
@# lib/
--- a/jdk/make/common/Program.gmk Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/common/Program.gmk Thu Jan 07 08:14:48 2010 -0800
@@ -50,8 +50,6 @@
ACTUAL_PROGRAM_DIR = $(BINDIR)
ACTUAL_PROGRAM = $(ACTUAL_PROGRAM_DIR)/$(ACTUAL_PROGRAM_NAME)
-JVMCFG = $(LIBDIR)/$(LIBARCH)/jvm.cfg
-
# Make sure the default rule is all
program_default_rule: all
@@ -116,7 +114,7 @@
ifeq ($(COMPILE_IT),true)
-$(ACTUAL_PROGRAM):: classes $(JVMCFG) $(INIT)
+$(ACTUAL_PROGRAM):: classes $(INIT)
#
# Windows only
@@ -190,12 +188,13 @@
@$(MKDIR) -p $(TEMPDIR)
$(LINK_PRE_CMD) $(CC) $(CC_OBJECT_OUTPUT_FLAG)$@ $(LDFLAGS) \
$(FILES_o) $(THREADLIBS) $(LDLIBS)
+ $(install-module-file)
endif # PLATFORM
else # COMPILE_IT
-$(ACTUAL_PROGRAM):: $(JVMCFG)
+$(ACTUAL_PROGRAM)::
# Copies in the file from the JDK_IMPORT_PATH area
$(ACTUAL_PROGRAM_DIR)/%: $(JDK_IMPORT_PATH)/jre/bin/%
@@ -272,18 +271,6 @@
$(VERSION_DEFINES) $<
#
-# How to install jvm.cfg.
-#
-ifeq ($(ZERO_BUILD), true)
-JVMCFG_ARCH = zero
-else
-JVMCFG_ARCH = $(ARCH)
-endif
-
-$(JVMCFG): $(LAUNCHER_PLATFORM_SRC)/bin/$(JVMCFG_ARCH)/jvm.cfg
- $(install-file)
-
-#
# Default dependencies
#
--- a/jdk/make/common/internal/BinaryPlugs.gmk Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/common/internal/BinaryPlugs.gmk Thu Jan 07 08:14:48 2010 -0800
@@ -116,7 +116,7 @@
define import-binary-plug-file
@$(ECHO) "PLUG IMPORT: $(@F)"
-$(install-file)
+$(install-non-module-file)
endef # import-binary-plug-file
# Import classes command
@@ -184,7 +184,7 @@
define export-binary-plug-file
@$(ECHO) "PLUG EXPORT: $(@F)"
-$(install-file)
+$(install-non-module-file)
endef # export-binary-plug-file
# OpenJDK Binary Plug License
--- a/jdk/make/common/internal/Resources.gmk Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/common/internal/Resources.gmk Thu Jan 07 08:14:48 2010 -0800
@@ -139,7 +139,7 @@
STRIP_PROP_options=$(TEMPDIR)/strip_prop_options
define install-properties-file
$(install-file)
-$(CHMOD) a+rw $@
+$(call chmod-file, a+rw)
@$(ECHO) "# Adding to strip properties list: $@"
$(ECHO) "$@" >> $(STRIP_PROP_options)
endef
--- a/jdk/make/common/shared/Sanity.gmk Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/common/shared/Sanity.gmk Thu Jan 07 08:14:48 2010 -0800
@@ -1117,7 +1117,7 @@
# be checked when this represents a full control build (i.e. the
# HOTSPOT_IMPORT_PATH includes these files in it's 'include' directory).
$(TEMPDIR)/%.h: $(SHARE_SRC)/javavm/export/%.h
- @$(install-file)
+ @$(install-non-module-file)
@$(RM) $@.IMPORT
@if [ -r $(HOTSPOT_IMPORT_PATH)/include/$(@F) ]; then \
$(CP) $(HOTSPOT_IMPORT_PATH)/include/$(@F) $@.IMPORT ; \
@@ -1131,7 +1131,7 @@
fi
$(TEMPDIR)/%.h: $(PLATFORM_SRC)/javavm/export/%.h
- @$(install-file)
+ @$(install-non-module-file)
@$(RM) $@.IMPORT
@if [ -r $(HOTSPOT_IMPORT_PATH)/include/$(PLATFORM_INCLUDE_NAME)/$(@F) ]; then \
$(CP) $(HOTSPOT_IMPORT_PATH)/include/$(PLATFORM_INCLUDE_NAME)/$(@F) $@.IMPORT ; \
--- a/jdk/make/java/awt/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/java/awt/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -24,6 +24,7 @@
#
BUILDDIR = ../..
+MODULE = awt
PACKAGE = java.awt
PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk
--- a/jdk/make/java/fdlibm/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/java/fdlibm/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -31,6 +31,7 @@
#
BUILDDIR = ../..
+MODULE = base
LIBRARY = fdlibm
PRODUCT = java
--- a/jdk/make/java/hpi/native/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/java/hpi/native/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -28,6 +28,7 @@
#
BUILDDIR = ../../..
+MODULE = base
LIBRARY = hpi
PRODUCT = java
THREADDIR = native_threads
--- a/jdk/make/java/hpi/windows/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/java/hpi/windows/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -26,8 +26,9 @@
#
# Makefile for Windows HPI DLL
#
-BUILDDIR = ../../..
-LIBRARY = hpi
+BUILDDIR = ../../..
+MODULE = base
+LIBRARY = hpi
PRODUCT = java
THREADDIR = windows_threads
LIB_LOCATION = $(BINDIR)
--- a/jdk/make/java/instrument/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/java/instrument/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -27,6 +27,7 @@
# agent, supporting java.lang.instrument
BUILDDIR = ../..
+MODULE = instrument
PACKAGE = sun.instrument
LIBRARY = instrument
PRODUCT = sun
--- a/jdk/make/java/java/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/java/java/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -29,6 +29,7 @@
#
BUILDDIR = ../..
+MODULE = base
PACKAGE = java.lang
LIBRARY = java
PRODUCT = java
@@ -241,7 +242,7 @@
$(GENSRCDIR)/java/lang/UNIXProcess.java: \
$(PLATFORM_SRC)/classes/java/lang/UNIXProcess.java.$(PLATFORM)
- $(install-file)
+ $(install-non-module-file)
clean::
$(RM) $(GENSRCDIR)/java/lang/UNIXProcess.java
@@ -285,7 +286,7 @@
$(TZMAP): $(TZMAPFILE)
$(install-file)
- $(CHMOD) 444 $@
+ $(call chmod-file, 444)
endif
build: $(LIBDIR)/$(PROPS) $(LIBDIR)/$(CAL_PROPS) $(TZMAP)
@@ -315,7 +316,8 @@
$(BOOT_JAVA_CMD) -jar $(GENERATECURRENCYDATA_JARFILE) -o $@.temp \
< $(SHARE_SRC)/classes/java/util/CurrencyData.properties
$(MV) $@.temp $@
- $(CHMOD) 444 $@
+ $(install-module-file)
+ $(call chmod-file, 444)
clean::
$(RM) $(CURDATA)
@@ -369,7 +371,7 @@
-usecharforbyte 11 4 1
$(GENSRCDIR)/java/lang/%.java : $(CHARACTERDATA)/%.java.template
- $(install-file)
+ $(install-non-module-file)
clean::
$(RM) $(GENSRCDIR)/java/lang/CharacterDataLatin1.java
--- a/jdk/make/java/java_crw_demo/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/java/java_crw_demo/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -24,6 +24,8 @@
#
BUILDDIR = ../..
+
+MODULE = demos
LIBRARY = java_crw_demo
PRODUCT = sun
LIBRARY_OUTPUT = java_crw_demo
--- a/jdk/make/java/java_hprof_demo/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/java/java_hprof_demo/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -24,6 +24,7 @@
#
BUILDDIR = ../..
+MODULE = instrument
LIBRARY = hprof
PRODUCT = sun
LIBRARY_OUTPUT = hprof_jvmti
--- a/jdk/make/java/jli/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/java/jli/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -30,6 +30,7 @@
# its manifestations (java, javaw, javac, ...).
#
BUILDDIR = ../..
+MODULE = base
LIBRARY = jli
PRODUCT = java
--- a/jdk/make/java/jvm/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/java/jvm/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -24,6 +24,8 @@
#
BUILDDIR = ../..
+MODULE = base
+
include $(BUILDDIR)/common/Defs.gmk
#
@@ -36,15 +38,29 @@
$(INCLUDEDIR)/classfile_constants.h
$(INCLUDEDIR)/%.h: $(SHARE_SRC)/javavm/export/%.h
- $(install-file)
+ $(install-non-module-file)
$(PLATFORM_INCLUDE)/%.h: $(PLATFORM_SRC)/javavm/export/%.h
+ $(install-non-module-file)
+
+JVMCFG = $(LIBDIR)/$(LIBARCH)/jvm.cfg
+
+#
+# How to install jvm.cfg.
+#
+ifeq ($(ZERO_BUILD), true)
+JVMCFG_ARCH = zero
+else
+JVMCFG_ARCH = $(ARCH)
+endif
+
+$(JVMCFG): $(PLATFORM_SRC)/bin/$(JVMCFG_ARCH)/jvm.cfg
$(install-file)
all: build
-build: $(FILES_h)
+build: $(FILES_h) $(JVMCFG)
clean clobber::
- $(RM) $(FILES_h)
+ $(RM) $(FILES_h) $(JVMCFG)
--- a/jdk/make/java/logging/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/java/logging/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -24,6 +24,7 @@
#
BUILDDIR = ../..
+MODULE = logging
PACKAGE = java.util.logging
PRODUCT = java
include $(BUILDDIR)/common/Defs.gmk
--- a/jdk/make/java/main/java/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/java/main/java/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -24,6 +24,7 @@
#
BUILDDIR = ../../..
+MODULE = base
PROGRAM = java
PRODUCT = java
--- a/jdk/make/java/main/javaw/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/java/main/javaw/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -28,6 +28,7 @@
#
BUILDDIR = ../../..
+MODULE = base
PROGRAM = javaw
PRODUCT = java
--- a/jdk/make/java/management/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/java/management/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -24,6 +24,7 @@
#
BUILDDIR = ../..
+MODULE = management
PACKAGE = java.lang.management
LIBRARY = management
PRODUCT = java
@@ -99,7 +100,7 @@
@$(java-vm-cleanup)
$(TEMPDIR)/manifest: $(MANIFEST)
- $(install-file)
+ $(install-manifest-file)
build: $(AGENTJAR)
--- a/jdk/make/java/net/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/java/net/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -24,6 +24,7 @@
#
BUILDDIR = ../..
+MODULE = base
PACKAGE = java.net
LIBRARY = net
PRODUCT = sun
@@ -111,8 +112,7 @@
MISC_FILES = $(LIBDIR) $(LIBDIR)/net.properties
$(LIBDIR)/net.properties: $(SHARE_SRC)/lib/net.properties
- @$(RM) $@
- $(CP) $< $@
+ $(install-file)
#
# SDP configuration template
--- a/jdk/make/java/nio/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/java/nio/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -28,6 +28,7 @@
#
BUILDDIR = ../..
+MODULE = nio
PACKAGE = java.nio
LIBRARY = nio
PRODUCT = java
@@ -816,7 +817,7 @@
$(NAWK) '/^.*Copyright.*Sun/ { print $$3 }')
$(TEMPDIR)/$(GENSOR_SRC) : $(GENSOR_SRC)
- $(install-file)
+ $(install-non-module-file)
$(GENSOR_EXE) : $(TEMPDIR)/$(GENSOR_SRC)
$(prep-target)
--- a/jdk/make/java/npt/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/java/npt/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -24,6 +24,9 @@
#
BUILDDIR = ../..
+
+# It's currently used by jpda and hprof. Put it in base module for now.
+MODULE = base
LIBRARY = npt
PRODUCT = sun
LIBRARY_OUTPUT = npt
--- a/jdk/make/java/redist/FILES.gmk Tue Jan 05 13:44:09 2010 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-#
-# Copyright 1998-2003 Sun Microsystems, Inc. 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. Sun designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-# CA 95054 USA or visit www.sun.com if you need additional information or
-# have any questions.
-#
-
-#
-# List of lucida font files that we redistribute.
-#
-
-SHARED_FONTFILES = \
- $(LIBDIR)/fonts/LucidaTypewriterRegular.ttf \
- $(LIBDIR)/fonts/LucidaTypewriterBold.ttf \
- $(LIBDIR)/fonts/LucidaBrightRegular.ttf \
- $(LIBDIR)/fonts/LucidaBrightDemiBold.ttf \
- $(LIBDIR)/fonts/LucidaBrightItalic.ttf \
- $(LIBDIR)/fonts/LucidaBrightDemiItalic.ttf \
- $(LIBDIR)/fonts/LucidaSansRegular.ttf \
- $(LIBDIR)/fonts/LucidaSansDemiBold.ttf \
-
-ifeq ($(PLATFORM), linux)
-
-# The oblique versions of the font are derived from the base versions
-# and since 2D can do this derivation on the fly at run time there is no
-# need to redistribute the fonts. An exception to this is on Linux.
-# The reason is that the Lucidas are specified in the font.properties files
-# on Linux, and so AWT/Motif components expect to be able to ask the Xserver
-# for these oblique fonts, but the Xserver cannot do the same derivation as
-# 2D can.
-
-OBLIQUE_FONTFILES = \
- $(LIBDIR)/oblique-fonts/LucidaTypewriterOblique.ttf \
- $(LIBDIR)/oblique-fonts/LucidaTypewriterBoldOblique.ttf \
- $(LIBDIR)/oblique-fonts/LucidaSansOblique.ttf \
- $(LIBDIR)/oblique-fonts/LucidaSansDemiOblique.ttf \
-
-endif
--- a/jdk/make/java/redist/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/java/redist/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -35,6 +35,7 @@
#
BUILDDIR = ../..
+MODULE = base
PRODUCT = java
include $(BUILDDIR)/common/Defs.gmk
@@ -61,7 +62,11 @@
# Needed to do file copy
ABS_BUILDDIR :=$(call FullPath,$(BUILDDIR))
-all: build
+SUBDIRS = fonts sajdi
+all clean clobber::
+ $(SUBDIRS-loop)
+
+all:: build
# List of files created here or coming from BUILDDIR area (this workspace)
INTERNAL_IMPORT_LIST = $(LIBDIR)/classlist
@@ -70,30 +75,6 @@
IMPORT_LIST = $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVM_NAME) \
$(LIB_LOCATION)/$(SERVER_LOCATION)/Xusage.txt
-# INCLUDE_SA is false on platforms where SA is not supported.
-# On platforms where it is supported, we want to allow it to
-# not be present, at least temporarily. So,
-# if the SA files (well, just sa-jdi.jar) do not exist
-# in the HOTSPOT_IMPORT_PATH, then we won't build SA.
-SA_EXISTS := $(shell if [ -r $(HOTSPOT_IMPORT_PATH)/lib/sa-jdi.jar ] ; then \
- $(ECHO) true; \
- else \
- $(ECHO) false; \
- fi)
-
-ifeq ($(SA_EXISTS), false)
- INCLUDE_SA := false
-endif
-
-ifeq ($(INCLUDE_SA), true)
- IMPORT_LIST += $(LIBDIR)/sa-jdi.jar \
- $(LIB_LOCATION)/$(SALIB_NAME)
- ifeq ($(PLATFORM), windows)
- IMPORT_LIST += $(LIB_LOCATION)/$(SAMAP_NAME) \
- $(LIB_LOCATION)/$(SAPDB_NAME)
- endif
-endif # INCLUDE_SA
-
# Hotspot client is only available on 32-bit non-Zero builds
ifneq ($(ZERO_BUILD), true)
ifeq ($(ARCH_DATA_MODEL), 32)
@@ -110,10 +91,10 @@
# NOTE: These might actually come from BUILDDIR, depends on the settings.
$(BINDIR)/msvcrt.dll: $(MSVCRT_DLL_PATH)/msvcrt.dll
$(install-import-file)
- $(CHMOD) a+x $@
+ $(call chmod-file, a+x)
$(BINDIR)/$(MSVCRNN_DLL): $(MSVCRNN_DLL_PATH)/$(MSVCRNN_DLL)
$(install-import-file)
- $(CHMOD) a+x $@
+ $(call chmod-file, a+x)
# Get the hotspot .map and .pdb files for client and server
IMPORT_LIST += \
@@ -140,26 +121,32 @@
$(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMMAP_NAME):
@$(prep-target)
-$(CP) $(HOTSPOT_CLIENT_PATH)/$(JVMMAP_NAME) $@
+ @$(install-module-file)
$(LIB_LOCATION)/$(KERNEL_LOCATION)/$(JVMMAP_NAME):
@$(prep-target)
-$(CP) $(HOTSPOT_KERNEL_PATH)/$(JVMMAP_NAME) $@
+ @$(install-module-file)
$(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMMAP_NAME):
@$(prep-target)
-$(CP) $(HOTSPOT_SERVER_PATH)/$(JVMMAP_NAME) $@
+ @$(install-module-file)
$(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMPDB_NAME):
@$(prep-target)
-$(CP) $(HOTSPOT_CLIENT_PATH)/$(JVMPDB_NAME) $@
+ @$(install-module-file)
$(LIB_LOCATION)/$(KERNEL_LOCATION)/$(JVMPDB_NAME):
@$(prep-target)
-$(CP) $(HOTSPOT_KERNEL_PATH)/$(JVMPDB_NAME) $@
+ @$(install-module-file)
$(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMPDB_NAME):
@$(prep-target)
-$(CP) $(HOTSPOT_SERVER_PATH)/$(JVMPDB_NAME) $@
+ @$(install-module-file)
# Windows ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Windows
else # PLATFORM
@@ -220,7 +207,7 @@
$(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_NAME) \
$(LIB_LOCATION)/$(SERVER_LOCATION)/$(LIBJSIG_NAME):
@$(prep-target)
- $(LN) -s ../$(LIBJSIG_NAME) $@
+ $(call install-sym-link, ../$(LIBJSIG_NAME))
$(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMDB_NAME): $(HOTSPOT_CLIENT_PATH)/$(JVMDB_NAME)
$(install-import-file)
@@ -246,28 +233,6 @@
$(LIB_LOCATION)/$(KERNEL_LOCATION)/Xusage.txt : $(HOTSPOT_KERNEL_PATH)/Xusage.txt
$(install-file)
-ifeq ($(INCLUDE_SA), true)
-# The Serviceability Agent is built in the Hotspot workspace.
-# It contains two files:
-# - sa-jdi.jar: This goes into the same dir as tools.jar.
-# - a shared library: sawindbg.dll on windows / libproc.sa on unix
-# This goes into the same dir as the other
-# shared libs, eg. libjdwp.so.
-$(LIBDIR)/sa-jdi.jar: $(HOTSPOT_IMPORT_PATH)/lib/sa-jdi.jar
- $(install-import-file)
-
-$(LIB_LOCATION)/$(SALIB_NAME): $(HOTSPOT_SALIB_PATH)/$(SALIB_NAME)
- $(install-import-file)
-
-ifeq ($(PLATFORM), windows)
-$(LIB_LOCATION)/$(SAPDB_NAME): $(HOTSPOT_SALIB_PATH)/$(SAPDB_NAME)
- $(install-import-file)
-
-$(LIB_LOCATION)/$(SAMAP_NAME): $(HOTSPOT_SALIB_PATH)/$(SAMAP_NAME)
- $(install-import-file)
-endif # windows
-endif # INCLUDE_SA
-
#
# Specific to OpenJDK building
#
@@ -288,7 +253,7 @@
$(LIBDIR)/jce.jar: \
$(BUILDDIR)/closed/tools/crypto/jce/jce.jar
- $(install-file)
+ $(install-non-module-file)
$(LIBDIR)/security/US_export_policy.jar: \
$(BUILDDIR)/closed/tools/crypto/jce/US_export_policy.jar
$(install-file)
@@ -310,46 +275,6 @@
$(CLASSSHARINGDATA_DIR)/classlist.$(PLATFORM) $@.temp
$(MV) $@.temp $@
-ifndef OPENJDK
-
-# Lucida font files are not included in the OpenJDK distribution.
-# Get names of font files
-include FILES.gmk
-
-# Copy font files into OUTPUTDIR area
-
-FONTFILES = $(SHARED_FONTFILES)
-FONTSDIR = $(LIBDIR)/fonts
-FONTSDIRFILE = $(FONTSDIR)/fonts.dir
-INTERNAL_IMPORT_LIST += $(FONTFILES)
-
-ifneq ($(PLATFORM), windows)
- INTERNAL_IMPORT_LIST += $(FONTSDIRFILE)
-endif
-
-$(LIBDIR)/fonts/%.ttf: $(CLOSED_SRC)/share/lib/fonts/%.ttf
- $(install-file)
-
-$(FONTSDIRFILE): $(PLATFORM_SRC)/classes/sun/awt/motif/java.fonts.dir
- $(install-file)
-
-ifeq ($(PLATFORM), linux)
-
-# The oblique fonts are only needed/wanted on Linux.
-
-OBLFONTSDIR = $(LIBDIR)/oblique-fonts
-OBLFONTSDIRFILE = $(OBLFONTSDIR)/fonts.dir
-INTERNAL_IMPORT_LIST += $(OBLIQUE_FONTFILES) $(OBLFONTSDIRFILE)
-
-$(LIBDIR)/oblique-fonts/%.ttf: $(CLOSED_SRC)/share/lib/fonts/oblique/%.ttf
- $(install-file)
-
-$(OBLFONTSDIRFILE): $(PLATFORM_SRC)/classes/sun/awt/motif/java.oblique-fonts.dir
- $(install-file)
-
-endif # linux
-endif # !OPENJDK
-
# Import internal files (ones that are stashed in this source tree)
import_internal_files : $(INTERNAL_IMPORT_LIST)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/make/java/redist/fonts/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -0,0 +1,111 @@
+#
+# Copyright 2009 Sun Microsystems, Inc. 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. Sun designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+#
+
+BUILDDIR = ../../..
+MODULE = font
+PRODUCT = java
+include $(BUILDDIR)/common/Defs.gmk
+
+
+#
+# List of lucida font files that we redistribute.
+#
+
+SHARED_FONTFILES = \
+ $(LIBDIR)/fonts/LucidaTypewriterRegular.ttf \
+ $(LIBDIR)/fonts/LucidaTypewriterBold.ttf \
+ $(LIBDIR)/fonts/LucidaBrightRegular.ttf \
+ $(LIBDIR)/fonts/LucidaBrightDemiBold.ttf \
+ $(LIBDIR)/fonts/LucidaBrightItalic.ttf \
+ $(LIBDIR)/fonts/LucidaBrightDemiItalic.ttf \
+ $(LIBDIR)/fonts/LucidaSansRegular.ttf \
+ $(LIBDIR)/fonts/LucidaSansDemiBold.ttf \
+
+ifeq ($(PLATFORM), linux)
+
+# The oblique versions of the font are derived from the base versions
+# and since 2D can do this derivation on the fly at run time there is no
+# need to redistribute the fonts. An exception to this is on Linux.
+# The reason is that the Lucidas are specified in the font.properties files
+# on Linux, and so AWT/Motif components expect to be able to ask the Xserver
+# for these oblique fonts, but the Xserver cannot do the same derivation as
+# 2D can.
+
+OBLIQUE_FONTFILES = \
+ $(LIBDIR)/oblique-fonts/LucidaTypewriterOblique.ttf \
+ $(LIBDIR)/oblique-fonts/LucidaTypewriterBoldOblique.ttf \
+ $(LIBDIR)/oblique-fonts/LucidaSansOblique.ttf \
+ $(LIBDIR)/oblique-fonts/LucidaSansDemiOblique.ttf \
+
+endif
+
+ifndef OPENJDK
+
+# Lucida font files are not included in the OpenJDK distribution.
+# Get names of font files
+
+# Copy font files into OUTPUTDIR area
+
+FONTFILES = $(SHARED_FONTFILES)
+FONTSDIR = $(LIBDIR)/fonts
+FONTSDIRFILE = $(FONTSDIR)/fonts.dir
+INTERNAL_IMPORT_LIST = $(FONTFILES)
+
+ifneq ($(PLATFORM), windows)
+ INTERNAL_IMPORT_LIST += $(FONTSDIRFILE)
+endif
+
+$(LIBDIR)/fonts/%.ttf: $(CLOSED_SRC)/share/lib/fonts/%.ttf
+ $(install-file)
+
+$(FONTSDIRFILE): $(PLATFORM_SRC)/classes/sun/awt/motif/java.fonts.dir
+ $(install-file)
+
+ifeq ($(PLATFORM), linux)
+
+# The oblique fonts are only needed/wanted on Linux.
+
+OBLFONTSDIR = $(LIBDIR)/oblique-fonts
+OBLFONTSDIRFILE = $(OBLFONTSDIR)/fonts.dir
+INTERNAL_IMPORT_LIST += $(OBLIQUE_FONTFILES) $(OBLFONTSDIRFILE)
+
+$(LIBDIR)/oblique-fonts/%.ttf: $(CLOSED_SRC)/share/lib/fonts/oblique/%.ttf
+ $(install-file)
+
+$(OBLFONTSDIRFILE): $(PLATFORM_SRC)/classes/sun/awt/motif/java.oblique-fonts.dir
+ $(install-file)
+
+endif # linux
+
+all build : $(INTERNAL_IMPORT_LIST)
+
+clean clobber::
+ $(RM) $(INTERNAL_IMPORT_LIST)
+
+else
+
+all build clean clobber :
+
+endif # !OPENJDK
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/make/java/redist/sajdi/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -0,0 +1,87 @@
+#
+# Copyright 1997-2009 Sun Microsystems, Inc. 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. Sun designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+#
+
+BUILDDIR = ../../..
+MODULE = sajdi
+PRODUCT = java
+include $(BUILDDIR)/common/Defs.gmk
+
+ifeq ($(PLATFORM), windows)
+ LIB_LOCATION = $(BINDIR)
+else
+ LIB_LOCATION = $(LIBDIR)/$(LIBARCH)
+endif
+
+# INCLUDE_SA is false on platforms where SA is not supported.
+# On platforms where it is supported, we want to allow it to
+# not be present, at least temporarily. So,
+# if the SA files (well, just sa-jdi.jar) do not exist
+# in the HOTSPOT_IMPORT_PATH, then we won't build SA.
+SA_EXISTS := $(shell if [ -r $(HOTSPOT_IMPORT_PATH)/lib/sa-jdi.jar ] ; then \
+ $(ECHO) true; \
+ else \
+ $(ECHO) false; \
+ fi)
+
+ifeq ($(SA_EXISTS), false)
+ INCLUDE_SA := false
+endif
+
+IMPORT_LIST =
+ifeq ($(INCLUDE_SA), true)
+ IMPORT_LIST += $(LIBDIR)/sa-jdi.jar \
+ $(LIB_LOCATION)/$(SALIB_NAME)
+ ifeq ($(PLATFORM), windows)
+ IMPORT_LIST += $(LIB_LOCATION)/$(SAMAP_NAME) \
+ $(LIB_LOCATION)/$(SAPDB_NAME)
+ endif
+endif # INCLUDE_SA
+
+
+ifeq ($(INCLUDE_SA), true)
+# The Serviceability Agent is built in the Hotspot workspace.
+# It contains two files:
+# - sa-jdi.jar: This goes into the same dir as tools.jar.
+# - a shared library: sawindbg.dll on windows / libproc.sa on unix
+# This goes into the same dir as the other
+# shared libs, eg. libjdwp.so.
+$(LIBDIR)/sa-jdi.jar: $(HOTSPOT_IMPORT_PATH)/lib/sa-jdi.jar
+ $(install-importonly-file)
+
+$(LIB_LOCATION)/$(SALIB_NAME): $(HOTSPOT_SALIB_PATH)/$(SALIB_NAME)
+ $(install-import-file)
+
+ifeq ($(PLATFORM), windows)
+$(LIB_LOCATION)/$(SAPDB_NAME): $(HOTSPOT_SALIB_PATH)/$(SAPDB_NAME)
+ $(install-import-file)
+
+$(LIB_LOCATION)/$(SAMAP_NAME): $(HOTSPOT_SALIB_PATH)/$(SAMAP_NAME)
+ $(install-import-file)
+endif # windows
+endif # INCLUDE_SA
+
+all: $(IMPORT_LIST)
+
+clean clobber::
--- a/jdk/make/java/security/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/java/security/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -24,6 +24,7 @@
#
BUILDDIR = ../..
+MODULE = base
PACKAGE = java.security
PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk
@@ -38,11 +39,9 @@
#
PROPS_SRC = $(TOPDIR)/src/share/lib/security/java.security
-SUNPKCS11 =
ifeq ($(PLATFORM), solaris)
PROPS_SRC = $(TOPDIR)/src/share/lib/security/java.security-solaris
-SUNPKCS11 = sunpkcs11
else # PLATFORM
@@ -57,9 +56,6 @@
PROPS_BUILD = $(LIBDIR)/security/java.security
-SUNPKCS11_SRC = $(TOPDIR)/src/share/lib/security/sunpkcs11-solaris.cfg
-SUNPKCS11_BUILD = $(LIBDIR)/security/sunpkcs11-solaris.cfg
-
POLICY_SRC = $(TOPDIR)/src/share/lib/security/java.policy
POLICY_BUILD = $(LIBDIR)/security/java.policy
@@ -73,14 +69,12 @@
#
include $(BUILDDIR)/common/Rules.gmk
-build: properties $(SUNPKCS11) policy cacerts
+build: properties policy cacerts
install: all
properties: classes $(PROPS_BUILD)
-sunpkcs11: classes $(SUNPKCS11_BUILD)
-
policy: classes $(POLICY_BUILD)
cacerts: classes $(CACERTS_BUILD)
@@ -88,9 +82,6 @@
$(PROPS_BUILD): $(PROPS_SRC)
$(install-file)
-$(SUNPKCS11_BUILD): $(SUNPKCS11_SRC)
- $(install-file)
-
$(POLICY_BUILD): $(POLICY_SRC)
$(install-file)
@@ -99,7 +90,7 @@
clean clobber:: .delete.classlist
$(RM) -r $(CLASSBINDIR)/java/security
- $(RM) $(PROPS_BUILD) $(POLICY_BUILD) $(CACERTS_BUILD) $(SUNPKCS11_BUILD)
+ $(RM) $(PROPS_BUILD) $(POLICY_BUILD) $(CACERTS_BUILD)
# Additional Rule for building sun.security.util
$(CLASSBINDIR)/%.class: $(SHARE_SRC)/sun/%.java
--- a/jdk/make/java/sql/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/java/sql/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -28,6 +28,7 @@
#
BUILDDIR = ../..
+MODULE = jdbc-base
PACKAGE = java.sql
PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk
--- a/jdk/make/java/text/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/java/text/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -24,7 +24,7 @@
#
BUILDDIR = ../..
-
+MODULE = base
PACKAGE = java.text
PRODUCT = sun
--- a/jdk/make/java/verify/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/java/verify/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -28,6 +28,7 @@
#
BUILDDIR = ../..
+MODULE = base
PRODUCT = java
LIBRARY = verify
include $(BUILDDIR)/common/Defs.gmk
--- a/jdk/make/java/zip/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/java/zip/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -25,6 +25,7 @@
BUILDDIR = ../..
+MODULE = base
PACKAGE = java.util.zip
LIBRARY = zip
PRODUCT = sun
--- a/jdk/make/javax/crypto/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/javax/crypto/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -108,6 +108,7 @@
#
BUILDDIR = ../..
+MODULE = base
PACKAGE = javax.crypto
PRODUCT = sun
@@ -293,7 +294,7 @@
$(UNSIGNED_POLICY_BUILDDIR)/limited/US_export_policy.jar: \
$(UNSIGNED_POLICY_BUILDDIR)/unlimited/US_export_policy.jar
- $(install-file)
+ $(install-non-module-file)
$(UNSIGNED_POLICY_BUILDDIR)/limited/local_policy.jar: \
policy/limited/default_local.policy \
@@ -414,7 +415,7 @@
else
$(JAR_DESTFILE): $(SIGNED_DIR)/jce.jar
endif
- $(install-file)
+ $(install-non-module-file)
#
# Install the appropriate policy file, depending on the type of build.
@@ -425,7 +426,7 @@
INSTALL_POLICYDIR = $(SIGNED_POLICY_BUILDDIR)
endif
-install-limited: \
+install-limited-jars: \
$(INSTALL_POLICYDIR)/limited/US_export_policy.jar \
$(INSTALL_POLICYDIR)/limited/local_policy.jar
$(MKDIR) -p $(POLICY_DESTDIR)
@@ -433,24 +434,28 @@
$(POLICY_DESTDIR)/US_export_policy.jar \
$(POLICY_DESTDIR)/local_policy.jar
$(CP) $^ $(POLICY_DESTDIR)
+
+install-limited: install-limited-jars install-module-files
ifndef OPENJDK
$(release-warning)
endif
-install-unlimited: \
+install-unlimited-jars: \
$(INSTALL_POLICYDIR)/unlimited/US_export_policy.jar \
- $(INSTALL_POLICYDIR)/unlimited/local_policy.jar
+ $(INSTALL_POLICYDIR)/unlimited/local_policy.jar
$(MKDIR) -p $(POLICY_DESTDIR)
$(RM) \
$(POLICY_DESTDIR)/US_export_policy.jar \
$(POLICY_DESTDIR)/local_policy.jar
$(CP) $^ $(POLICY_DESTDIR)
+
+install-unlimited: install-unlimited-jars install-module-files
ifndef OPENJDK
$(release-warning)
endif
ifndef OPENJDK
-install-prebuilt:
+install-prebuilt-jars:
@$(ECHO) "\n>>>Installing prebuilt JCE framework..."
$(RM) $(JAR_DESTFILE) \
$(POLICY_DESTDIR)/US_export_policy.jar \
@@ -460,8 +465,16 @@
$(PREBUILT_DIR)/jce/US_export_policy.jar \
$(PREBUILT_DIR)/jce/local_policy.jar \
$(POLICY_DESTDIR)
+
+install-prebuilt: install-prebuilt-jars install-module-files
endif
+install-module-files: \
+ $(POLICY_DESTDIR)/US_export_policy.jar \
+ $(POLICY_DESTDIR)/local_policy.jar
+
+$(POLICY_DESTDIR)/%.jar :
+ $(install-module-file)
# =====================================================
# Support routines.
--- a/jdk/make/javax/imageio/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/javax/imageio/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -28,6 +28,7 @@
#
BUILDDIR = ../..
+MODULE = imageio
PACKAGE = javax.imageio
PRODUCT = jiio
include $(BUILDDIR)/common/Defs.gmk
--- a/jdk/make/javax/print/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/javax/print/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -28,6 +28,7 @@
#
BUILDDIR = ../..
+MODULE = print
PACKAGE = javax.print
PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk
--- a/jdk/make/javax/sound/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/javax/sound/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -26,6 +26,7 @@
# WARNING: Make sure the OPENJDK plugs are up-to-date, see make/common/internal/BinaryPlugs.gmk
BUILDDIR = ../..
+MODULE = sound
PACKAGE = javax.sound
LIBRARY = jsound
PRODUCT = sun
--- a/jdk/make/javax/sound/jsoundalsa/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/javax/sound/jsoundalsa/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -24,6 +24,7 @@
#
BUILDDIR = ../../..
+MODULE = sound
PACKAGE = javax.sound
LIBRARY = jsoundalsa
PRODUCT = sun
--- a/jdk/make/javax/sound/jsoundds/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/javax/sound/jsoundds/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -24,6 +24,7 @@
#
BUILDDIR = ../../..
+MODULE = sound
PACKAGE = javax.sound
LIBRARY = jsoundds
PRODUCT = sun
--- a/jdk/make/javax/sql/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/javax/sql/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -28,6 +28,7 @@
#
BUILDDIR = ../..
+MODULE = jdbc-enterprise
PACKAGE = javax.sql
PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk
--- a/jdk/make/javax/swing/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/javax/swing/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -24,6 +24,7 @@
#
BUILDDIR = ../..
+MODULE = swing
PACKAGE = javax.swing
PRODUCT = com
SWING_SRC = $(SHARE_SRC)/classes/javax/swing
--- a/jdk/make/javax/swing/plaf/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/javax/swing/plaf/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -24,6 +24,7 @@
#
BUILDDIR = ../../..
+MODULE = swing
PACKAGE = javax.swing.plaf
PRODUCT = com
SWING_SRC = $(SHARE_SRC)/classes/javax/swing
--- a/jdk/make/jpda/back/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/jpda/back/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -28,6 +28,7 @@
#
BUILDDIR = ../..
+MODULE = debugging
LIBRARY = jdwp
PRODUCT = jpda
--- a/jdk/make/jpda/transport/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/jpda/transport/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -28,6 +28,7 @@
#
BUILDDIR = ../..
+MODULE = debugging
PRODUCT = jpda
include $(BUILDDIR)/common/Defs.gmk
--- a/jdk/make/jpda/transport/shmem/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/jpda/transport/shmem/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -28,6 +28,7 @@
#
BUILDDIR = ../../..
+MODULE = debugging
LIBRARY = dt_shmem
PRODUCT = jbug
--- a/jdk/make/jpda/transport/socket/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/jpda/transport/socket/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -28,6 +28,7 @@
#
BUILDDIR = ../../..
+MODULE = debugging
LIBRARY = dt_socket
PRODUCT = jbug
--- a/jdk/make/jpda/tty/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/jpda/tty/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -28,6 +28,7 @@
#
BUILDDIR = ../..
+MODULE = jdb
PACKAGE = com.sun.tools.example.debug.tty
PRODUCT = jpda
PROGRAM = jdb
--- a/jdk/make/launchers/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/launchers/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -28,33 +28,23 @@
#
BUILDDIR = ..
+MODULE = tools
PACKAGE = launchers
PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk
-# Run MAKE $@ for a launcher:
+# Run MAKE $@ for a launcher for the corba module:
# $(call make-launcher, name, mainclass, java-args, main-args)
-define make-launcher
+define make-corba-launcher
+$(CD) $(BUILDDIR)/launchers && \
$(MAKE) -f Makefile.launcher \
- PROGRAM=$(strip $1) \
- MAIN_CLASS=$(strip $2) \
- MAIN_JAVA_ARGS="$(strip $3)" \
- MAIN_ARGS="$(strip $4)" $@
+ MODULE=corba \
+ PROGRAM=$(strip $1) \
+ MAIN_CLASS=$(strip $2) \
+ MAIN_JAVA_ARGS="$(strip $3)" \
+ MAIN_ARGS="$(strip $4)"
endef
-# Run MAKE $@ for all launchers
-ifeq ($(PLATFORM),windows)
-# Run MAKE $@ for all platform specific launchers
-define make-platform-specific-launchers
-$(call make-launcher, kinit, sun.security.krb5.internal.tools.Kinit, , )
-$(call make-launcher, klist, sun.security.krb5.internal.tools.Klist, , )
-$(call make-launcher, ktab, sun.security.krb5.internal.tools.Ktab, , )
-endef
-else
-# Run MAKE $@ for all platform specific launchers
-define make-platform-specific-launchers
-endef
-endif
# Run MAKE $@ for all generic launchers
define make-all-launchers
$(call make-launcher, appletviewer, sun.applet.Main, , )
@@ -85,36 +75,29 @@
-J-Dsun.jvm.hotspot.debugger.useWindbgDebugger, )
$(call make-launcher, jstat, sun.tools.jstat.Jstat, , )
$(call make-launcher, jstatd, sun.tools.jstatd.Jstatd, , )
-$(call make-launcher, keytool, sun.security.tools.KeyTool, , )
$(call make-launcher, native2ascii, sun.tools.native2ascii.Main, , )
-$(call make-launcher, orbd, com.sun.corba.se.impl.activation.ORBD, \
+$(call make-launcher, rmic, sun.rmi.rmic.Main, , )
+$(call make-launcher, schemagen, com.sun.tools.internal.jxc.SchemaGenerator, , )
+$(call make-launcher, serialver, sun.tools.serialver.SerialVer, , )
+$(call make-launcher, xjc, com.sun.tools.internal.xjc.Driver, , )
+$(call make-launcher, wsgen, com.sun.tools.internal.ws.WsGen, , )
+$(call make-launcher, wsimport, com.sun.tools.internal.ws.WsImport, , )
+$(call make-corba-launcher, orbd, com.sun.corba.se.impl.activation.ORBD, \
-J-Dcom.sun.CORBA.activation.DbDir=./orb.db \
-J-Dcom.sun.CORBA.activation.Port=1049 \
-J-Dcom.sun.CORBA.POA.ORBServerId=1, )
-$(call make-launcher, pack200, com.sun.java.util.jar.pack.Driver, , --pack)
-$(call make-launcher, policytool, sun.security.tools.PolicyTool, , )
-$(call make-launcher, rmic, sun.rmi.rmic.Main, , )
-$(call make-launcher, rmid, sun.rmi.server.Activation, , )
-$(call make-launcher, rmiregistry, sun.rmi.registry.RegistryImpl, , )
-$(call make-launcher, schemagen, com.sun.tools.internal.jxc.SchemaGenerator, , )
-$(call make-launcher, serialver, sun.tools.serialver.SerialVer, , )
-$(call make-launcher, servertool, com.sun.corba.se.impl.activation.ServerTool, , )
-$(call make-launcher, tnameserv, com.sun.corba.se.impl.naming.cosnaming.TransientNameServer, \
+$(call make-corba-launcher, servertool, com.sun.corba.se.impl.activation.ServerTool, , )
+$(call make-corba-launcher, tnameserv, com.sun.corba.se.impl.naming.cosnaming.TransientNameServer, \
-J-Dcom.sun.CORBA.activation.DbDir=./orb.db \
-J-Djava.util.logging.LoggingPermission=contol \
-J-Dcom.sun.CORBA.POA.ORBServerId=1, )
-$(call make-launcher, wsgen, com.sun.tools.internal.ws.WsGen, , )
-$(call make-launcher, wsimport, com.sun.tools.internal.ws.WsImport, , )
-$(call make-launcher, xjc, com.sun.tools.internal.xjc.Driver, , )
endef
build:
$(make-all-launchers)
- $(make-platform-specific-launchers)
clean clobber::
$(make-all-launchers)
- $(make-platform-specific-launchers)
include $(BUILDDIR)/common/Rules.gmk
--- a/jdk/make/mkdemo/jvmti/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/mkdemo/jvmti/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -28,6 +28,7 @@
#
BUILDDIR = ../..
+MODULE = demos
PRODUCT = demos
include $(BUILDDIR)/common/Defs.gmk
--- a/jdk/make/mkdemo/management/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/mkdemo/management/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -28,6 +28,7 @@
#
BUILDDIR = ../..
+MODULE = demos
PRODUCT = demos
include $(BUILDDIR)/common/Defs.gmk
--- a/jdk/make/mksample/dtrace/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/mksample/dtrace/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -29,6 +29,7 @@
BUILDDIR = ../..
+MODULE = samples
PRODUCT = java
include $(BUILDDIR)/common/Defs.gmk
--- a/jdk/make/mksample/jmx/jmx-scandir/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/mksample/jmx/jmx-scandir/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -29,6 +29,7 @@
BUILDDIR = ../../..
+MODULE = samples
PRODUCT = java
include $(BUILDDIR)/common/Defs.gmk
--- a/jdk/make/mksample/nbproject/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/mksample/nbproject/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -29,6 +29,7 @@
BUILDDIR = ../..
+MODULE = samples
PRODUCT = java
include $(BUILDDIR)/common/Defs.gmk
--- a/jdk/make/mksample/nio/file/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/mksample/nio/file/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -29,6 +29,7 @@
BUILDDIR = ../../..
+MODULE = samples
PRODUCT = java
include $(BUILDDIR)/common/Defs.gmk
--- a/jdk/make/mksample/nio/multicast/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/mksample/nio/multicast/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -29,6 +29,7 @@
BUILDDIR = ../../..
+MODULE = samples
PRODUCT = java
include $(BUILDDIR)/common/Defs.gmk
--- a/jdk/make/mksample/nio/server/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/mksample/nio/server/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -29,6 +29,7 @@
BUILDDIR = ../../..
+MODULE = samples
PRODUCT = java
include $(BUILDDIR)/common/Defs.gmk
--- a/jdk/make/mksample/scripting/scriptpad/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/mksample/scripting/scriptpad/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -29,6 +29,7 @@
BUILDDIR = ../../..
+MODULE = samples
PRODUCT = java
include $(BUILDDIR)/common/Defs.gmk
--- a/jdk/make/mksample/webservices/EbayClient/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/mksample/webservices/EbayClient/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -29,6 +29,7 @@
BUILDDIR = ../../..
+MODULE = samples
PRODUCT = java
include $(BUILDDIR)/common/Defs.gmk
--- a/jdk/make/mksample/webservices/EbayServer/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/mksample/webservices/EbayServer/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -29,6 +29,7 @@
BUILDDIR = ../../..
+MODULE = samples
PRODUCT = java
include $(BUILDDIR)/common/Defs.gmk
--- a/jdk/make/modules/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/modules/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -40,32 +40,7 @@
TMP=$(ABS_TEMPDIR)/modules
MODULE_CLASSLIST = $(TMP)/classlist
MODULE_CLASSES = $(TMP)/classes
-MODULE_LIST = $(MODULE_CLASSLIST)/modules.list
-
-# Modules in the modules/ext directory
-EXT_MODULES = localedata security-sunec security-sunjce
-
-# Build PKCS#11 on all platforms except 64-bit Windows.
-# We exclude windows-amd64 because we don't have any
-# 64-bit PKCS#11 implementations to test with on that platform.
-PKCS11 = security-sunpkcs11
-ifeq ($(ARCH_DATA_MODEL), 64)
- ifeq ($(PLATFORM), windows)
- PKCS11 =
- endif
-endif
-
-EXT_MODULES += $(PKCS11)
-
-# Build Microsoft CryptoAPI provider only on (non-64-bit) Windows platform.
-ifeq ($(PLATFORM), windows)
- ifneq ($(ARCH_DATA_MODEL), 64)
- EXT_MODULES += security-sunmscapi
- endif
-endif
-
-
-JDK_MODULES = tools
+MODULES_LIST = $(MODULE_CLASSLIST)/modules.list
SUBDIRS = tools
all build clean clobber::
@@ -76,7 +51,7 @@
$(CLASSANALYZER_JAR):
$(CD) tools && $(MAKE) all
-JAR_LIST := $(shell $(FIND) $(ABS_OUTPUTDIR)/lib -name \*.jar -depth)
+JAR_LIST := $(shell $(FIND) $(ABS_OUTPUTDIR)/lib -name \*.jar -print)
unpack-jars:
$(RM) -rf $(MODULE_CLASSES)
$(MKDIR) -p $(MODULE_CLASSES)
@@ -107,31 +82,29 @@
modularize: $(MODULE_JAR_MANIFEST_FILE)
@$(ECHO) ">>>Making "$@" @ `$(DATE)` ..."
@$(RM) -rf $(MODULE_LIB)
- @$(MKDIR) -p $(MODULE_LIB)/lib
- @$(MKDIR) -p $(MODULE_LIB)/jre/lib/ext
- @# create modules
- for m in `$(NAWK) '{print $$1}' $(MODULE_LIST)` ; do \
+ @# create jar file for modules and
+ @# copy other files from all members of this module
+ for m in `$(NAWK) '{print $$1}' $(MODULES_LIST)` ; do \
$(ECHO) "Creating module $$m" ; \
$(SED) -e 's%\\%\/%g' < $(MODULE_CLASSLIST)/$$m.classlist > $(TMP)/tmp.cf ; \
if [ -f $(MODULE_CLASSLIST)/$$m.resources ] ; then \
$(SED) -e 's%\\%\/%g' < $(MODULE_CLASSLIST)/$$m.resources >> $(TMP)/tmp.cf ; \
fi ; \
+ $(MKDIR) -p $(MODULE_LIB)/$$m/lib; \
$(CD) $(MODULE_CLASSES) && \
$(BOOT_JAR_CMD) c0mf $(MODULE_JAR_MANIFEST_FILE) \
- $(MODULE_LIB)/$$m.jar \
- @$(TMP)/tmp.cf \
- $(BOOT_JAR_JFLAGS) ; \
- done
+ $(MODULE_LIB)/$$m/lib/$$m.jar \
+ @$(TMP)/tmp.cf \
+ $(BOOT_JAR_JFLAGS); \
+ for s in `$(GREP) "^$$m" $(MODULES_LIST)` ; do \
+ if [ -d $(TMP)/$$s ] ; then \
+ $(CP) -rf $(TMP)/$$s/* $(MODULE_LIB)/$$m; \
+ $(RM) -rf $(MODULE_LIB)/$$m/classes; \
+ fi \
+ done \
+ done
@$(CD) $(MODULE_CLASSES) && $(java-vm-cleanup)
- @# move modules to lib, jre/lib, or jre/lib/ext
- for m in $(EXT_MODULES) ; do \
- $(MV) $(MODULE_LIB)/$$m.jar $(MODULE_LIB)/jre/lib/ext ; \
- done
- for m in $(JDK_MODULES) ; do \
- $(MV) $(MODULE_LIB)/$$m.jar $(MODULE_LIB)/lib ; \
- done
- $(MV) $(MODULE_LIB)/*.jar $(MODULE_LIB)/jre/lib
@$(ECHO) ">>>Finished making "$@" @ `$(DATE)` ..."
$(MODULE_JAR_MANIFEST_FILE):
@@ -140,6 +113,5 @@
clean clobber::
$(RM) -rf $(MODULE_CLASSLIST)
$(RM) -rf $(MODULE_LIB)
- $(RM) -f $(MODULE_JAR_MANIFEST_FILE)
- $(RM) -f $(CLASSANALYZER_JAR)
-
+ $(RM) $(MODULE_JAR_MANIFEST_FILE)
+ $(RM) $(CLASSANALYZER_JAR)
--- a/jdk/make/modules/modules.config Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/modules/modules.config Thu Jan 07 08:14:48 2010 -0800
@@ -372,15 +372,19 @@
/**************************************************************************/
+module tracing {
+ // tracing
+ include com.sun.tracing.**, sun.tracing.**;
+}
+
module instrument {
// java.lang.instrument
include java.lang.instrument.*, sun.instrument.*;
- // tracing
- include com.sun.tracing.**, sun.tracing.**;
-
// HPROF support
include com.sun.demo.jvmti.hprof.*;
+
+ include tracing;
}
/**************************************************************************/
@@ -391,15 +395,17 @@
sun.rmi.server.InactiveGroupException;
}
+module rmic {
+ // rmic is included in tools
+ include sun.rmi.rmic.**;
+}
+
module rmi {
include java.rmi.**, sun.rmi.**, com.sun.rmi.**;
// SSL factories are in rmi
include javax.rmi.ssl.**;
- // rmic is in tools
- exclude sun.rmi.rmic.**;
-
// supporting classes in sun.misc and dependencies
include sun.misc.GC;
}
@@ -468,9 +474,14 @@
include javax.smartcardio.**, sun.security.smartcardio.**;
}
+module security-auth {
+ include com.sun.security.auth.**, sun.security.util.AuthResources_*;
+}
+
module security-misc {
- include com.sun.security.auth.**, sun.security.util.AuthResources_*,
- sun.security.pkcs.*,
+ include security-auth;
+
+ include sun.security.pkcs.*,
sun.security.pkcs12.*;
// this class is a candidate to be removed.
@@ -500,9 +511,8 @@
}
module jndi-dns {
+ include net-dns;
include com.sun.jndi.dns.**, com.sun.jndi.url.dns.**;
- include sun.net.dns.**; // to access DNS config.
- include sun.net.spi.nameservice.dns.**; // for DNS-only name service.
}
module jndi-cosnaming {
@@ -677,31 +687,69 @@
/**************************************************************************/
-module client {
+module applet {
include java.applet.**,
- java.awt.**,
- javax.accessibility.*,
- javax.imageio.**,
- javax.print.**,
- javax.sound.**,
- javax.swing.**,
- sun.applet.**,
- sun.audio.**,
+ sun.applet.**;
+}
+
+module awt {
+ include java.awt.**,
sun.awt.**,
- sun.dc.**,
- sun.font.**,
+ com.sun.awt.**;
+}
+
+module font {
+ include sun.font.**;
+}
+
+module imageio {
+ include javax.imageio.**,
+ com.sun.imageio.**;
+}
+
+module java2d {
+ include sun.dc.**,
sun.java2d.**,
- sun.print.**,
+ com.sun.image.**;
+}
+
+module media {
+ include com.sun.media.**;
+}
+
+module print {
+ include javax.print.**,
+ sun.print.**;
+}
+
+module sound {
+ include javax.sound.**;
+}
+
+module swing {
+ include javax.swing.**,
sun.swing.**,
- com.sun.accessibility.**,
- com.sun.awt.**,
- com.sun.image.**,
- com.sun.imageio.**,
- com.sun.java.swing.*, // sajdi also contains classes in a subpackage;
- // so use '*' instead of '**'
+ // sajdi also contains classes in subpackages of com.sun.java.swing;
+ // so use '*' instead of '**'
+ com.sun.java.swing.*,
com.sun.java.swing.plaf.**,
- com.sun.media.**,
com.sun.swing.**;
+}
+
+module client {
+ include applet,
+ awt,
+ font,
+ imageio,
+ java2d,
+ media,
+ print,
+ sound,
+ swing;
+
+ include javax.accessibility.*,
+ sun.audio.**,
+ com.sun.accessibility.**;
// Bidi class in client module for now
include java.text.Bidi, sun.text.bidi.*;
@@ -723,7 +771,13 @@
/**************************************************************************/
+module jkernel {
+ include sun.jkernel.*;
+}
+
module deploy {
+ include jkernel;
+
// For now, all plugin and JNLP
include com.sun.java.browser.**,
netscape.**,
@@ -732,8 +786,7 @@
com.sun.deploy.**,
com.sun.javaws.**,
javax.jnlp.*,
- com.sun.jnlp.*,
- sun.jkernel.*;
+ com.sun.jnlp.*;
// Hook for http authentication
include sun.net.www.protocol.http.AuthCacheBridge;
@@ -741,6 +794,11 @@
/**************************************************************************/
+module net-dns {
+ include sun.net.dns.**; // to access DNS config.
+ include sun.net.spi.nameservice.dns.**; // for DNS-only name service.
+}
+
module net-compat {
// NTLM authentication support
include sun.net.www.protocol.http.ntlm.*;
@@ -824,6 +882,7 @@
debugging,
jaxws-tools,
jdb,
+ rmic,
sajdi;
// include gui-tools in tools module unless the tool binaries
@@ -834,8 +893,7 @@
com.sun.jarsigner.**,
com.sun.javac.**,
com.sun.javadoc.**, com.sun.source.**,
- sun.jvmstat.**,
- sun.rmi.rmic.**;
+ sun.jvmstat.**;
}
/**************************************************************************/
@@ -853,6 +911,19 @@
/**************************************************************************/
+// Workaround for US export and local policy files
+// They are currently in signed jars under the jre/lib/security directory
+module US_export_policy {
+ include default_US_export.policy;
+}
+
+module local_policy {
+ include default_local.policy,
+ exempt_local.policy;
+}
+
+/**************************************************************************/
+
module other {
include **;
}
--- a/jdk/make/modules/tools/nbproject/project.xml Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/modules/tools/nbproject/project.xml Thu Jan 07 08:14:48 2010 -0800
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2009 Sun Microsystems, Inc. All Rights Reserved.
@@ -28,8 +29,6 @@
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-->
-
-<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.java.j2seproject</type>
<configuration>
--- a/jdk/make/modules/tools/src/com/sun/classanalyzer/Module.java Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/modules/tools/src/com/sun/classanalyzer/Module.java Thu Jan 07 08:14:48 2010 -0800
@@ -444,8 +444,8 @@
}
void printClassListTo(String output) throws IOException {
- // no file created if the module doesn't have any class
- if (classes.isEmpty()) {
+ // no file created if the module doesn't have any class nor resource
+ if (isEmpty()) {
return;
}
@@ -482,7 +482,7 @@
void printDependenciesTo(String output, boolean showDynamic) throws IOException {
// no file created if the module doesn't have any class
- if (classes.isEmpty()) {
+ if (isEmpty()) {
return;
}
--- a/jdk/make/sun/applet/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/sun/applet/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -28,6 +28,7 @@
#
BUILDDIR = ../..
+MODULE = applet
PACKAGE = sun.applet
PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk
--- a/jdk/make/sun/awt/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/sun/awt/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -24,6 +24,7 @@
#
BUILDDIR = ../..
+MODULE = awt
PACKAGE = sun.awt
LIBRARY = awt
PRODUCT = sun
@@ -312,15 +313,15 @@
$(LIBDIR)/$(LIBARCH)/libxinerama.so: $(CLOSED_SRC)/solaris/lib/$(ARCH)/libxinerama.so
$(install-file)
- $(CHMOD) a+x $@
+ $(call chmod-file, a+x)
$(LIBDIR)/$(LIBARCH)/libjdgaSUNW%.so: $(CLOSED_SRC)/solaris/lib/$(ARCH)/libjdgaSUNW%.so
$(install-file)
- $(CHMOD) a+x $@
+ $(call chmod-file, a+x)
$(LIBDIR)/$(LIBARCH)/libjdgaSUNWafb.so: $(LIBDIR)/$(LIBARCH)/libjdgaSUNWffb.so
$(prep-target)
- $(LN) -s libjdgaSUNWffb.so $(LIBDIR)/$(LIBARCH)/libjdgaSUNWafb.so
+ $(call install-sym-link, libjdgaSUNWffb.so)
clean:: dgalib.clean
@@ -404,7 +405,8 @@
$(COMPILEFONTCONFIG_JARFILE)
$(prep-target)
$(BOOT_JAVA_CMD) -jar $(COMPILEFONTCONFIG_JARFILE) $< $@
- $(CHMOD) 444 $(@)
+ $(install-module-file)
+ $(call chmod-file, 444)
@$(java-vm-cleanup)
fontconfigs.clean :
--- a/jdk/make/sun/cmm/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/sun/cmm/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -24,6 +24,7 @@
#
BUILDDIR = ../..
+MODULE = java2d
PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk
@@ -45,34 +46,24 @@
$(ICCPROFILE_DEST_DIR)/LINEAR_RGB.pf
$(ICCPROFILE_DEST_DIR)/sRGB.pf: $(ICCPROFILE_SRC_DIR)/sRGB.pf
- $(RM) $(ICCPROFILE_DEST_DIR)/sRGB.pf
- -$(MKDIR) -p $(ICCPROFILE_DEST_DIR)
- $(CP) $(ICCPROFILE_SRC_DIR)/sRGB.pf $(ICCPROFILE_DEST_DIR)
- $(CHMOD) 444 $(ICCPROFILE_DEST_DIR)/sRGB.pf
+ $(install-file)
+ $(call chmod-file, 444)
$(ICCPROFILE_DEST_DIR)/GRAY.pf: $(ICCPROFILE_SRC_DIR)/GRAY.pf
- $(RM) $(ICCPROFILE_DEST_DIR)/GRAY.pf
- -$(MKDIR) -p $(ICCPROFILE_DEST_DIR)
- $(CP) $(ICCPROFILE_SRC_DIR)/GRAY.pf $(ICCPROFILE_DEST_DIR)
- $(CHMOD) 444 $(ICCPROFILE_DEST_DIR)/GRAY.pf
+ $(install-file)
+ $(call chmod-file, 444)
$(ICCPROFILE_DEST_DIR)/CIEXYZ.pf: $(ICCPROFILE_SRC_DIR)/CIEXYZ.pf
- $(RM) $(ICCPROFILE_DEST_DIR)/CIEXYZ.pf
- -$(MKDIR) -p $(ICCPROFILE_DEST_DIR)
- $(CP) $(ICCPROFILE_SRC_DIR)/CIEXYZ.pf $(ICCPROFILE_DEST_DIR)
- $(CHMOD) 444 $(ICCPROFILE_DEST_DIR)/CIEXYZ.pf
+ $(install-file)
+ $(call chmod-file, 444)
$(ICCPROFILE_DEST_DIR)/PYCC.pf: $(ICCPROFILE_SRC_DIR)/PYCC.pf
- $(RM) $(ICCPROFILE_DEST_DIR)/PYCC.pf
- -$(MKDIR) -p $(ICCPROFILE_DEST_DIR)
- $(CP) $(ICCPROFILE_SRC_DIR)/PYCC.pf $(ICCPROFILE_DEST_DIR)
- $(CHMOD) 444 $(ICCPROFILE_DEST_DIR)/PYCC.pf
+ $(install-file)
+ $(call chmod-file, 444)
$(ICCPROFILE_DEST_DIR)/LINEAR_RGB.pf: $(ICCPROFILE_SRC_DIR)/LINEAR_RGB.pf
- $(RM) $(ICCPROFILE_DEST_DIR)/LINEAR_RGB.pf
- -$(MKDIR) -p $(ICCPROFILE_DEST_DIR)
- $(CP) $(ICCPROFILE_SRC_DIR)/LINEAR_RGB.pf $(ICCPROFILE_DEST_DIR)
- $(CHMOD) 444 $(ICCPROFILE_DEST_DIR)/LINEAR_RGB.pf
+ $(install-file)
+ $(call chmod-file, 444)
iccprofiles.clean:
$(RM) -r $(ICCPROFILE_DEST_DIR)
--- a/jdk/make/sun/cmm/kcms/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/sun/cmm/kcms/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -24,6 +24,7 @@
#
BUILDDIR = ../../..
+MODULE = java2d
PACKAGE = sun.java2d.cmm.kcms
LIBRARY = kcms
PRODUCT = sun
--- a/jdk/make/sun/cmm/lcms/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/sun/cmm/lcms/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -24,6 +24,7 @@
#
BUILDDIR = ../../..
+MODULE = java2d
PACKAGE = sun.java2d.cmm.lcms
LIBRARY = lcms
PRODUCT = sun
--- a/jdk/make/sun/dcpr/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/sun/dcpr/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -26,6 +26,7 @@
# WARNING: Make sure the OPENJDK plugs are up-to-date, see make/common/internal/BinaryPlugs.gmk
BUILDDIR = ../..
+MODULE = java2d
PACKAGE = sun.dc
LIBRARY = dcpr
PRODUCT = sun
--- a/jdk/make/sun/font/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/sun/font/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -28,6 +28,7 @@
#
BUILDDIR = ../..
+MODULE = font
PACKAGE = sun.font
LIBRARY = fontmanager
PRODUCT = sun
@@ -121,16 +122,21 @@
#
#TODO: rework this to avoid hardcoding library name in the makefile
#
-library:: $(LIB_LOCATION)/$(LIB_PREFIX)freetype.$(LIBRARY_SUFFIX)
-
-$(LIB_LOCATION)/$(LIB_PREFIX)freetype.$(LIBRARY_SUFFIX):
ifeq ($(PLATFORM), windows)
- $(CP) $(FREETYPE_LIB_PATH)/$(LIB_PREFIX)freetype.$(LIBRARY_SUFFIX) $@
+ FREETYPE_LIB = $(LIB_LOCATION)/$(LIB_PREFIX)freetype.$(LIBRARY_SUFFIX)
+ OTHER_LDLIBS += $(FREETYPE_LIB_PATH)/freetype.lib
else
ifeq ($(USING_SYSTEM_FT_LIB), false)
- $(CP) $(FREETYPE_LIB_PATH)/$(LIB_PREFIX)freetype.$(LIBRARY_SUFFIX) $@.6
+ FREETYPE_LIB = $(LIB_LOCATION)/$(LIB_PREFIX)freetype.$(LIBRARY_SUFFIX).6
endif
+ OTHER_LDLIBS += -L$(FREETYPE_LIB_PATH) -lfreetype
endif
+
+library:: $(FREETYPE_LIB)
+
+$(FREETYPE_LIB):
+ $(CP) $(FREETYPE_LIB_PATH)/$(LIB_PREFIX)freetype.$(LIBRARY_SUFFIX) $@
+ $(install-module-file)
endif
#ifeq ($(PLATFORM), solaris)
@@ -158,7 +164,6 @@
CPPFLAGS += -I$(CLOSED_SRC)/share/native/$(PKGDIR)/t2k
else
CPPFLAGS += -I$(FREETYPE_HEADERS_PATH) -I$(FREETYPE_HEADERS_PATH)/freetype2
- OTHER_LDLIBS += $(FREETYPE_LIB)
endif
ifeq ($(PLATFORM), windows)
--- a/jdk/make/sun/font/t2k/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/sun/font/t2k/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -30,6 +30,7 @@
#
BUILDDIR = ../../..
+MODULE = font
PACKAGE = sun.font
LIBRARY = t2k
PRODUCT = sun
--- a/jdk/make/sun/headless/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/sun/headless/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -30,6 +30,7 @@
MOTIF_VERSION_STRING=none
LIB_LOCATION = $(LIBDIR)/$(LIBARCH)/headless
+MODULE = awt
PACKAGE = sun.awt
LIBRARY = mawt
LIBRARY_OUTPUT = headless
--- a/jdk/make/sun/image/generic/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/sun/image/generic/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -28,6 +28,7 @@
#
BUILDDIR = ../../..
+MODULE = media
PACKAGE = sun.awt.medialib
LIBRARY = mlib_image
PRODUCT = sun
--- a/jdk/make/sun/image/vis/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/sun/image/vis/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -27,6 +27,7 @@
# Makefile for building the VIS (solaris-only) version of medialib
#
BUILDDIR = ../../..
+MODULE = media
PACKAGE = sun.awt.medialib
LIBRARY = mlib_image_v
PRODUCT = sun
--- a/jdk/make/sun/jar/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/sun/jar/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -28,6 +28,7 @@
#
BUILDDIR = ../..
+MODULE = jar-tool
PACKAGE = sun.tools
PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk
--- a/jdk/make/sun/javazic/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/sun/javazic/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -27,6 +27,7 @@
BUILDDIR = ../..
+MODULE = base
PACKAGE = sun.javazic
PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk
@@ -69,6 +70,7 @@
$(RM) -r $(@D)
$(prep-target)
$(CP) -r $(WORKDIR)/* $(@D)
+ $(install-module-dir)
clean clobber::
$(RM) -r $(TEMPDIR) $(INSTALLDIR)
--- a/jdk/make/sun/jawt/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/sun/jawt/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -24,6 +24,7 @@
#
BUILDDIR = ../..
+MODULE = awt
PACKAGE = sun.awt
LIBRARY = jawt
PRODUCT = sun
--- a/jdk/make/sun/jconsole/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/sun/jconsole/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -28,6 +28,7 @@
#
BUILDDIR = ../..
+MODULE = jconsole
PACKAGE = sun.tools.jconsole
PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk
@@ -79,7 +80,7 @@
$(install-file)
$(TEMPDIR)/manifest: $(SHARE_SRC)/classes/$(PKGDIR)/manifest
- $(install-file)
+ $(install-manifest-file)
#
# Extra rule to build jconsole.jar
--- a/jdk/make/sun/jdbc/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/sun/jdbc/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -33,6 +33,7 @@
#
BUILDDIR = ../..
+MODULE = jdbc-odbc
PACKAGE = sun.jdbc.odbc
LIBRARY = JdbcOdbc
PRODUCT = sun
--- a/jdk/make/sun/jdga/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/sun/jdga/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -25,6 +25,7 @@
BUILDDIR = ../..
+MODULE = java2d
PACKAGE = sun.jdga
LIBRARY = sunwjdga
PRODUCT = sun
--- a/jdk/make/sun/jkernel/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/sun/jkernel/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -24,6 +24,7 @@
#
BUILDDIR = ../..
+MODULE = jkernel
PACKAGE = sun.jkernel
LIBRARY = jkernel
PRODUCT = sun
--- a/jdk/make/sun/jpeg/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/sun/jpeg/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -24,6 +24,7 @@
#
BUILDDIR = ../..
+MODULE = java2d
PACKAGE = sun.awt
LIBRARY = jpeg
PRODUCT = sun
--- a/jdk/make/sun/launcher/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/sun/launcher/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -24,6 +24,7 @@
#
BUILDDIR = ../..
+MODULE = base
PACKAGE = sun.launcher
PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk
--- a/jdk/make/sun/management/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/sun/management/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -28,6 +28,8 @@
#
BUILDDIR = ../..
+MODULE = management
+
include $(BUILDDIR)/common/Defs.gmk
MGMT_LIBDIR = $(LIBDIR)/management
@@ -56,17 +58,17 @@
$(MGMT_LIBDIR)/management.properties: $(MGMT_LIB_SRC)/management.properties
$(install-file)
- $(CHMOD) 644 $@
+ $(call chmod-file, 644)
$(MGMT_LIBDIR)/snmp.acl.template: $(MGMT_LIB_SRC)/snmp.acl.template
$(install-file)
- $(CHMOD) 444 $@
+ $(call chmod-file, 444)
$(MGMT_LIBDIR)/jmxremote.password.template: $(MGMT_LIB_SRC)/jmxremote.password.template
$(install-file)
- $(CHMOD) 444 $@
+ $(call chmod-file, 444)
$(MGMT_LIBDIR)/jmxremote.access: $(MGMT_LIB_SRC)/jmxremote.access
$(install-file)
- $(CHMOD) 644 $@
+ $(call chmod-file, 644)
--- a/jdk/make/sun/native2ascii/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/sun/native2ascii/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -28,6 +28,7 @@
#
BUILDDIR = ../..
+MODULE = tools
PACKAGE = sun.tools.native2ascii
PRODUCT = sun
OTHER_JAVACFLAGS += -Xlint:serial -Werror
--- a/jdk/make/sun/net/others/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/sun/net/others/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -24,6 +24,7 @@
#
BUILDDIR = ../../..
+MODULE = base
PACKAGE = sun.net
PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk
--- a/jdk/make/sun/net/spi/nameservice/dns/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/sun/net/spi/nameservice/dns/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -28,6 +28,9 @@
#
BUILDDIR = ../../../../..
+
+# dns should probably be its own module
+MODULE = net-dns
PACKAGE = sun.net.spi.nameservice.dns
PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk
--- a/jdk/make/sun/nio/FILES_java.gmk Tue Jan 05 13:44:09 2010 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,400 +0,0 @@
-#
-# Copyright 2005-2006 Sun Microsystems, Inc. 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. Sun designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-# CA 95054 USA or visit www.sun.com if you need additional information or
-# have any questions.
-#
-
-#
-# Character converters for lib/charsets.jar
-#
-# Core character converters are built from make/java/java.
-#
-
-FILES_src = \
- sun/io/ByteToCharDoubleByte.java \
- sun/io/ByteToCharDBCS_ASCII.java \
- sun/io/ByteToCharDBCS_EBCDIC.java \
- sun/io/ByteToCharEUC.java \
- sun/io/CharToByteDoubleByte.java \
- sun/io/CharToByteDBCS_ASCII.java \
- sun/io/CharToByteDBCS_EBCDIC.java \
- sun/io/CharToByteEUC.java \
- sun/io/ByteToCharBig5.java \
- sun/io/ByteToCharBig5_Solaris.java \
- sun/io/ByteToCharBig5_HKSCS.java \
- sun/io/ByteToCharMS950_HKSCS.java \
- sun/io/ByteToCharHKSCS.java \
- sun/io/ByteToCharHKSCS_2001.java \
- sun/io/ByteToCharGB18030.java \
- sun/io/ByteToCharGB18030DB.java \
- sun/io/ByteToCharCp037.java \
- sun/io/ByteToCharCp1006.java \
- sun/io/ByteToCharCp1025.java \
- sun/io/ByteToCharCp1026.java \
- sun/io/ByteToCharCp1046.java \
- sun/io/ByteToCharCp1047.java \
- sun/io/ByteToCharCp1097.java \
- sun/io/ByteToCharCp1098.java \
- sun/io/ByteToCharCp1112.java \
- sun/io/ByteToCharCp1122.java \
- sun/io/ByteToCharCp1123.java \
- sun/io/ByteToCharCp1124.java \
- sun/io/ByteToCharCp1140.java \
- sun/io/ByteToCharCp1141.java \
- sun/io/ByteToCharCp1142.java \
- sun/io/ByteToCharCp1143.java \
- sun/io/ByteToCharCp1144.java \
- sun/io/ByteToCharCp1145.java \
- sun/io/ByteToCharCp1146.java \
- sun/io/ByteToCharCp1147.java \
- sun/io/ByteToCharCp1148.java \
- sun/io/ByteToCharCp1149.java \
- sun/io/ByteToCharCp1255.java \
- sun/io/ByteToCharCp1256.java \
- sun/io/ByteToCharCp1258.java \
- sun/io/ByteToCharCp1381.java \
- sun/io/ByteToCharCp1383.java \
- sun/io/ByteToCharCp273.java \
- sun/io/ByteToCharCp277.java \
- sun/io/ByteToCharCp278.java \
- sun/io/ByteToCharCp280.java \
- sun/io/ByteToCharCp284.java \
- sun/io/ByteToCharCp285.java \
- sun/io/ByteToCharCp297.java \
- sun/io/ByteToCharCp33722.java \
- sun/io/ByteToCharCp420.java \
- sun/io/ByteToCharCp424.java \
- sun/io/ByteToCharCp437.java \
- sun/io/ByteToCharCp500.java \
- sun/io/ByteToCharCp737.java \
- sun/io/ByteToCharCp775.java \
- sun/io/ByteToCharCp834.java \
- sun/io/ByteToCharCp838.java \
- sun/io/ByteToCharCp850.java \
- sun/io/ByteToCharCp852.java \
- sun/io/ByteToCharCp855.java \
- sun/io/ByteToCharCp856.java \
- sun/io/ByteToCharCp857.java \
- sun/io/ByteToCharCp858.java \
- sun/io/ByteToCharCp860.java \
- sun/io/ByteToCharCp861.java \
- sun/io/ByteToCharCp862.java \
- sun/io/ByteToCharCp863.java \
- sun/io/ByteToCharCp864.java \
- sun/io/ByteToCharCp865.java \
- sun/io/ByteToCharCp866.java \
- sun/io/ByteToCharCp868.java \
- sun/io/ByteToCharCp869.java \
- sun/io/ByteToCharCp870.java \
- sun/io/ByteToCharCp871.java \
- sun/io/ByteToCharCp874.java \
- sun/io/ByteToCharCp875.java \
- sun/io/ByteToCharCp918.java \
- sun/io/ByteToCharCp921.java \
- sun/io/ByteToCharCp922.java \
- sun/io/ByteToCharCp930.java \
- sun/io/ByteToCharCp933.java \
- sun/io/ByteToCharCp935.java \
- sun/io/ByteToCharCp937.java \
- sun/io/ByteToCharCp939.java \
- sun/io/ByteToCharCp942.java \
- sun/io/ByteToCharCp942C.java \
- sun/io/ByteToCharCp943.java \
- sun/io/ByteToCharCp943C.java \
- sun/io/ByteToCharCp948.java \
- sun/io/ByteToCharCp949.java \
- sun/io/ByteToCharCp949C.java \
- sun/io/ByteToCharCp950.java \
- sun/io/ByteToCharCp964.java \
- sun/io/ByteToCharCp970.java \
- sun/io/ByteToCharJIS0201.java \
- sun/io/ByteToCharJIS0208.java \
- sun/io/ByteToCharJIS0208_Solaris.java \
- sun/io/ByteToCharJIS0212.java \
- sun/io/ByteToCharJIS0212_Solaris.java \
- sun/io/ByteToCharEUC_CN.java \
- sun/io/ByteToCharEUC_JP.java \
- sun/io/ByteToCharEUC_JP_LINUX.java \
- sun/io/ByteToCharEUC_JP_Solaris.java \
- sun/io/ByteToCharEUC_KR.java \
- sun/io/ByteToCharEUC_TW.java \
- sun/io/ByteToCharSJIS.java \
- sun/io/ByteToCharPCK.java \
- sun/io/ByteToCharGBK.java \
- sun/io/ByteToCharISCII91.java \
- sun/io/ByteToCharISO2022.java \
- sun/io/ByteToCharISO2022CN.java \
- sun/io/ByteToCharISO2022JP.java \
- sun/io/ByteToCharISO2022KR.java \
- sun/io/ByteToCharISO8859_3.java \
- sun/io/ByteToCharISO8859_6.java \
- sun/io/ByteToCharISO8859_8.java \
- sun/io/ByteToCharJISAutoDetect.java \
- sun/io/ByteToCharJohab.java \
- sun/io/ByteToCharMS874.java \
- sun/io/ByteToCharMS932.java \
- sun/io/ByteToCharMS936.java \
- sun/io/ByteToCharMS949.java \
- sun/io/ByteToCharMS950.java \
- sun/io/ByteToCharMacArabic.java \
- sun/io/ByteToCharMacCentralEurope.java \
- sun/io/ByteToCharMacCroatian.java \
- sun/io/ByteToCharMacCyrillic.java \
- sun/io/ByteToCharMacDingbat.java \
- sun/io/ByteToCharMacGreek.java \
- sun/io/ByteToCharMacHebrew.java \
- sun/io/ByteToCharMacIceland.java \
- sun/io/ByteToCharMacRoman.java \
- sun/io/ByteToCharMacRomania.java \
- sun/io/ByteToCharMacSymbol.java \
- sun/io/ByteToCharMacThai.java \
- sun/io/ByteToCharMacTurkish.java \
- sun/io/ByteToCharMacUkraine.java \
- sun/io/ByteToCharTIS620.java \
- sun/io/CharToByteBig5.java \
- sun/io/CharToByteBig5_Solaris.java \
- sun/io/CharToByteBig5_HKSCS.java \
- sun/io/CharToByteHKSCS.java \
- sun/io/CharToByteHKSCS_2001.java \
- sun/io/CharToByteMS950_HKSCS.java \
- sun/io/CharToByteGB18030.java \
- sun/io/CharToByteCp037.java \
- sun/io/CharToByteCp1006.java \
- sun/io/CharToByteCp1025.java \
- sun/io/CharToByteCp1026.java \
- sun/io/CharToByteCp1046.java \
- sun/io/CharToByteCp1047.java \
- sun/io/CharToByteCp1097.java \
- sun/io/CharToByteCp1098.java \
- sun/io/CharToByteCp1112.java \
- sun/io/CharToByteCp1122.java \
- sun/io/CharToByteCp1123.java \
- sun/io/CharToByteCp1124.java \
- sun/io/CharToByteCp1140.java \
- sun/io/CharToByteCp1141.java \
- sun/io/CharToByteCp1142.java \
- sun/io/CharToByteCp1143.java \
- sun/io/CharToByteCp1144.java \
- sun/io/CharToByteCp1145.java \
- sun/io/CharToByteCp1146.java \
- sun/io/CharToByteCp1147.java \
- sun/io/CharToByteCp1148.java \
- sun/io/CharToByteCp1149.java \
- sun/io/CharToByteCp1255.java \
- sun/io/CharToByteCp1256.java \
- sun/io/CharToByteCp1258.java \
- sun/io/CharToByteCp1381.java \
- sun/io/CharToByteCp1383.java \
- sun/io/CharToByteCp273.java \
- sun/io/CharToByteCp277.java \
- sun/io/CharToByteCp278.java \
- sun/io/CharToByteCp280.java \
- sun/io/CharToByteCp284.java \
- sun/io/CharToByteCp285.java \
- sun/io/CharToByteCp297.java \
- sun/io/CharToByteCp33722.java \
- sun/io/CharToByteCp420.java \
- sun/io/CharToByteCp424.java \
- sun/io/CharToByteCp437.java \
- sun/io/CharToByteCp500.java \
- sun/io/CharToByteCp737.java \
- sun/io/CharToByteCp775.java \
- sun/io/CharToByteCp834.java \
- sun/io/CharToByteCp838.java \
- sun/io/CharToByteCp850.java \
- sun/io/CharToByteCp852.java \
- sun/io/CharToByteCp855.java \
- sun/io/CharToByteCp856.java \
- sun/io/CharToByteCp857.java \
- sun/io/CharToByteCp858.java \
- sun/io/CharToByteCp860.java \
- sun/io/CharToByteCp861.java \
- sun/io/CharToByteCp862.java \
- sun/io/CharToByteCp863.java \
- sun/io/CharToByteCp864.java \
- sun/io/CharToByteCp865.java \
- sun/io/CharToByteCp866.java \
- sun/io/CharToByteCp868.java \
- sun/io/CharToByteCp869.java \
- sun/io/CharToByteCp870.java \
- sun/io/CharToByteCp871.java \
- sun/io/CharToByteCp874.java \
- sun/io/CharToByteCp875.java \
- sun/io/CharToByteCp918.java \
- sun/io/CharToByteCp921.java \
- sun/io/CharToByteCp922.java \
- sun/io/CharToByteCp930.java \
- sun/io/CharToByteCp933.java \
- sun/io/CharToByteCp935.java \
- sun/io/CharToByteCp937.java \
- sun/io/CharToByteCp939.java \
- sun/io/CharToByteCp942.java \
- sun/io/CharToByteCp942C.java \
- sun/io/CharToByteCp943.java \
- sun/io/CharToByteCp943C.java \
- sun/io/CharToByteCp948.java \
- sun/io/CharToByteCp949.java \
- sun/io/CharToByteCp949C.java \
- sun/io/CharToByteCp950.java \
- sun/io/CharToByteCp964.java \
- sun/io/CharToByteCp970.java \
- sun/io/CharToByteJIS0201.java \
- sun/io/CharToByteJIS0208.java \
- sun/io/CharToByteJIS0208_Solaris.java \
- sun/io/CharToByteJIS0212.java \
- sun/io/CharToByteJIS0212_Solaris.java \
- sun/io/CharToByteEUC_CN.java \
- sun/io/CharToByteEUC_JP.java \
- sun/io/CharToByteEUC_JP_LINUX.java \
- sun/io/CharToByteEUC_JP_Solaris.java \
- sun/io/CharToByteEUC_KR.java \
- sun/io/CharToByteEUC_TW.java \
- sun/io/CharToByteSJIS.java \
- sun/io/CharToBytePCK.java \
- sun/io/CharToByteGBK.java \
- sun/io/CharToByteISCII91.java \
- sun/io/CharToByteISO2022.java \
- sun/io/CharToByteISO2022CN_CNS.java \
- sun/io/CharToByteISO2022CN_GB.java \
- sun/io/CharToByteISO2022JP.java \
- sun/io/CharToByteISO2022KR.java \
- sun/io/CharToByteISO8859_3.java \
- sun/io/CharToByteISO8859_6.java \
- sun/io/CharToByteISO8859_8.java \
- sun/io/CharToByteJohab.java \
- sun/io/CharToByteMS874.java \
- sun/io/CharToByteMS932.java \
- sun/io/CharToByteMS936.java \
- sun/io/CharToByteMS949.java \
- sun/io/CharToByteMS950.java \
- sun/io/CharToByteMacArabic.java \
- sun/io/CharToByteMacCentralEurope.java \
- sun/io/CharToByteMacCroatian.java \
- sun/io/CharToByteMacCyrillic.java \
- sun/io/CharToByteMacDingbat.java \
- sun/io/CharToByteMacGreek.java \
- sun/io/CharToByteMacHebrew.java \
- sun/io/CharToByteMacIceland.java \
- sun/io/CharToByteMacRoman.java \
- sun/io/CharToByteMacRomania.java \
- sun/io/CharToByteMacSymbol.java \
- sun/io/CharToByteMacThai.java \
- sun/io/CharToByteMacTurkish.java \
- sun/io/CharToByteMacUkraine.java \
- sun/io/CharToByteTIS620.java
-
-FILES_gen_extcs = \
- sun/nio/cs/ext/IBM037.java \
- sun/nio/cs/ext/IBM1006.java \
- sun/nio/cs/ext/IBM1025.java \
- sun/nio/cs/ext/IBM1026.java \
- sun/nio/cs/ext/IBM1046.java \
- sun/nio/cs/ext/IBM1047.java \
- sun/nio/cs/ext/IBM1097.java \
- sun/nio/cs/ext/IBM1098.java \
- sun/nio/cs/ext/IBM1112.java \
- sun/nio/cs/ext/IBM1122.java \
- sun/nio/cs/ext/IBM1123.java \
- sun/nio/cs/ext/IBM1124.java \
- sun/nio/cs/ext/IBM1140.java \
- sun/nio/cs/ext/IBM1141.java \
- sun/nio/cs/ext/IBM1142.java \
- sun/nio/cs/ext/IBM1143.java \
- sun/nio/cs/ext/IBM1144.java \
- sun/nio/cs/ext/IBM1145.java \
- sun/nio/cs/ext/IBM1146.java \
- sun/nio/cs/ext/IBM1147.java \
- sun/nio/cs/ext/IBM1148.java \
- sun/nio/cs/ext/IBM1149.java \
- sun/nio/cs/ext/IBM273.java \
- sun/nio/cs/ext/IBM277.java \
- sun/nio/cs/ext/IBM278.java \
- sun/nio/cs/ext/IBM280.java \
- sun/nio/cs/ext/IBM284.java \
- sun/nio/cs/ext/IBM285.java \
- sun/nio/cs/ext/IBM297.java \
- sun/nio/cs/ext/IBM420.java \
- sun/nio/cs/ext/IBM424.java \
- sun/nio/cs/ext/IBM500.java \
- sun/nio/cs/ext/IBM838.java \
- sun/nio/cs/ext/IBM856.java \
- sun/nio/cs/ext/IBM860.java \
- sun/nio/cs/ext/IBM861.java \
- sun/nio/cs/ext/IBM863.java \
- sun/nio/cs/ext/IBM864.java \
- sun/nio/cs/ext/IBM865.java \
- sun/nio/cs/ext/IBM868.java \
- sun/nio/cs/ext/IBM869.java \
- sun/nio/cs/ext/IBM870.java \
- sun/nio/cs/ext/IBM871.java \
- sun/nio/cs/ext/IBM875.java \
- sun/nio/cs/ext/IBM918.java \
- sun/nio/cs/ext/IBM921.java \
- sun/nio/cs/ext/IBM922.java \
- sun/nio/cs/ext/ISO_8859_11.java \
- sun/nio/cs/ext/ISO_8859_3.java \
- sun/nio/cs/ext/ISO_8859_6.java \
- sun/nio/cs/ext/ISO_8859_8.java \
- sun/nio/cs/ext/MS1255.java \
- sun/nio/cs/ext/MS1256.java \
- sun/nio/cs/ext/MS1258.java \
- sun/nio/cs/ext/MS874.java \
- sun/nio/cs/ext/MacArabic.java \
- sun/nio/cs/ext/MacCentralEurope.java \
- sun/nio/cs/ext/MacCroatian.java \
- sun/nio/cs/ext/MacCyrillic.java \
- sun/nio/cs/ext/MacDingbat.java \
- sun/nio/cs/ext/MacGreek.java \
- sun/nio/cs/ext/MacHebrew.java \
- sun/nio/cs/ext/MacIceland.java \
- sun/nio/cs/ext/MacRoman.java \
- sun/nio/cs/ext/MacRomania.java \
- sun/nio/cs/ext/MacSymbol.java \
- sun/nio/cs/ext/MacThai.java \
- sun/nio/cs/ext/MacTurkish.java \
- sun/nio/cs/ext/MacUkraine.java \
- sun/nio/cs/ext/TIS_620.java \
- sun/nio/cs/ext/EUC_TWMapping.java \
- sun/nio/cs/ext/IBM1381.java \
- sun/nio/cs/ext/IBM1383.java \
- sun/nio/cs/ext/IBM930.java \
- sun/nio/cs/ext/IBM933.java \
- sun/nio/cs/ext/IBM935.java \
- sun/nio/cs/ext/IBM937.java \
- sun/nio/cs/ext/IBM939.java \
- sun/nio/cs/ext/IBM942.java \
- sun/nio/cs/ext/IBM943.java \
- sun/nio/cs/ext/IBM948.java \
- sun/nio/cs/ext/IBM949.java \
- sun/nio/cs/ext/IBM950.java \
- sun/nio/cs/ext/IBM970.java \
- sun/nio/cs/ext/EUC_CN.java \
- sun/nio/cs/ext/EUC_KR.java \
- sun/nio/cs/ext/Johab.java \
- sun/nio/cs/ext/MS932.java \
- sun/nio/cs/ext/MS936.java \
- sun/nio/cs/ext/MS949.java \
- sun/nio/cs/ext/MS950.java \
- sun/nio/cs/ext/GBK.java
-
-FILES_java = $(FILES_src) $(FILES_gen_extcs)
-
--- a/jdk/make/sun/nio/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/sun/nio/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -1,5 +1,5 @@
#
-# Copyright 1996-2008 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 2009 Sun Microsystems, Inc. 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
@@ -23,88 +23,12 @@
# have any questions.
#
-#
-# Makefile for character converters.
-#
-
BUILDDIR = ../..
-
PACKAGE = sun.nio
PRODUCT = sun
-
-# This re-directs all the class files to a separate location
-CLASSDESTDIR = $(TEMPDIR)/classes
-
-OTHER_JAVACFLAGS += -Xlint:serial -Werror
include $(BUILDDIR)/common/Defs.gmk
-#
-# Files
-#
-include FILES_java.gmk
-AUTO_FILES_JAVA_DIRS = sun/nio/cs/ext
-
-# For Cygwin, command line arguments that are paths must be converted to
-# windows style paths. These paths cannot be used as targets, however, because
-# the ":" in them will interfere with GNU Make rules, generating "multiple
-# target pattern" errors.
-
-# this define is for the rule:
-CHARSETS_JAR = $(LIBDIR)/charsets.jar
-
-# extcs
-FILES_genout_extcs = $(FILES_gen_extcs:%.java=$(GENSRCDIR)/%.java)
-
-#
-# Rules
-#
-include $(BUILDDIR)/common/Classes.gmk
-
-build: $(FILES_genout_extcs) $(CHARSETS_JAR)
-
-#
-# Extra rules to build character converters.
-
-SERVICE_DESCRIPTION = java.nio.charset.spi.CharsetProvider
-SERVICE_DESCRIPTION_PATH = META-INF/services/$(SERVICE_DESCRIPTION)
-
-GENCSDATASRC = $(BUILDDIR)/tools/CharsetMapping
-GENCSSRCDIR = $(BUILDDIR)/tools/src/build/tools/charsetmapping
-GENCSEXT = $(GENSRCDIR)/sun/nio/cs/ext
+SUBDIRS = cs
+all build clean clobber::
+ $(SUBDIRS-loop)
-FILES_MAP = $(GENCSDATASRC)/sjis0213.map
-FILES_DAT = $(CLASSDESTDIR)/sun/nio/cs/ext/sjis0213.dat
-CHARSETMAPPING_JARFILE = $(BUILDTOOLJARDIR)/charsetmapping.jar
-
-$(FILES_DAT): $(FILES_MAP)
- @$(prep-target)
- $(BOOT_JAVA_CMD) -jar $(CHARSETMAPPING_JARFILE) \
- $(FILES_MAP) $(FILES_DAT) sjis0213
-
-
-$(FILES_genout_extcs): \
- $(GENCSDATASRC)/SingleByte-X.java.template \
- $(GENCSDATASRC)/DoubleByte-X.java.template \
- $(GENCSDATASRC)/extsbcs $(GENCSDATASRC)/dbcs
- @$(prep-target)
- $(RM) -r $(GENCSEXT)
- $(MKDIR) -p $(GENCSEXT)
- $(BOOT_JAVA_CMD) -jar $(CHARSETMAPPING_JARFILE) $(GENCSDATASRC) $(GENCSEXT) extsbcs
- $(BOOT_JAVA_CMD) -jar $(CHARSETMAPPING_JARFILE) $(GENCSDATASRC) $(GENCSEXT) euctw \
- $(GENCSSRCDIR)/GenerateEUC_TW.java
- $(BOOT_JAVA_CMD) -jar $(CHARSETMAPPING_JARFILE) $(GENCSDATASRC) $(GENCSEXT) dbcs
-
-$(CLASSDESTDIR)/$(SERVICE_DESCRIPTION_PATH): \
- $(SHARE_SRC)/classes/sun/nio/cs/ext/$(SERVICE_DESCRIPTION_PATH)
- $(install-file)
-
-$(CHARSETS_JAR): $(FILES_class) $(CLASSDESTDIR)/$(SERVICE_DESCRIPTION_PATH) $(FILES_DAT)
- $(BOOT_JAR_CMD) cf0 $(CHARSETS_JAR) \
- -C $(CLASSDESTDIR) sun \
- -C $(CLASSDESTDIR) $(SERVICE_DESCRIPTION_PATH) \
- $(BOOT_JAR_JFLAGS)
- @$(java-vm-cleanup)
-
-clean::
- $(RM) -r $(CLASSDESTDIR)
- $(RM) $(CHARSETS_JAR)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/make/sun/nio/cs/FILES_java.gmk Thu Jan 07 08:14:48 2010 -0800
@@ -0,0 +1,400 @@
+#
+# Copyright 2005-2006 Sun Microsystems, Inc. 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. Sun designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+#
+
+#
+# Character converters for lib/charsets.jar
+#
+# Core character converters are built from make/java/java.
+#
+
+FILES_src = \
+ sun/io/ByteToCharDoubleByte.java \
+ sun/io/ByteToCharDBCS_ASCII.java \
+ sun/io/ByteToCharDBCS_EBCDIC.java \
+ sun/io/ByteToCharEUC.java \
+ sun/io/CharToByteDoubleByte.java \
+ sun/io/CharToByteDBCS_ASCII.java \
+ sun/io/CharToByteDBCS_EBCDIC.java \
+ sun/io/CharToByteEUC.java \
+ sun/io/ByteToCharBig5.java \
+ sun/io/ByteToCharBig5_Solaris.java \
+ sun/io/ByteToCharBig5_HKSCS.java \
+ sun/io/ByteToCharMS950_HKSCS.java \
+ sun/io/ByteToCharHKSCS.java \
+ sun/io/ByteToCharHKSCS_2001.java \
+ sun/io/ByteToCharGB18030.java \
+ sun/io/ByteToCharGB18030DB.java \
+ sun/io/ByteToCharCp037.java \
+ sun/io/ByteToCharCp1006.java \
+ sun/io/ByteToCharCp1025.java \
+ sun/io/ByteToCharCp1026.java \
+ sun/io/ByteToCharCp1046.java \
+ sun/io/ByteToCharCp1047.java \
+ sun/io/ByteToCharCp1097.java \
+ sun/io/ByteToCharCp1098.java \
+ sun/io/ByteToCharCp1112.java \
+ sun/io/ByteToCharCp1122.java \
+ sun/io/ByteToCharCp1123.java \
+ sun/io/ByteToCharCp1124.java \
+ sun/io/ByteToCharCp1140.java \
+ sun/io/ByteToCharCp1141.java \
+ sun/io/ByteToCharCp1142.java \
+ sun/io/ByteToCharCp1143.java \
+ sun/io/ByteToCharCp1144.java \
+ sun/io/ByteToCharCp1145.java \
+ sun/io/ByteToCharCp1146.java \
+ sun/io/ByteToCharCp1147.java \
+ sun/io/ByteToCharCp1148.java \
+ sun/io/ByteToCharCp1149.java \
+ sun/io/ByteToCharCp1255.java \
+ sun/io/ByteToCharCp1256.java \
+ sun/io/ByteToCharCp1258.java \
+ sun/io/ByteToCharCp1381.java \
+ sun/io/ByteToCharCp1383.java \
+ sun/io/ByteToCharCp273.java \
+ sun/io/ByteToCharCp277.java \
+ sun/io/ByteToCharCp278.java \
+ sun/io/ByteToCharCp280.java \
+ sun/io/ByteToCharCp284.java \
+ sun/io/ByteToCharCp285.java \
+ sun/io/ByteToCharCp297.java \
+ sun/io/ByteToCharCp33722.java \
+ sun/io/ByteToCharCp420.java \
+ sun/io/ByteToCharCp424.java \
+ sun/io/ByteToCharCp437.java \
+ sun/io/ByteToCharCp500.java \
+ sun/io/ByteToCharCp737.java \
+ sun/io/ByteToCharCp775.java \
+ sun/io/ByteToCharCp834.java \
+ sun/io/ByteToCharCp838.java \
+ sun/io/ByteToCharCp850.java \
+ sun/io/ByteToCharCp852.java \
+ sun/io/ByteToCharCp855.java \
+ sun/io/ByteToCharCp856.java \
+ sun/io/ByteToCharCp857.java \
+ sun/io/ByteToCharCp858.java \
+ sun/io/ByteToCharCp860.java \
+ sun/io/ByteToCharCp861.java \
+ sun/io/ByteToCharCp862.java \
+ sun/io/ByteToCharCp863.java \
+ sun/io/ByteToCharCp864.java \
+ sun/io/ByteToCharCp865.java \
+ sun/io/ByteToCharCp866.java \
+ sun/io/ByteToCharCp868.java \
+ sun/io/ByteToCharCp869.java \
+ sun/io/ByteToCharCp870.java \
+ sun/io/ByteToCharCp871.java \
+ sun/io/ByteToCharCp874.java \
+ sun/io/ByteToCharCp875.java \
+ sun/io/ByteToCharCp918.java \
+ sun/io/ByteToCharCp921.java \
+ sun/io/ByteToCharCp922.java \
+ sun/io/ByteToCharCp930.java \
+ sun/io/ByteToCharCp933.java \
+ sun/io/ByteToCharCp935.java \
+ sun/io/ByteToCharCp937.java \
+ sun/io/ByteToCharCp939.java \
+ sun/io/ByteToCharCp942.java \
+ sun/io/ByteToCharCp942C.java \
+ sun/io/ByteToCharCp943.java \
+ sun/io/ByteToCharCp943C.java \
+ sun/io/ByteToCharCp948.java \
+ sun/io/ByteToCharCp949.java \
+ sun/io/ByteToCharCp949C.java \
+ sun/io/ByteToCharCp950.java \
+ sun/io/ByteToCharCp964.java \
+ sun/io/ByteToCharCp970.java \
+ sun/io/ByteToCharJIS0201.java \
+ sun/io/ByteToCharJIS0208.java \
+ sun/io/ByteToCharJIS0208_Solaris.java \
+ sun/io/ByteToCharJIS0212.java \
+ sun/io/ByteToCharJIS0212_Solaris.java \
+ sun/io/ByteToCharEUC_CN.java \
+ sun/io/ByteToCharEUC_JP.java \
+ sun/io/ByteToCharEUC_JP_LINUX.java \
+ sun/io/ByteToCharEUC_JP_Solaris.java \
+ sun/io/ByteToCharEUC_KR.java \
+ sun/io/ByteToCharEUC_TW.java \
+ sun/io/ByteToCharSJIS.java \
+ sun/io/ByteToCharPCK.java \
+ sun/io/ByteToCharGBK.java \
+ sun/io/ByteToCharISCII91.java \
+ sun/io/ByteToCharISO2022.java \
+ sun/io/ByteToCharISO2022CN.java \
+ sun/io/ByteToCharISO2022JP.java \
+ sun/io/ByteToCharISO2022KR.java \
+ sun/io/ByteToCharISO8859_3.java \
+ sun/io/ByteToCharISO8859_6.java \
+ sun/io/ByteToCharISO8859_8.java \
+ sun/io/ByteToCharJISAutoDetect.java \
+ sun/io/ByteToCharJohab.java \
+ sun/io/ByteToCharMS874.java \
+ sun/io/ByteToCharMS932.java \
+ sun/io/ByteToCharMS936.java \
+ sun/io/ByteToCharMS949.java \
+ sun/io/ByteToCharMS950.java \
+ sun/io/ByteToCharMacArabic.java \
+ sun/io/ByteToCharMacCentralEurope.java \
+ sun/io/ByteToCharMacCroatian.java \
+ sun/io/ByteToCharMacCyrillic.java \
+ sun/io/ByteToCharMacDingbat.java \
+ sun/io/ByteToCharMacGreek.java \
+ sun/io/ByteToCharMacHebrew.java \
+ sun/io/ByteToCharMacIceland.java \
+ sun/io/ByteToCharMacRoman.java \
+ sun/io/ByteToCharMacRomania.java \
+ sun/io/ByteToCharMacSymbol.java \
+ sun/io/ByteToCharMacThai.java \
+ sun/io/ByteToCharMacTurkish.java \
+ sun/io/ByteToCharMacUkraine.java \
+ sun/io/ByteToCharTIS620.java \
+ sun/io/CharToByteBig5.java \
+ sun/io/CharToByteBig5_Solaris.java \
+ sun/io/CharToByteBig5_HKSCS.java \
+ sun/io/CharToByteHKSCS.java \
+ sun/io/CharToByteHKSCS_2001.java \
+ sun/io/CharToByteMS950_HKSCS.java \
+ sun/io/CharToByteGB18030.java \
+ sun/io/CharToByteCp037.java \
+ sun/io/CharToByteCp1006.java \
+ sun/io/CharToByteCp1025.java \
+ sun/io/CharToByteCp1026.java \
+ sun/io/CharToByteCp1046.java \
+ sun/io/CharToByteCp1047.java \
+ sun/io/CharToByteCp1097.java \
+ sun/io/CharToByteCp1098.java \
+ sun/io/CharToByteCp1112.java \
+ sun/io/CharToByteCp1122.java \
+ sun/io/CharToByteCp1123.java \
+ sun/io/CharToByteCp1124.java \
+ sun/io/CharToByteCp1140.java \
+ sun/io/CharToByteCp1141.java \
+ sun/io/CharToByteCp1142.java \
+ sun/io/CharToByteCp1143.java \
+ sun/io/CharToByteCp1144.java \
+ sun/io/CharToByteCp1145.java \
+ sun/io/CharToByteCp1146.java \
+ sun/io/CharToByteCp1147.java \
+ sun/io/CharToByteCp1148.java \
+ sun/io/CharToByteCp1149.java \
+ sun/io/CharToByteCp1255.java \
+ sun/io/CharToByteCp1256.java \
+ sun/io/CharToByteCp1258.java \
+ sun/io/CharToByteCp1381.java \
+ sun/io/CharToByteCp1383.java \
+ sun/io/CharToByteCp273.java \
+ sun/io/CharToByteCp277.java \
+ sun/io/CharToByteCp278.java \
+ sun/io/CharToByteCp280.java \
+ sun/io/CharToByteCp284.java \
+ sun/io/CharToByteCp285.java \
+ sun/io/CharToByteCp297.java \
+ sun/io/CharToByteCp33722.java \
+ sun/io/CharToByteCp420.java \
+ sun/io/CharToByteCp424.java \
+ sun/io/CharToByteCp437.java \
+ sun/io/CharToByteCp500.java \
+ sun/io/CharToByteCp737.java \
+ sun/io/CharToByteCp775.java \
+ sun/io/CharToByteCp834.java \
+ sun/io/CharToByteCp838.java \
+ sun/io/CharToByteCp850.java \
+ sun/io/CharToByteCp852.java \
+ sun/io/CharToByteCp855.java \
+ sun/io/CharToByteCp856.java \
+ sun/io/CharToByteCp857.java \
+ sun/io/CharToByteCp858.java \
+ sun/io/CharToByteCp860.java \
+ sun/io/CharToByteCp861.java \
+ sun/io/CharToByteCp862.java \
+ sun/io/CharToByteCp863.java \
+ sun/io/CharToByteCp864.java \
+ sun/io/CharToByteCp865.java \
+ sun/io/CharToByteCp866.java \
+ sun/io/CharToByteCp868.java \
+ sun/io/CharToByteCp869.java \
+ sun/io/CharToByteCp870.java \
+ sun/io/CharToByteCp871.java \
+ sun/io/CharToByteCp874.java \
+ sun/io/CharToByteCp875.java \
+ sun/io/CharToByteCp918.java \
+ sun/io/CharToByteCp921.java \
+ sun/io/CharToByteCp922.java \
+ sun/io/CharToByteCp930.java \
+ sun/io/CharToByteCp933.java \
+ sun/io/CharToByteCp935.java \
+ sun/io/CharToByteCp937.java \
+ sun/io/CharToByteCp939.java \
+ sun/io/CharToByteCp942.java \
+ sun/io/CharToByteCp942C.java \
+ sun/io/CharToByteCp943.java \
+ sun/io/CharToByteCp943C.java \
+ sun/io/CharToByteCp948.java \
+ sun/io/CharToByteCp949.java \
+ sun/io/CharToByteCp949C.java \
+ sun/io/CharToByteCp950.java \
+ sun/io/CharToByteCp964.java \
+ sun/io/CharToByteCp970.java \
+ sun/io/CharToByteJIS0201.java \
+ sun/io/CharToByteJIS0208.java \
+ sun/io/CharToByteJIS0208_Solaris.java \
+ sun/io/CharToByteJIS0212.java \
+ sun/io/CharToByteJIS0212_Solaris.java \
+ sun/io/CharToByteEUC_CN.java \
+ sun/io/CharToByteEUC_JP.java \
+ sun/io/CharToByteEUC_JP_LINUX.java \
+ sun/io/CharToByteEUC_JP_Solaris.java \
+ sun/io/CharToByteEUC_KR.java \
+ sun/io/CharToByteEUC_TW.java \
+ sun/io/CharToByteSJIS.java \
+ sun/io/CharToBytePCK.java \
+ sun/io/CharToByteGBK.java \
+ sun/io/CharToByteISCII91.java \
+ sun/io/CharToByteISO2022.java \
+ sun/io/CharToByteISO2022CN_CNS.java \
+ sun/io/CharToByteISO2022CN_GB.java \
+ sun/io/CharToByteISO2022JP.java \
+ sun/io/CharToByteISO2022KR.java \
+ sun/io/CharToByteISO8859_3.java \
+ sun/io/CharToByteISO8859_6.java \
+ sun/io/CharToByteISO8859_8.java \
+ sun/io/CharToByteJohab.java \
+ sun/io/CharToByteMS874.java \
+ sun/io/CharToByteMS932.java \
+ sun/io/CharToByteMS936.java \
+ sun/io/CharToByteMS949.java \
+ sun/io/CharToByteMS950.java \
+ sun/io/CharToByteMacArabic.java \
+ sun/io/CharToByteMacCentralEurope.java \
+ sun/io/CharToByteMacCroatian.java \
+ sun/io/CharToByteMacCyrillic.java \
+ sun/io/CharToByteMacDingbat.java \
+ sun/io/CharToByteMacGreek.java \
+ sun/io/CharToByteMacHebrew.java \
+ sun/io/CharToByteMacIceland.java \
+ sun/io/CharToByteMacRoman.java \
+ sun/io/CharToByteMacRomania.java \
+ sun/io/CharToByteMacSymbol.java \
+ sun/io/CharToByteMacThai.java \
+ sun/io/CharToByteMacTurkish.java \
+ sun/io/CharToByteMacUkraine.java \
+ sun/io/CharToByteTIS620.java
+
+FILES_gen_extcs = \
+ sun/nio/cs/ext/IBM037.java \
+ sun/nio/cs/ext/IBM1006.java \
+ sun/nio/cs/ext/IBM1025.java \
+ sun/nio/cs/ext/IBM1026.java \
+ sun/nio/cs/ext/IBM1046.java \
+ sun/nio/cs/ext/IBM1047.java \
+ sun/nio/cs/ext/IBM1097.java \
+ sun/nio/cs/ext/IBM1098.java \
+ sun/nio/cs/ext/IBM1112.java \
+ sun/nio/cs/ext/IBM1122.java \
+ sun/nio/cs/ext/IBM1123.java \
+ sun/nio/cs/ext/IBM1124.java \
+ sun/nio/cs/ext/IBM1140.java \
+ sun/nio/cs/ext/IBM1141.java \
+ sun/nio/cs/ext/IBM1142.java \
+ sun/nio/cs/ext/IBM1143.java \
+ sun/nio/cs/ext/IBM1144.java \
+ sun/nio/cs/ext/IBM1145.java \
+ sun/nio/cs/ext/IBM1146.java \
+ sun/nio/cs/ext/IBM1147.java \
+ sun/nio/cs/ext/IBM1148.java \
+ sun/nio/cs/ext/IBM1149.java \
+ sun/nio/cs/ext/IBM273.java \
+ sun/nio/cs/ext/IBM277.java \
+ sun/nio/cs/ext/IBM278.java \
+ sun/nio/cs/ext/IBM280.java \
+ sun/nio/cs/ext/IBM284.java \
+ sun/nio/cs/ext/IBM285.java \
+ sun/nio/cs/ext/IBM297.java \
+ sun/nio/cs/ext/IBM420.java \
+ sun/nio/cs/ext/IBM424.java \
+ sun/nio/cs/ext/IBM500.java \
+ sun/nio/cs/ext/IBM838.java \
+ sun/nio/cs/ext/IBM856.java \
+ sun/nio/cs/ext/IBM860.java \
+ sun/nio/cs/ext/IBM861.java \
+ sun/nio/cs/ext/IBM863.java \
+ sun/nio/cs/ext/IBM864.java \
+ sun/nio/cs/ext/IBM865.java \
+ sun/nio/cs/ext/IBM868.java \
+ sun/nio/cs/ext/IBM869.java \
+ sun/nio/cs/ext/IBM870.java \
+ sun/nio/cs/ext/IBM871.java \
+ sun/nio/cs/ext/IBM875.java \
+ sun/nio/cs/ext/IBM918.java \
+ sun/nio/cs/ext/IBM921.java \
+ sun/nio/cs/ext/IBM922.java \
+ sun/nio/cs/ext/ISO_8859_11.java \
+ sun/nio/cs/ext/ISO_8859_3.java \
+ sun/nio/cs/ext/ISO_8859_6.java \
+ sun/nio/cs/ext/ISO_8859_8.java \
+ sun/nio/cs/ext/MS1255.java \
+ sun/nio/cs/ext/MS1256.java \
+ sun/nio/cs/ext/MS1258.java \
+ sun/nio/cs/ext/MS874.java \
+ sun/nio/cs/ext/MacArabic.java \
+ sun/nio/cs/ext/MacCentralEurope.java \
+ sun/nio/cs/ext/MacCroatian.java \
+ sun/nio/cs/ext/MacCyrillic.java \
+ sun/nio/cs/ext/MacDingbat.java \
+ sun/nio/cs/ext/MacGreek.java \
+ sun/nio/cs/ext/MacHebrew.java \
+ sun/nio/cs/ext/MacIceland.java \
+ sun/nio/cs/ext/MacRoman.java \
+ sun/nio/cs/ext/MacRomania.java \
+ sun/nio/cs/ext/MacSymbol.java \
+ sun/nio/cs/ext/MacThai.java \
+ sun/nio/cs/ext/MacTurkish.java \
+ sun/nio/cs/ext/MacUkraine.java \
+ sun/nio/cs/ext/TIS_620.java \
+ sun/nio/cs/ext/EUC_TWMapping.java \
+ sun/nio/cs/ext/IBM1381.java \
+ sun/nio/cs/ext/IBM1383.java \
+ sun/nio/cs/ext/IBM930.java \
+ sun/nio/cs/ext/IBM933.java \
+ sun/nio/cs/ext/IBM935.java \
+ sun/nio/cs/ext/IBM937.java \
+ sun/nio/cs/ext/IBM939.java \
+ sun/nio/cs/ext/IBM942.java \
+ sun/nio/cs/ext/IBM943.java \
+ sun/nio/cs/ext/IBM948.java \
+ sun/nio/cs/ext/IBM949.java \
+ sun/nio/cs/ext/IBM950.java \
+ sun/nio/cs/ext/IBM970.java \
+ sun/nio/cs/ext/EUC_CN.java \
+ sun/nio/cs/ext/EUC_KR.java \
+ sun/nio/cs/ext/Johab.java \
+ sun/nio/cs/ext/MS932.java \
+ sun/nio/cs/ext/MS936.java \
+ sun/nio/cs/ext/MS949.java \
+ sun/nio/cs/ext/MS950.java \
+ sun/nio/cs/ext/GBK.java
+
+FILES_java = $(FILES_src) $(FILES_gen_extcs)
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/make/sun/nio/cs/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -0,0 +1,112 @@
+#
+# Copyright 1996-2008 Sun Microsystems, Inc. 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. Sun designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+#
+
+#
+# Makefile for character converters.
+#
+
+BUILDDIR = ../../..
+
+# charsets should be separated from nio module
+MODULE = charsets
+PACKAGE = sun.nio
+PRODUCT = sun
+
+# This re-directs all the class files to a separate location
+CLASSDESTDIR = $(TEMPDIR)/classes
+
+OTHER_JAVACFLAGS += -Xlint:serial -Werror
+include $(BUILDDIR)/common/Defs.gmk
+
+#
+# Files
+#
+include FILES_java.gmk
+AUTO_FILES_JAVA_DIRS = sun/nio/cs/ext
+
+# For Cygwin, command line arguments that are paths must be converted to
+# windows style paths. These paths cannot be used as targets, however, because
+# the ":" in them will interfere with GNU Make rules, generating "multiple
+# target pattern" errors.
+
+# this define is for the rule:
+CHARSETS_JAR = $(LIBDIR)/charsets.jar
+
+# extcs
+FILES_genout_extcs = $(FILES_gen_extcs:%.java=$(GENSRCDIR)/%.java)
+
+#
+# Rules
+#
+include $(BUILDDIR)/common/Classes.gmk
+
+build: $(FILES_genout_extcs) $(CHARSETS_JAR)
+
+#
+# Extra rules to build character converters.
+
+SERVICE_DESCRIPTION = java.nio.charset.spi.CharsetProvider
+SERVICE_DESCRIPTION_PATH = META-INF/services/$(SERVICE_DESCRIPTION)
+
+GENCSDATASRC = $(BUILDDIR)/tools/CharsetMapping
+GENCSSRCDIR = $(BUILDDIR)/tools/src/build/tools/charsetmapping
+GENCSEXT = $(GENSRCDIR)/sun/nio/cs/ext
+
+FILES_MAP = $(GENCSDATASRC)/sjis0213.map
+FILES_DAT = $(CLASSDESTDIR)/sun/nio/cs/ext/sjis0213.dat
+CHARSETMAPPING_JARFILE = $(BUILDTOOLJARDIR)/charsetmapping.jar
+
+$(FILES_DAT): $(FILES_MAP)
+ @$(prep-target)
+ $(BOOT_JAVA_CMD) -jar $(CHARSETMAPPING_JARFILE) \
+ $(FILES_MAP) $(FILES_DAT) sjis0213
+
+
+$(FILES_genout_extcs): \
+ $(GENCSDATASRC)/SingleByte-X.java.template \
+ $(GENCSDATASRC)/DoubleByte-X.java.template \
+ $(GENCSDATASRC)/extsbcs $(GENCSDATASRC)/dbcs
+ @$(prep-target)
+ $(RM) -r $(GENCSEXT)
+ $(MKDIR) -p $(GENCSEXT)
+ $(BOOT_JAVA_CMD) -jar $(CHARSETMAPPING_JARFILE) $(GENCSDATASRC) $(GENCSEXT) extsbcs
+ $(BOOT_JAVA_CMD) -jar $(CHARSETMAPPING_JARFILE) $(GENCSDATASRC) $(GENCSEXT) euctw \
+ $(GENCSSRCDIR)/GenerateEUC_TW.java
+ $(BOOT_JAVA_CMD) -jar $(CHARSETMAPPING_JARFILE) $(GENCSDATASRC) $(GENCSEXT) dbcs
+
+$(CLASSDESTDIR)/$(SERVICE_DESCRIPTION_PATH): \
+ $(SHARE_SRC)/classes/sun/nio/cs/ext/$(SERVICE_DESCRIPTION_PATH)
+ $(install-file)
+
+$(CHARSETS_JAR): $(FILES_class) $(CLASSDESTDIR)/$(SERVICE_DESCRIPTION_PATH) $(FILES_DAT)
+ $(BOOT_JAR_CMD) cf0 $(CHARSETS_JAR) \
+ -C $(CLASSDESTDIR) sun \
+ -C $(CLASSDESTDIR) $(SERVICE_DESCRIPTION_PATH) \
+ $(BOOT_JAR_JFLAGS)
+ @$(java-vm-cleanup)
+
+clean::
+ $(RM) -r $(CLASSDESTDIR)
+ $(RM) $(CHARSETS_JAR)
--- a/jdk/make/sun/org/mozilla/javascript/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/sun/org/mozilla/javascript/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -28,6 +28,7 @@
#
BUILDDIR = ../../../..
+MODULE = scripting-rhino
PACKAGE = sun.org.mozilla.javascript.internal
PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk
--- a/jdk/make/sun/pisces/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/sun/pisces/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -24,6 +24,7 @@
#
BUILDDIR = ../..
+MODULE = java2d
PACKAGE = sun.pisces
PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk
--- a/jdk/make/sun/rmi/cgi/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/sun/rmi/cgi/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -28,6 +28,8 @@
#
BUILDDIR = ../../..
+# java-rmi.cgi is a JDK tool
+MODULE = tools
PACKAGE = sun.rmi
PRODUCT = sun
PROGRAM = java-rmi
--- a/jdk/make/sun/rmi/oldtools/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/sun/rmi/oldtools/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -28,6 +28,7 @@
#
BUILDDIR = ../../..
+MODULE = oldjavac
PRODUCT = oldjavac
include $(BUILDDIR)/common/Defs.gmk
--- a/jdk/make/sun/rmi/registry/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/sun/rmi/registry/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -28,6 +28,7 @@
#
BUILDDIR = ../../..
+MODULE = rmi
PACKAGE = sun.rmi.registry
PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk
@@ -48,3 +49,7 @@
#
include $(BUILDDIR)/common/Classes.gmk
+build: rmiregistry
+
+rmiregistry:
+ $(call make-launcher, rmiregistry, sun.rmi.registry.RegistryImpl, , )
--- a/jdk/make/sun/rmi/rmi/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/sun/rmi/rmi/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -28,6 +28,7 @@
#
BUILDDIR = ../../..
+MODULE = rmi
PACKAGE = sun.rmi
PRODUCT = sun
LIBRARY = rmi
@@ -124,7 +125,7 @@
$(BINDIR)/java-rmi.cgi: $(PLATFORM_SRC)/bin/java-rmi.cgi.sh
$(install-file)
- $(CHMOD) a+x $@
+ $(call chmod-file, a+x)
bin.clean:
$(RM) $(BINDIR)/java-rmi.cgi
--- a/jdk/make/sun/rmi/rmic/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/sun/rmi/rmic/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -28,6 +28,7 @@
#
BUILDDIR = ../../..
+MODULE = rmic
PACKAGE = sun.rmi.rmic
PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk
--- a/jdk/make/sun/rmi/rmid/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/sun/rmi/rmid/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -29,11 +29,12 @@
#
BUILDDIR = ../../..
+MODULE = rmi-activation
PACKAGE = sun.rmi.activation
PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk
-build: stubs
+build: stubs rmid
#
# Resources
@@ -75,4 +76,5 @@
#
include $(BUILDDIR)/common/Classes.gmk
-
+rmid:
+ $(call make-launcher, rmid, sun.rmi.server.Activation, , )
--- a/jdk/make/sun/security/ec/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/sun/security/ec/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -89,6 +89,7 @@
#
BUILDDIR = ../../..
+MODULE = security-sunec
PACKAGE = sun.security.ec
PRODUCT = sun
@@ -308,7 +309,7 @@
else
$(JAR_DESTFILE): $(SIGNED_DIR)/sunec.jar
endif
- $(install-file)
+ $(install-non-module-file)
ifndef OPENJDK
install-prebuilt:
--- a/jdk/make/sun/security/jgss/wrapper/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/sun/security/jgss/wrapper/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -24,6 +24,7 @@
#
BUILDDIR = ../../../..
+MODULE = security-kerberos
PACKAGE = sun.security.jgss.wrapper
PRODUCT = sun
--- a/jdk/make/sun/security/krb5/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/sun/security/krb5/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -24,6 +24,7 @@
#
BUILDDIR = ../../..
+MODULE = security-kerberos
PACKAGE = sun.security.krb5
PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk
@@ -77,3 +78,10 @@
else
OTHER_LDLIBS = -ldl $(JVMLIB)
endif
+
+build:
+ifeq ($(PLATFORM),windows)
+ $(call make-launcher, kinit, sun.security.krb5.internal.tools.Kinit, , )
+ $(call make-launcher, klist, sun.security.krb5.internal.tools.Klist, , )
+ $(call make-launcher, ktab, sun.security.krb5.internal.tools.Ktab, , )
+endif
--- a/jdk/make/sun/security/mscapi/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/sun/security/mscapi/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -89,6 +89,7 @@
#
BUILDDIR = ../../..
+MODULE = security-sunmscapi
PACKAGE = sun.security.mscapi
LIBRARY = sunmscapi
PRODUCT = sun
@@ -271,7 +272,7 @@
else
$(JAR_DESTFILE): $(SIGNED_DIR)/sunmscapi.jar
endif
- $(install-file)
+ $(install-non-module-file)
ifndef OPENJDK
install-prebuilt:
--- a/jdk/make/sun/security/pkcs11/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/sun/security/pkcs11/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -89,6 +89,7 @@
#
BUILDDIR = ../../..
+MODULE = security-sunpkcs11
PACKAGE = sun.security.pkcs11
LIBRARY = j2pkcs11
PRODUCT = sun
@@ -161,6 +162,16 @@
OTHER_LDLIBS = -ldl $(JVMLIB)
endif
+# Other config files
+SUNPKCS11_CFG =
+
+ifeq ($(PLATFORM), solaris)
+SUNPKCS11_CFG = sunpkcs11-cfg
+endif # PLATFORM
+
+SUNPKCS11_CFG_SRC = $(TOPDIR)/src/share/lib/security/sunpkcs11-solaris.cfg
+SUNPKCS11_CFG_BUILD = $(LIBDIR)/security/sunpkcs11-solaris.cfg
+
#
# We use a variety of subdirectories in the $(TEMPDIR) depending on what
# part of the build we're doing. Both OPENJDK/JDK builds are initially
@@ -174,12 +185,17 @@
#
ifdef OPENJDK
-all: build-jar install-jar
+all: $(SUNPKCS11_CFG) build-jar install-jar
else
-all: build-jar install-prebuilt
+all: $(SUNPKCS11_CFG) build-jar install-prebuilt
$(build-warning)
endif
+sunpkcs11-cfg: $(SUNPKCS11_CFG_BUILD)
+
+$(SUNPKCS11_CFG_BUILD): $(SUNPKCS11_CFG_SRC)
+ $(install-file)
+
include $(BUILDDIR)/javax/crypto/Defs-jce.gmk
@@ -271,7 +287,7 @@
else
$(JAR_DESTFILE): $(SIGNED_DIR)/sunpkcs11.jar
endif
- $(install-file)
+ $(install-non-module-file)
ifndef OPENJDK
install-prebuilt:
@@ -287,6 +303,7 @@
clobber clean::
$(RM) -r $(JAR_DESTFILE) $(TEMPDIR) $(JCE_BUILD_DIR)
+ $(RM) $(SUNPKCS11_CFG_BUILD)
.PHONY: build-jar jar install-jar
ifndef OPENJDK
--- a/jdk/make/sun/security/smartcardio/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/sun/security/smartcardio/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -24,6 +24,7 @@
#
BUILDDIR = ../../..
+MODULE = security-smartcardio
PACKAGE = sun.security.smartcardio
LIBRARY = j2pcsc
PRODUCT = sun
--- a/jdk/make/sun/security/tools/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/sun/security/tools/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -24,6 +24,7 @@
#
BUILDDIR = ../../..
+MODULE = security-tools
PACKAGE = sun.security.tools
PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk
@@ -44,3 +45,7 @@
#
include $(BUILDDIR)/common/Classes.gmk
+build:
+ $(call make-launcher, keytool, sun.security.tools.KeyTool, , )
+ $(call make-launcher, policytool, sun.security.tools.PolicyTool, , )
+
--- a/jdk/make/sun/serialver/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/sun/serialver/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -28,6 +28,7 @@
#
BUILDDIR = ../..
+MODULE = serialver
PACKAGE = sun.tools.serialver
PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk
--- a/jdk/make/sun/splashscreen/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/sun/splashscreen/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -24,6 +24,7 @@
#
BUILDDIR = ../..
+MODULE = awt
PACKAGE = sun.awt
LIBRARY = splashscreen
PRODUCT = sun
--- a/jdk/make/sun/text/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/sun/text/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -29,6 +29,7 @@
BUILDDIR = ../..
+MODULE = localedata
PACKAGE = sun.text
PRODUCT = sun
--- a/jdk/make/sun/tools/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/sun/tools/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -28,6 +28,7 @@
#
BUILDDIR = ../..
+MODULE = tools
PACKAGE = sun.tools
PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk
--- a/jdk/make/sun/tracing/dtrace/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/sun/tracing/dtrace/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -27,6 +27,7 @@
# Makefile for building dtrace extension
#
BUILDDIR = ../../..
+MODULE = tracing
PACKAGE = sun.tracing.dtrace
LIBRARY = jsdt
PRODUCT = sun
--- a/jdk/make/sun/xawt/Makefile Tue Jan 05 13:44:09 2010 -0800
+++ b/jdk/make/sun/xawt/Makefile Thu Jan 07 08:14:48 2010 -0800
@@ -24,6 +24,7 @@
#
BUILDDIR = ../..
+MODULE = awt
PACKAGE = sun.awt.X11
LIBRARY = mawt
LIBRARY_OUTPUT = xawt