Skip to content

D
dragonwell8_jdk

openanolis / dragonwell8_jdk

通知 4
Star 2
Fork 0
D
dragonwell8_jdk
提交 e1a13723 编写于 作者: M mchung
浏览文件
操作

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
上级 7ec8dba2
展开全部 隐藏空白更改
内联 并排
Showing with 816 addition and 404 deletion
make/com/sun/crypto/provider/Makefile
浏览文件 @ e1a13723
...@@ -249,7 +249,7 @@ $(JAR_DESTFILE): $(UNSIGNED_DIR)/sunjce_provider.jar ...@@ -249,7 +249,7 @@ $(JAR_DESTFILE): $(UNSIGNED_DIR)/sunjce_provider.jar
else else
$(JAR_DESTFILE): $(SIGNED_DIR)/sunjce_provider.jar $(JAR_DESTFILE): $(SIGNED_DIR)/sunjce_provider.jar
endif endif
$(install-file) $(install-non-module-file)
ifndef OPENJDK ifndef OPENJDK
install-prebuilt: install-prebuilt:
......
make/com/sun/java/pack/Makefile
浏览文件 @ e1a13723
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
# #
BUILDDIR = ../../../.. BUILDDIR = ../../../..
MODULE = pack200
PACKAGE = com.sun.java.util.jar.pack PACKAGE = com.sun.java.util.jar.pack
LIBRARY = unpack LIBRARY = unpack
PRODUCT = sun PRODUCT = sun
...@@ -123,11 +124,14 @@ COBJDIR = $(strip $(subst unpack,unpack-cmd,$(OBJDIR))) ...@@ -123,11 +124,14 @@ COBJDIR = $(strip $(subst unpack,unpack-cmd,$(OBJDIR)))
all: build all: build
build: prop build: prop pack200-tool
prop: prop:
$(MAKE) -C prop $(MAKE) -C prop
pack200-tool:
$(call make-launcher, pack200, com.sun.java.util.jar.pack.Driver, , --pack)
unpacker: unpacker:
$(MAKE) $(UNPACK_EXE) STANDALONE=true LDMAPFLAGS_OPT= LDMAPFLAGS_DBG= $(MAKE) $(UNPACK_EXE) STANDALONE=true LDMAPFLAGS_OPT= LDMAPFLAGS_DBG=
...@@ -151,6 +155,7 @@ ifdef MT ...@@ -151,6 +155,7 @@ ifdef MT
$(MT) /manifest $(TEMPDIR)/unpack200$(EXE_SUFFIX).manifest /outputresource:$(TEMPDIR)/unpack200$(EXE_SUFFIX);#1 $(MT) /manifest $(TEMPDIR)/unpack200$(EXE_SUFFIX).manifest /outputresource:$(TEMPDIR)/unpack200$(EXE_SUFFIX);#1
endif endif
$(CP) $(TEMPDIR)/unpack200$(EXE_SUFFIX) $(UNPACK_EXE) $(CP) $(TEMPDIR)/unpack200$(EXE_SUFFIX) $(UNPACK_EXE)
$(install-module-file)
ifeq ($(PLATFORM), windows) ifeq ($(PLATFORM), windows)
$(RES):: $(VERSIONINFO_RESOURCE) $(RES):: $(VERSIONINFO_RESOURCE)
......
make/com/sun/java/pack/prop/Makefile
浏览文件 @ e1a13723
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
# to a collision of rules with Classes.gmk and Library.gmk # to a collision of rules with Classes.gmk and Library.gmk
BUILDDIR = ../../../../.. BUILDDIR = ../../../../..
MODULE = pack200
PACKAGE = com.sun.java.util.jar.pack PACKAGE = com.sun.java.util.jar.pack
PRODUCT = sun PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk include $(BUILDDIR)/common/Defs.gmk
......
make/com/sun/jndi/cosnaming/Makefile
浏览文件 @ e1a13723
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
# #
BUILDDIR = ../../../.. BUILDDIR = ../../../..
MODULE = jndi-cosnaming
PACKAGE = com.sun.jndi.cosnaming PACKAGE = com.sun.jndi.cosnaming
PRODUCT = sun PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk include $(BUILDDIR)/common/Defs.gmk
......
make/com/sun/jndi/dns/Makefile
浏览文件 @ e1a13723
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
# #
BUILDDIR = ../../../.. BUILDDIR = ../../../..
MODULE = jndi-dns
PACKAGE = com.sun.jndi.dns PACKAGE = com.sun.jndi.dns
PRODUCT = sun PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk include $(BUILDDIR)/common/Defs.gmk
......
make/com/sun/jndi/ldap/Makefile
浏览文件 @ e1a13723
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
# #
BUILDDIR = ../../../.. BUILDDIR = ../../../..
MODULE = jndi-ldap
PACKAGE = com.sun.jndi.ldap PACKAGE = com.sun.jndi.ldap
PRODUCT = sun PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk include $(BUILDDIR)/common/Defs.gmk
......
make/com/sun/jndi/rmi/registry/Makefile
浏览文件 @ e1a13723
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
# #
BUILDDIR = ../../../../.. BUILDDIR = ../../../../..
MODULE = jndi-rmiregistry
PACKAGE = com.sun.jndi.rmi.registry PACKAGE = com.sun.jndi.rmi.registry
PRODUCT = sun PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk include $(BUILDDIR)/common/Defs.gmk
......
make/com/sun/nio/sctp/Makefile
浏览文件 @ e1a13723
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
# #
BUILDDIR = ../../../.. BUILDDIR = ../../../..
MODULE = sctp
PACKAGE = com.sun.nio.sctp PACKAGE = com.sun.nio.sctp
LIBRARY = sctp LIBRARY = sctp
PRODUCT = sun PRODUCT = sun
......
make/com/sun/org/apache/xml/Makefile
浏览文件 @ e1a13723
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
# #
BUILDDIR = ../../../../.. BUILDDIR = ../../../../..
MODULE = security-xmldsig
PACKAGE = com.sun.org.apache.xml PACKAGE = com.sun.org.apache.xml
PRODUCT = xml PRODUCT = xml
include $(BUILDDIR)/common/Defs.gmk include $(BUILDDIR)/common/Defs.gmk
......
make/com/sun/rowset/Makefile
浏览文件 @ e1a13723
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
# #
BUILDDIR = ../../.. BUILDDIR = ../../..
MODULE = jdbc-enterprise
PACKAGE = com.sun.rowset PACKAGE = com.sun.rowset
PRODUCT = sun PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk include $(BUILDDIR)/common/Defs.gmk
......
make/com/sun/script/Makefile
浏览文件 @ e1a13723
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
BUILDDIR = ../../.. BUILDDIR = ../../..
MODULE = scripting-rhino
PACKAGE = com.sun.script PACKAGE = com.sun.script
PRODUCT = sun PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk include $(BUILDDIR)/common/Defs.gmk
......
make/com/sun/security/auth/module/Makefile
浏览文件 @ e1a13723
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
# Makefile for building auth modules. # Makefile for building auth modules.
BUILDDIR = ../../../../.. BUILDDIR = ../../../../..
MODULE = security-auth
PACKAGE = com.sun.security.auth.module PACKAGE = com.sun.security.auth.module
PRODUCT = sun PRODUCT = sun
......
make/com/sun/servicetag/Makefile
浏览文件 @ e1a13723
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
# have any questions. # have any questions.
BUILDDIR = ../../.. BUILDDIR = ../../..
MODULE = servicetag
PACKAGE = com.sun.servicetag PACKAGE = com.sun.servicetag
PRODUCT = sun PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk include $(BUILDDIR)/common/Defs.gmk
...@@ -68,7 +69,7 @@ $(CLASSBINDIR)/%: $(SHARE_SRC)/classes/% ...@@ -68,7 +69,7 @@ $(CLASSBINDIR)/%: $(SHARE_SRC)/classes/%
$(SERVICETAG_LIBDIR)/jdk_header.png: $(SHARE_SRC)/classes/com/sun/servicetag/resources/jdk_header.png $(SERVICETAG_LIBDIR)/jdk_header.png: $(SHARE_SRC)/classes/com/sun/servicetag/resources/jdk_header.png
$(install-file) $(install-file)
$(CHMOD) 444 $@ $(call chmod-file, 444)
install-servicetag-lib: install-servicetag-lib:
@$(RM) -rf $(SERVICETAG_LIBDIR) @$(RM) -rf $(SERVICETAG_LIBDIR)
......
make/com/sun/tools/attach/Makefile
浏览文件 @ e1a13723
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
BUILDDIR = ../../../.. BUILDDIR = ../../../..
MODULE = attach
PACKAGE = com.sun.tools.attach PACKAGE = com.sun.tools.attach
LIBRARY = attach LIBRARY = attach
PRODUCT = sun PRODUCT = sun
...@@ -65,6 +66,7 @@ $(SERVICEDIR)/%: $(SHARE_SRC)/classes/sun/tools/attach/META-INF/services/% ...@@ -65,6 +66,7 @@ $(SERVICEDIR)/%: $(SHARE_SRC)/classes/sun/tools/attach/META-INF/services/%
@$(MKDIR) -p $(@D) @$(MKDIR) -p $(@D)
@$(RM) $@ @$(RM) $@
@$(CAT) $< | $(SED) -e "s/^#\[$(PLATFORM)\]//" > $@ @$(CAT) $< | $(SED) -e "s/^#\[$(PLATFORM)\]//" > $@
@$(install-module-file)
.PHONY: copy-files .PHONY: copy-files
......
make/common/Defs.gmk
浏览文件 @ e1a13723
...@@ -225,12 +225,6 @@ DEVTOOLS_FT_DIR_EXISTS = $(shell \ ...@@ -225,12 +225,6 @@ DEVTOOLS_FT_DIR_EXISTS = $(shell \
endif endif
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 ifdef ALT_FREETYPE_HEADERS_PATH
FREETYPE_HEADERS_PATH = $(ALT_FREETYPE_HEADERS_PATH) FREETYPE_HEADERS_PATH = $(ALT_FREETYPE_HEADERS_PATH)
else else
...@@ -388,6 +382,14 @@ ifneq ($(THREADDIR),) ...@@ -388,6 +382,14 @@ ifneq ($(THREADDIR),)
UNIQUE_LOCATION_STRING += /$(THREADDIR) UNIQUE_LOCATION_STRING += /$(THREADDIR)
endif 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 # the use of += above makes a space separated list which we need to
# remove for filespecs. # remove for filespecs.
# #
...@@ -497,6 +499,58 @@ PKGDIR = $(subst .,/,$(PACKAGE)) ...@@ -497,6 +499,58 @@ PKGDIR = $(subst .,/,$(PACKAGE))
# #
include $(JDK_MAKE_SHARED_DIR)/Defs-java.gmk 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 # Convenient macros
# #
...@@ -511,6 +565,28 @@ endef ...@@ -511,6 +565,28 @@ endef
define install-file define install-file
$(prep-target) $(prep-target)
$(CP) $< $@ $(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 endef
# Cleanup rule for after debug java run (hotspot.log file is left around) # Cleanup rule for after debug java run (hotspot.log file is left around)
...@@ -712,7 +788,7 @@ else ...@@ -712,7 +788,7 @@ else
endif endif
# Install of imported file (JDK_IMPORT_PATH, or some other external location) # Install of imported file (JDK_IMPORT_PATH, or some other external location)
define install-import-file define install-importonly-file
@$(ECHO) "ASSEMBLY_IMPORT: $@" @$(ECHO) "ASSEMBLY_IMPORT: $@"
$(prep-target) $(prep-target)
$(CP) $< $@ $(CP) $< $@
...@@ -730,4 +806,9 @@ $(CP) $< $@ ...@@ -730,4 +806,9 @@ $(CP) $< $@
fi fi
endef endef
define install-import-file
$(install-importonly-file)
$(install-module-file)
endef
.PHONY: all build clean clobber .PHONY: all build clean clobber
make/common/Demo.gmk
浏览文件 @ e1a13723
...@@ -25,6 +25,8 @@ ...@@ -25,6 +25,8 @@
# JDK Demo building jar file. # JDK Demo building jar file.
MODULE = demos
# Some names are defined with LIBRARY inside the Defs.gmk file # Some names are defined with LIBRARY inside the Defs.gmk file
LIBRARY=$(DEMONAME) LIBRARY=$(DEMONAME)
OBJDIR=$(TEMPDIR)/$(DEMONAME) OBJDIR=$(TEMPDIR)/$(DEMONAME)
......
make/common/Library.gmk
浏览文件 @ e1a13723
...@@ -193,9 +193,18 @@ ifdef MT ...@@ -193,9 +193,18 @@ ifdef MT
$(MT) /manifest $(OBJDIR)/$(@F).manifest /outputresource:$(OBJDIR)/$(@F);#2 $(MT) /manifest $(OBJDIR)/$(@F).manifest /outputresource:$(OBJDIR)/$(@F);#2
endif endif
$(CP) $(OBJDIR)/$(@F) $@ $(CP) $(OBJDIR)/$(@F) $@
$(install-module-file)
$(CP) $(OBJDIR)/$(LIBRARY).map $(@D) $(CP) $(OBJDIR)/$(LIBRARY).map $(@D)
$(CP) $(OBJDIR)/$(LIBRARY).pdb $(@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 endif # LIBRARY
$(OBJDIR)/$(LIBRARY).lcf: $(OBJDIR)/$(LIBRARY).res $(COMPILE_FILES_o) $(FILES_m) $(OBJDIR)/$(LIBRARY).lcf: $(OBJDIR)/$(LIBRARY).res $(COMPILE_FILES_o) $(FILES_m)
...@@ -250,6 +259,7 @@ ifeq ($(LIBRARY), fdlibm) ...@@ -250,6 +259,7 @@ ifeq ($(LIBRARY), fdlibm)
$(AR) -r $@ $(FILES_o) $(AR) -r $@ $(FILES_o)
else # LIBRARY else # LIBRARY
$(LINKER) $(SHARED_LIBRARY_FLAG) -o $@ $(FILES_o) $(LDLIBS) $(LINKER) $(SHARED_LIBRARY_FLAG) -o $@ $(FILES_o) $(LDLIBS)
$(install-module-file)
ifeq ($(WRITE_LIBVERSION),true) ifeq ($(WRITE_LIBVERSION),true)
$(MCS) -d -a "$(FULL_VERSION)" $@ $(MCS) -d -a "$(FULL_VERSION)" $@
endif # WRITE_LIBVERSION endif # WRITE_LIBVERSION
...@@ -353,5 +363,7 @@ fastdebug: ...@@ -353,5 +363,7 @@ fastdebug:
openjdk: openjdk:
$(MAKE) OPENJDK=true build $(MAKE) OPENJDK=true build
FORCE:
.PHONY: all build debug fastdebug .PHONY: all build debug fastdebug
make/common/Modules.gmk
浏览文件 @ e1a13723
...@@ -34,12 +34,10 @@ JRE_MODULE_IMAGE_DIR = $(ABS_OUTPUTDIR)/jre-module-image ...@@ -34,12 +34,10 @@ JRE_MODULE_IMAGE_DIR = $(ABS_OUTPUTDIR)/jre-module-image
# #
# Open issues that need further investigation: # Open issues that need further investigation:
# 1. Classes in jre/lib/ext/dnsns.jar are currently put in jre/lib/jndi-dns # 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 # 2. Signed jars
# For JDK build, signed jars are copied to the build. # For JDK build, signed jars are copied to the build.
# All jars in the module image are unsigned. # 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 MODULE_IMAGEBINDIR = bin
...@@ -63,7 +61,8 @@ process-module-image-jre process-module-image-jdk :: ...@@ -63,7 +61,8 @@ process-module-image-jre process-module-image-jdk ::
@$(ECHO) ">>>Making "$@" @ `$(DATE)` ..." @$(ECHO) ">>>Making "$@" @ `$(DATE)` ..."
# Order is important here, trim jre after jdk image is created # 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) \ $(INITIAL_MODULE_IMAGE_JRE) $(INITIAL_MODULE_IMAGE_JDK) \
trim-module-image-jre trim-module-image-jdk \ trim-module-image-jre trim-module-image-jdk \
process-module-image-jre process-module-image-jdk process-module-image-jre process-module-image-jdk
...@@ -124,6 +123,33 @@ endif ...@@ -124,6 +123,33 @@ endif
MODULES_TEMPDIR=$(ABS_TEMPDIR)/modules MODULES_TEMPDIR=$(ABS_TEMPDIR)/modules
MODULES_LIB = $(ABS_OUTPUTDIR)/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: gen-modules:
$(CD) modules; $(MAKE) all $(CD) modules; $(MAKE) all
...@@ -151,7 +177,6 @@ initial-module-image-jre-sol64:: initial-module-image-jre-setup \ ...@@ -151,7 +177,6 @@ initial-module-image-jre-sol64:: initial-module-image-jre-setup \
# Construct an initial jre image (initial jdk jre) no trimming or stripping # Construct an initial jre image (initial jdk jre) no trimming or stripping
initial-module-image-jre:: initial-module-image-jre-setup \ initial-module-image-jre:: initial-module-image-jre-setup \
$(JRE_LICENSES) $(JRE_MODULE_DOCFILES) \ $(JRE_LICENSES) $(JRE_MODULE_DOCFILES) \
gen-modules \
$(BUILDMETAINDEX_JARFILE) $(BUILDMETAINDEX_JARFILE)
@# Copy in bin directory @# Copy in bin directory
$(CD) $(OUTPUTDIR) && $(FIND) bin -depth | $(CPIO) -pdum $(JRE_MODULE_IMAGE_DIR) $(CD) $(OUTPUTDIR) && $(FIND) bin -depth | $(CPIO) -pdum $(JRE_MODULE_IMAGE_DIR)
...@@ -162,7 +187,21 @@ initial-module-image-jre:: initial-module-image-jre-setup \ ...@@ -162,7 +187,21 @@ initial-module-image-jre:: initial-module-image-jre-setup \
@# @#
@# copy modules to jre/lib @# 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 @# Make sure all directories are read/execute for everyone
$(CHMOD) a+rx `$(FIND) $(JRE_MODULE_IMAGE_DIR) -type d` $(CHMOD) a+rx `$(FIND) $(JRE_MODULE_IMAGE_DIR) -type d`
@# Remove some files from the jre area @# Remove some files from the jre area
...@@ -304,7 +343,9 @@ initial-module-image-jdk:: initial-module-image-jdk-setup \ ...@@ -304,7 +343,9 @@ initial-module-image-jdk:: initial-module-image-jdk-setup \
@# copy jdk modules to jdk/lib @# copy jdk modules to jdk/lib
@# @#
$(MKDIR) -p $(JDK_MODULE_IMAGE_DIR)/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) ifeq ($(PLATFORM), windows)
@# @#
@# lib/ @# lib/
......
make/common/Program.gmk
浏览文件 @ e1a13723
...@@ -50,8 +50,6 @@ ACTUAL_PROGRAM_NAME = $(PROGRAM)$(EXE_SUFFIX) ...@@ -50,8 +50,6 @@ ACTUAL_PROGRAM_NAME = $(PROGRAM)$(EXE_SUFFIX)
ACTUAL_PROGRAM_DIR = $(BINDIR) ACTUAL_PROGRAM_DIR = $(BINDIR)
ACTUAL_PROGRAM = $(ACTUAL_PROGRAM_DIR)/$(ACTUAL_PROGRAM_NAME) ACTUAL_PROGRAM = $(ACTUAL_PROGRAM_DIR)/$(ACTUAL_PROGRAM_NAME)
JVMCFG = $(LIBDIR)/$(LIBARCH)/jvm.cfg
# Make sure the default rule is all # Make sure the default rule is all
program_default_rule: all program_default_rule: all
...@@ -116,7 +114,7 @@ endif ...@@ -116,7 +114,7 @@ endif
ifeq ($(COMPILE_IT),true) ifeq ($(COMPILE_IT),true)
$(ACTUAL_PROGRAM):: classes $(JVMCFG) $(INIT) $(ACTUAL_PROGRAM):: classes $(INIT)
# #
# Windows only # Windows only
...@@ -190,12 +188,13 @@ $(ACTUAL_PROGRAM):: $(FILES_o) ...@@ -190,12 +188,13 @@ $(ACTUAL_PROGRAM):: $(FILES_o)
@$(MKDIR) -p $(TEMPDIR) @$(MKDIR) -p $(TEMPDIR)
$(LINK_PRE_CMD) $(CC) $(CC_OBJECT_OUTPUT_FLAG)$@ $(LDFLAGS) \ $(LINK_PRE_CMD) $(CC) $(CC_OBJECT_OUTPUT_FLAG)$@ $(LDFLAGS) \
$(FILES_o) $(THREADLIBS) $(LDLIBS) $(FILES_o) $(THREADLIBS) $(LDLIBS)
$(install-module-file)
endif # PLATFORM endif # PLATFORM
else # COMPILE_IT else # COMPILE_IT
$(ACTUAL_PROGRAM):: $(JVMCFG) $(ACTUAL_PROGRAM)::
# Copies in the file from the JDK_IMPORT_PATH area # Copies in the file from the JDK_IMPORT_PATH area
$(ACTUAL_PROGRAM_DIR)/%: $(JDK_IMPORT_PATH)/jre/bin/% $(ACTUAL_PROGRAM_DIR)/%: $(JDK_IMPORT_PATH)/jre/bin/%
...@@ -271,18 +270,6 @@ $(OBJDIR)/main.$(OBJECT_SUFFIX): $(LAUNCHER_SHARE_SRC)/bin/main.c ...@@ -271,18 +270,6 @@ $(OBJDIR)/main.$(OBJECT_SUFFIX): $(LAUNCHER_SHARE_SRC)/bin/main.c
$(COMPILE.c) $(CC_OBJECT_OUTPUT_FLAG)$(OBJDIR)/main.$(OBJECT_SUFFIX) \ $(COMPILE.c) $(CC_OBJECT_OUTPUT_FLAG)$(OBJDIR)/main.$(OBJECT_SUFFIX) \
$(VERSION_DEFINES) $< $(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 # Default dependencies
# #
......
make/common/internal/BinaryPlugs.gmk
浏览文件 @ e1a13723
...@@ -116,7 +116,7 @@ PLUG_IMPORT_JARFILE=$(BINARY_PLUGS_JARFILE) ...@@ -116,7 +116,7 @@ PLUG_IMPORT_JARFILE=$(BINARY_PLUGS_JARFILE)
define import-binary-plug-file define import-binary-plug-file
@$(ECHO) "PLUG IMPORT: $(@F)" @$(ECHO) "PLUG IMPORT: $(@F)"
$(install-file) $(install-non-module-file)
endef # import-binary-plug-file endef # import-binary-plug-file
# Import classes command # Import classes command
...@@ -184,7 +184,7 @@ PLUG_EXPORT_JARFILE=$(PLUG_EXPORT_DIR)/jre/lib/$(BINARY_PLUGS_JARNAME) ...@@ -184,7 +184,7 @@ PLUG_EXPORT_JARFILE=$(PLUG_EXPORT_DIR)/jre/lib/$(BINARY_PLUGS_JARNAME)
define export-binary-plug-file define export-binary-plug-file
@$(ECHO) "PLUG EXPORT: $(@F)" @$(ECHO) "PLUG EXPORT: $(@F)"
$(install-file) $(install-non-module-file)
endef # export-binary-plug-file endef # export-binary-plug-file
# OpenJDK Binary Plug License # OpenJDK Binary Plug License
......
make/common/internal/Resources.gmk
浏览文件 @ e1a13723
...@@ -139,7 +139,7 @@ STRIP_PROP_FILES = $(PROPERTIES_FILES:%=$(CLASSDESTDIR)/%) ...@@ -139,7 +139,7 @@ STRIP_PROP_FILES = $(PROPERTIES_FILES:%=$(CLASSDESTDIR)/%)
STRIP_PROP_options=$(TEMPDIR)/strip_prop_options STRIP_PROP_options=$(TEMPDIR)/strip_prop_options
define install-properties-file define install-properties-file
$(install-file) $(install-file)
$(CHMOD) a+rw $@ $(call chmod-file, a+rw)
@$(ECHO) "# Adding to strip properties list: $@" @$(ECHO) "# Adding to strip properties list: $@"
$(ECHO) "$@" >> $(STRIP_PROP_options) $(ECHO) "$@" >> $(STRIP_PROP_options)
endef endef
......
make/common/shared/Sanity.gmk
浏览文件 @ e1a13723
...@@ -1117,7 +1117,7 @@ TMP_SDK_INCLUDE_GET_FULL_VERSION= $(TMP_SDK_INCLUDE_FIND_VERSION) | \ ...@@ -1117,7 +1117,7 @@ TMP_SDK_INCLUDE_GET_FULL_VERSION= $(TMP_SDK_INCLUDE_FIND_VERSION) | \
# be checked when this represents a full control build (i.e. the # be checked when this represents a full control build (i.e. the
# HOTSPOT_IMPORT_PATH includes these files in it's 'include' directory). # HOTSPOT_IMPORT_PATH includes these files in it's 'include' directory).
$(TEMPDIR)/%.h: $(SHARE_SRC)/javavm/export/%.h $(TEMPDIR)/%.h: $(SHARE_SRC)/javavm/export/%.h
@$(install-file) @$(install-non-module-file)
@$(RM) $@.IMPORT @$(RM) $@.IMPORT
@if [ -r $(HOTSPOT_IMPORT_PATH)/include/$(@F) ]; then \ @if [ -r $(HOTSPOT_IMPORT_PATH)/include/$(@F) ]; then \
$(CP) $(HOTSPOT_IMPORT_PATH)/include/$(@F) $@.IMPORT ; \ $(CP) $(HOTSPOT_IMPORT_PATH)/include/$(@F) $@.IMPORT ; \
...@@ -1131,7 +1131,7 @@ $(TEMPDIR)/%.h: $(SHARE_SRC)/javavm/export/%.h ...@@ -1131,7 +1131,7 @@ $(TEMPDIR)/%.h: $(SHARE_SRC)/javavm/export/%.h
fi fi
$(TEMPDIR)/%.h: $(PLATFORM_SRC)/javavm/export/%.h $(TEMPDIR)/%.h: $(PLATFORM_SRC)/javavm/export/%.h
@$(install-file) @$(install-non-module-file)
@$(RM) $@.IMPORT @$(RM) $@.IMPORT
@if [ -r $(HOTSPOT_IMPORT_PATH)/include/$(PLATFORM_INCLUDE_NAME)/$(@F) ]; then \ @if [ -r $(HOTSPOT_IMPORT_PATH)/include/$(PLATFORM_INCLUDE_NAME)/$(@F) ]; then \
$(CP) $(HOTSPOT_IMPORT_PATH)/include/$(PLATFORM_INCLUDE_NAME)/$(@F) $@.IMPORT ; \ $(CP) $(HOTSPOT_IMPORT_PATH)/include/$(PLATFORM_INCLUDE_NAME)/$(@F) $@.IMPORT ; \
......
make/java/awt/Makefile
浏览文件 @ e1a13723
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
# #
BUILDDIR = ../.. BUILDDIR = ../..
MODULE = awt
PACKAGE = java.awt PACKAGE = java.awt
PRODUCT = sun PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk include $(BUILDDIR)/common/Defs.gmk
......
make/java/fdlibm/Makefile
浏览文件 @ e1a13723
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
# #
BUILDDIR = ../.. BUILDDIR = ../..
MODULE = base
LIBRARY = fdlibm LIBRARY = fdlibm
PRODUCT = java PRODUCT = java
......
make/java/hpi/native/Makefile
浏览文件 @ e1a13723
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
# #
BUILDDIR = ../../.. BUILDDIR = ../../..
MODULE = base
LIBRARY = hpi LIBRARY = hpi
PRODUCT = java PRODUCT = java
THREADDIR = native_threads THREADDIR = native_threads
......
make/java/hpi/windows/Makefile
浏览文件 @ e1a13723
...@@ -26,8 +26,9 @@ ...@@ -26,8 +26,9 @@
# #
# Makefile for Windows HPI DLL # Makefile for Windows HPI DLL
# #
BUILDDIR = ../../.. BUILDDIR = ../../..
LIBRARY = hpi MODULE = base
LIBRARY = hpi
PRODUCT = java PRODUCT = java
THREADDIR = windows_threads THREADDIR = windows_threads
LIB_LOCATION = $(BINDIR) LIB_LOCATION = $(BINDIR)
......
make/java/instrument/Makefile
浏览文件 @ e1a13723
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
# agent, supporting java.lang.instrument # agent, supporting java.lang.instrument
BUILDDIR = ../.. BUILDDIR = ../..
MODULE = instrument
PACKAGE = sun.instrument PACKAGE = sun.instrument
LIBRARY = instrument LIBRARY = instrument
PRODUCT = sun PRODUCT = sun
......
make/java/java/Makefile
浏览文件 @ e1a13723
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
# #
BUILDDIR = ../.. BUILDDIR = ../..
MODULE = base
PACKAGE = java.lang PACKAGE = java.lang
LIBRARY = java LIBRARY = java
PRODUCT = java PRODUCT = java
...@@ -241,7 +242,7 @@ ifneq ($(PLATFORM),windows) ...@@ -241,7 +242,7 @@ ifneq ($(PLATFORM),windows)
$(GENSRCDIR)/java/lang/UNIXProcess.java: \ $(GENSRCDIR)/java/lang/UNIXProcess.java: \
$(PLATFORM_SRC)/classes/java/lang/UNIXProcess.java.$(PLATFORM) $(PLATFORM_SRC)/classes/java/lang/UNIXProcess.java.$(PLATFORM)
$(install-file) $(install-non-module-file)
clean:: clean::
$(RM) $(GENSRCDIR)/java/lang/UNIXProcess.java $(RM) $(GENSRCDIR)/java/lang/UNIXProcess.java
...@@ -285,7 +286,7 @@ TZMAPFILE = $(PLATFORM_SRC)/lib/tzmappings ...@@ -285,7 +286,7 @@ TZMAPFILE = $(PLATFORM_SRC)/lib/tzmappings
$(TZMAP): $(TZMAPFILE) $(TZMAP): $(TZMAPFILE)
$(install-file) $(install-file)
$(CHMOD) 444 $@ $(call chmod-file, 444)
endif endif
build: $(LIBDIR)/$(PROPS) $(LIBDIR)/$(CAL_PROPS) $(TZMAP) build: $(LIBDIR)/$(PROPS) $(LIBDIR)/$(CAL_PROPS) $(TZMAP)
...@@ -315,7 +316,8 @@ $(CURDATA): \ ...@@ -315,7 +316,8 @@ $(CURDATA): \
$(BOOT_JAVA_CMD) -jar $(GENERATECURRENCYDATA_JARFILE) -o $@.temp \ $(BOOT_JAVA_CMD) -jar $(GENERATECURRENCYDATA_JARFILE) -o $@.temp \
< $(SHARE_SRC)/classes/java/util/CurrencyData.properties < $(SHARE_SRC)/classes/java/util/CurrencyData.properties
$(MV) $@.temp $@ $(MV) $@.temp $@
$(CHMOD) 444 $@ $(install-module-file)
$(call chmod-file, 444)
clean:: clean::
$(RM) $(CURDATA) $(RM) $(CURDATA)
...@@ -369,7 +371,7 @@ $(GENSRCDIR)/java/lang/CharacterDataLatin1.java \ ...@@ -369,7 +371,7 @@ $(GENSRCDIR)/java/lang/CharacterDataLatin1.java \
-usecharforbyte 11 4 1 -usecharforbyte 11 4 1
$(GENSRCDIR)/java/lang/%.java : $(CHARACTERDATA)/%.java.template $(GENSRCDIR)/java/lang/%.java : $(CHARACTERDATA)/%.java.template
$(install-file) $(install-non-module-file)
clean:: clean::
$(RM) $(GENSRCDIR)/java/lang/CharacterDataLatin1.java $(RM) $(GENSRCDIR)/java/lang/CharacterDataLatin1.java
......
make/java/java_crw_demo/Makefile
浏览文件 @ e1a13723
...@@ -24,6 +24,8 @@ ...@@ -24,6 +24,8 @@
# #
BUILDDIR = ../.. BUILDDIR = ../..
MODULE = demos
LIBRARY = java_crw_demo LIBRARY = java_crw_demo
PRODUCT = sun PRODUCT = sun
LIBRARY_OUTPUT = java_crw_demo LIBRARY_OUTPUT = java_crw_demo
......
make/java/java_hprof_demo/Makefile
浏览文件 @ e1a13723
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
# #
BUILDDIR = ../.. BUILDDIR = ../..
MODULE = instrument
LIBRARY = hprof LIBRARY = hprof
PRODUCT = sun PRODUCT = sun
LIBRARY_OUTPUT = hprof_jvmti LIBRARY_OUTPUT = hprof_jvmti
......
make/java/jli/Makefile
浏览文件 @ e1a13723
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
# its manifestations (java, javaw, javac, ...). # its manifestations (java, javaw, javac, ...).
# #
BUILDDIR = ../.. BUILDDIR = ../..
MODULE = base
LIBRARY = jli LIBRARY = jli
PRODUCT = java PRODUCT = java
......
make/java/jvm/Makefile
浏览文件 @ e1a13723
...@@ -24,6 +24,8 @@ ...@@ -24,6 +24,8 @@
# #
BUILDDIR = ../.. BUILDDIR = ../..
MODULE = base
include $(BUILDDIR)/common/Defs.gmk include $(BUILDDIR)/common/Defs.gmk
# #
...@@ -36,15 +38,29 @@ FILES_h = $(INCLUDEDIR)/jni.h \ ...@@ -36,15 +38,29 @@ FILES_h = $(INCLUDEDIR)/jni.h \
$(INCLUDEDIR)/classfile_constants.h $(INCLUDEDIR)/classfile_constants.h
$(INCLUDEDIR)/%.h: $(SHARE_SRC)/javavm/export/%.h $(INCLUDEDIR)/%.h: $(SHARE_SRC)/javavm/export/%.h
$(install-file) $(install-non-module-file)
$(PLATFORM_INCLUDE)/%.h: $(PLATFORM_SRC)/javavm/export/%.h $(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) $(install-file)
all: build all: build
build: $(FILES_h) build: $(FILES_h) $(JVMCFG)
clean clobber:: clean clobber::
$(RM) $(FILES_h) $(RM) $(FILES_h) $(JVMCFG)
make/java/logging/Makefile
浏览文件 @ e1a13723
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
# #
BUILDDIR = ../.. BUILDDIR = ../..
MODULE = logging
PACKAGE = java.util.logging PACKAGE = java.util.logging
PRODUCT = java PRODUCT = java
include $(BUILDDIR)/common/Defs.gmk include $(BUILDDIR)/common/Defs.gmk
......
make/java/main/java/Makefile
浏览文件 @ e1a13723
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
# #
BUILDDIR = ../../.. BUILDDIR = ../../..
MODULE = base
PROGRAM = java PROGRAM = java
PRODUCT = java PRODUCT = java
......
make/java/main/javaw/Makefile
浏览文件 @ e1a13723
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
# #
BUILDDIR = ../../.. BUILDDIR = ../../..
MODULE = base
PROGRAM = javaw PROGRAM = javaw
PRODUCT = java PRODUCT = java
......
make/java/management/Makefile
浏览文件 @ e1a13723
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
# #
BUILDDIR = ../.. BUILDDIR = ../..
MODULE = management
PACKAGE = java.lang.management PACKAGE = java.lang.management
LIBRARY = management LIBRARY = management
PRODUCT = java PRODUCT = java
...@@ -99,7 +100,7 @@ $(AGENTJAR): $(LIBDIR) $(TEMPDIR)/manifest ...@@ -99,7 +100,7 @@ $(AGENTJAR): $(LIBDIR) $(TEMPDIR)/manifest
@$(java-vm-cleanup) @$(java-vm-cleanup)
$(TEMPDIR)/manifest: $(MANIFEST) $(TEMPDIR)/manifest: $(MANIFEST)
$(install-file) $(install-manifest-file)
build: $(AGENTJAR) build: $(AGENTJAR)
......
make/java/net/Makefile
浏览文件 @ e1a13723
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
# #
BUILDDIR = ../.. BUILDDIR = ../..
MODULE = base
PACKAGE = java.net PACKAGE = java.net
LIBRARY = net LIBRARY = net
PRODUCT = sun PRODUCT = sun
...@@ -111,8 +112,7 @@ LOCALE_SET_DEFINITION = jre ...@@ -111,8 +112,7 @@ LOCALE_SET_DEFINITION = jre
MISC_FILES = $(LIBDIR) $(LIBDIR)/net.properties MISC_FILES = $(LIBDIR) $(LIBDIR)/net.properties
$(LIBDIR)/net.properties: $(SHARE_SRC)/lib/net.properties $(LIBDIR)/net.properties: $(SHARE_SRC)/lib/net.properties
@$(RM) $@ $(install-file)
$(CP) $< $@
# #
# SDP configuration template # SDP configuration template
......
make/java/nio/Makefile
浏览文件 @ e1a13723
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
# #
BUILDDIR = ../.. BUILDDIR = ../..
MODULE = nio
PACKAGE = java.nio PACKAGE = java.nio
LIBRARY = nio LIBRARY = nio
PRODUCT = java PRODUCT = java
...@@ -816,7 +817,7 @@ SOR_COPYRIGHT_YEARS = $(shell $(CAT) $(GENSOR_SRC) | \ ...@@ -816,7 +817,7 @@ SOR_COPYRIGHT_YEARS = $(shell $(CAT) $(GENSOR_SRC) | \
$(NAWK) '/^.*Copyright.*Sun/ { print $$3 }') $(NAWK) '/^.*Copyright.*Sun/ { print $$3 }')
$(TEMPDIR)/$(GENSOR_SRC) : $(GENSOR_SRC) $(TEMPDIR)/$(GENSOR_SRC) : $(GENSOR_SRC)
$(install-file) $(install-non-module-file)
$(GENSOR_EXE) : $(TEMPDIR)/$(GENSOR_SRC) $(GENSOR_EXE) : $(TEMPDIR)/$(GENSOR_SRC)
$(prep-target) $(prep-target)
......
make/java/npt/Makefile
浏览文件 @ e1a13723
...@@ -24,6 +24,9 @@ ...@@ -24,6 +24,9 @@
# #
BUILDDIR = ../.. BUILDDIR = ../..
# It's currently used by jpda and hprof. Put it in base module for now.
MODULE = base
LIBRARY = npt LIBRARY = npt
PRODUCT = sun PRODUCT = sun
LIBRARY_OUTPUT = npt LIBRARY_OUTPUT = npt
......
make/java/redist/Makefile
浏览文件 @ e1a13723
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
# #
BUILDDIR = ../.. BUILDDIR = ../..
MODULE = base
PRODUCT = java PRODUCT = java
include $(BUILDDIR)/common/Defs.gmk include $(BUILDDIR)/common/Defs.gmk
...@@ -61,7 +62,11 @@ CLASSSHARINGDATA_DIR = $(BUILDDIR)/tools/sharing ...@@ -61,7 +62,11 @@ CLASSSHARINGDATA_DIR = $(BUILDDIR)/tools/sharing
# Needed to do file copy # Needed to do file copy
ABS_BUILDDIR :=$(call FullPath,$(BUILDDIR)) 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) # List of files created here or coming from BUILDDIR area (this workspace)
INTERNAL_IMPORT_LIST = $(LIBDIR)/classlist INTERNAL_IMPORT_LIST = $(LIBDIR)/classlist
...@@ -70,30 +75,6 @@ INTERNAL_IMPORT_LIST = $(LIBDIR)/classlist ...@@ -70,30 +75,6 @@ INTERNAL_IMPORT_LIST = $(LIBDIR)/classlist
IMPORT_LIST = $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVM_NAME) \ IMPORT_LIST = $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVM_NAME) \
$(LIB_LOCATION)/$(SERVER_LOCATION)/Xusage.txt $(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 # Hotspot client is only available on 32-bit non-Zero builds
ifneq ($(ZERO_BUILD), true) ifneq ($(ZERO_BUILD), true)
ifeq ($(ARCH_DATA_MODEL), 32) ifeq ($(ARCH_DATA_MODEL), 32)
...@@ -110,10 +91,10 @@ IMPORT_LIST += $(MS_RUNTIME_LIBRARIES:%=$(BINDIR)/%) ...@@ -110,10 +91,10 @@ IMPORT_LIST += $(MS_RUNTIME_LIBRARIES:%=$(BINDIR)/%)
# NOTE: These might actually come from BUILDDIR, depends on the settings. # NOTE: These might actually come from BUILDDIR, depends on the settings.
$(BINDIR)/msvcrt.dll: $(MSVCRT_DLL_PATH)/msvcrt.dll $(BINDIR)/msvcrt.dll: $(MSVCRT_DLL_PATH)/msvcrt.dll
$(install-import-file) $(install-import-file)
$(CHMOD) a+x $@ $(call chmod-file, a+x)
$(BINDIR)/$(MSVCRNN_DLL): $(MSVCRNN_DLL_PATH)/$(MSVCRNN_DLL) $(BINDIR)/$(MSVCRNN_DLL): $(MSVCRNN_DLL_PATH)/$(MSVCRNN_DLL)
$(install-import-file) $(install-import-file)
$(CHMOD) a+x $@ $(call chmod-file, a+x)
# Get the hotspot .map and .pdb files for client and server # Get the hotspot .map and .pdb files for client and server
IMPORT_LIST += \ IMPORT_LIST += \
...@@ -140,26 +121,32 @@ $(LIBDIR)/$(JVMLIB_NAME): $(HOTSPOT_LIB_PATH)/$(JVMLIB_NAME) ...@@ -140,26 +121,32 @@ $(LIBDIR)/$(JVMLIB_NAME): $(HOTSPOT_LIB_PATH)/$(JVMLIB_NAME)
$(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMMAP_NAME): $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMMAP_NAME):
@$(prep-target) @$(prep-target)
-$(CP) $(HOTSPOT_CLIENT_PATH)/$(JVMMAP_NAME) $@ -$(CP) $(HOTSPOT_CLIENT_PATH)/$(JVMMAP_NAME) $@
@$(install-module-file)
$(LIB_LOCATION)/$(KERNEL_LOCATION)/$(JVMMAP_NAME): $(LIB_LOCATION)/$(KERNEL_LOCATION)/$(JVMMAP_NAME):
@$(prep-target) @$(prep-target)
-$(CP) $(HOTSPOT_KERNEL_PATH)/$(JVMMAP_NAME) $@ -$(CP) $(HOTSPOT_KERNEL_PATH)/$(JVMMAP_NAME) $@
@$(install-module-file)
$(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMMAP_NAME): $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMMAP_NAME):
@$(prep-target) @$(prep-target)
-$(CP) $(HOTSPOT_SERVER_PATH)/$(JVMMAP_NAME) $@ -$(CP) $(HOTSPOT_SERVER_PATH)/$(JVMMAP_NAME) $@
@$(install-module-file)
$(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMPDB_NAME): $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMPDB_NAME):
@$(prep-target) @$(prep-target)
-$(CP) $(HOTSPOT_CLIENT_PATH)/$(JVMPDB_NAME) $@ -$(CP) $(HOTSPOT_CLIENT_PATH)/$(JVMPDB_NAME) $@
@$(install-module-file)
$(LIB_LOCATION)/$(KERNEL_LOCATION)/$(JVMPDB_NAME): $(LIB_LOCATION)/$(KERNEL_LOCATION)/$(JVMPDB_NAME):
@$(prep-target) @$(prep-target)
-$(CP) $(HOTSPOT_KERNEL_PATH)/$(JVMPDB_NAME) $@ -$(CP) $(HOTSPOT_KERNEL_PATH)/$(JVMPDB_NAME) $@
@$(install-module-file)
$(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMPDB_NAME): $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMPDB_NAME):
@$(prep-target) @$(prep-target)
-$(CP) $(HOTSPOT_SERVER_PATH)/$(JVMPDB_NAME) $@ -$(CP) $(HOTSPOT_SERVER_PATH)/$(JVMPDB_NAME) $@
@$(install-module-file)
# Windows ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Windows # Windows ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Windows
else # PLATFORM else # PLATFORM
...@@ -220,7 +207,7 @@ $(LIB_LOCATION)/$(LIBJSIG_NAME): $(HOTSPOT_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/$(LIBJ ...@@ -220,7 +207,7 @@ $(LIB_LOCATION)/$(LIBJSIG_NAME): $(HOTSPOT_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/$(LIBJ
$(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_NAME) \ $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_NAME) \
$(LIB_LOCATION)/$(SERVER_LOCATION)/$(LIBJSIG_NAME): $(LIB_LOCATION)/$(SERVER_LOCATION)/$(LIBJSIG_NAME):
@$(prep-target) @$(prep-target)
$(LN) -s ../$(LIBJSIG_NAME) $@ $(call install-sym-link, ../$(LIBJSIG_NAME))
$(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMDB_NAME): $(HOTSPOT_CLIENT_PATH)/$(JVMDB_NAME) $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMDB_NAME): $(HOTSPOT_CLIENT_PATH)/$(JVMDB_NAME)
$(install-import-file) $(install-import-file)
...@@ -246,28 +233,6 @@ $(LIB_LOCATION)/$(CLIENT_LOCATION)/Xusage.txt : $(HOTSPOT_CLIENT_PATH)/Xusage.tx ...@@ -246,28 +233,6 @@ $(LIB_LOCATION)/$(CLIENT_LOCATION)/Xusage.txt : $(HOTSPOT_CLIENT_PATH)/Xusage.tx
$(LIB_LOCATION)/$(KERNEL_LOCATION)/Xusage.txt : $(HOTSPOT_KERNEL_PATH)/Xusage.txt $(LIB_LOCATION)/$(KERNEL_LOCATION)/Xusage.txt : $(HOTSPOT_KERNEL_PATH)/Xusage.txt
$(install-file) $(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 # Specific to OpenJDK building
# #
...@@ -288,7 +253,7 @@ INTERNAL_IMPORT_LIST += \ ...@@ -288,7 +253,7 @@ INTERNAL_IMPORT_LIST += \
$(LIBDIR)/jce.jar: \ $(LIBDIR)/jce.jar: \
$(BUILDDIR)/closed/tools/crypto/jce/jce.jar $(BUILDDIR)/closed/tools/crypto/jce/jce.jar
$(install-file) $(install-non-module-file)
$(LIBDIR)/security/US_export_policy.jar: \ $(LIBDIR)/security/US_export_policy.jar: \
$(BUILDDIR)/closed/tools/crypto/jce/US_export_policy.jar $(BUILDDIR)/closed/tools/crypto/jce/US_export_policy.jar
$(install-file) $(install-file)
...@@ -310,46 +275,6 @@ $(LIBDIR)/classlist: \ ...@@ -310,46 +275,6 @@ $(LIBDIR)/classlist: \
$(CLASSSHARINGDATA_DIR)/classlist.$(PLATFORM) $@.temp $(CLASSSHARINGDATA_DIR)/classlist.$(PLATFORM) $@.temp
$(MV) $@.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 (ones that are stashed in this source tree)
import_internal_files : $(INTERNAL_IMPORT_LIST) import_internal_files : $(INTERNAL_IMPORT_LIST)
......
make/java/redist/FILES.gmk → make/java/redist/fonts/Makefile
浏览文件 @ e1a13723
# #
# Copyright 1998-2003 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. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# #
# This code is free software; you can redistribute it and/or modify it # This code is free software; you can redistribute it and/or modify it
...@@ -23,6 +23,12 @@ ...@@ -23,6 +23,12 @@
# have any questions. # have any questions.
# #
BUILDDIR = ../../..
MODULE = font
PRODUCT = java
include $(BUILDDIR)/common/Defs.gmk
# #
# List of lucida font files that we redistribute. # List of lucida font files that we redistribute.
# #
...@@ -54,3 +60,52 @@ OBLIQUE_FONTFILES = \ ...@@ -54,3 +60,52 @@ OBLIQUE_FONTFILES = \
$(LIBDIR)/oblique-fonts/LucidaSansDemiOblique.ttf \ $(LIBDIR)/oblique-fonts/LucidaSansDemiOblique.ttf \
endif 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
make/java/redist/sajdi/Makefile 0 → 100644
浏览文件 @ e1a13723
#
# 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::
make/java/security/Makefile
浏览文件 @ e1a13723
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
# #
BUILDDIR = ../.. BUILDDIR = ../..
MODULE = base
PACKAGE = java.security PACKAGE = java.security
PRODUCT = sun PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk include $(BUILDDIR)/common/Defs.gmk
...@@ -38,11 +39,9 @@ AUTO_FILES_JAVA_DIRS = java/security ...@@ -38,11 +39,9 @@ AUTO_FILES_JAVA_DIRS = java/security
# #
PROPS_SRC = $(TOPDIR)/src/share/lib/security/java.security PROPS_SRC = $(TOPDIR)/src/share/lib/security/java.security
SUNPKCS11 =
ifeq ($(PLATFORM), solaris) ifeq ($(PLATFORM), solaris)
PROPS_SRC = $(TOPDIR)/src/share/lib/security/java.security-solaris PROPS_SRC = $(TOPDIR)/src/share/lib/security/java.security-solaris
SUNPKCS11 = sunpkcs11
else # PLATFORM else # PLATFORM
...@@ -57,9 +56,6 @@ endif # PLATFORM ...@@ -57,9 +56,6 @@ endif # PLATFORM
PROPS_BUILD = $(LIBDIR)/security/java.security 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_SRC = $(TOPDIR)/src/share/lib/security/java.policy
POLICY_BUILD = $(LIBDIR)/security/java.policy POLICY_BUILD = $(LIBDIR)/security/java.policy
...@@ -73,14 +69,12 @@ FILES_class = $(FILES_java:%.java=$(CLASSBINDIR)/%.class) ...@@ -73,14 +69,12 @@ FILES_class = $(FILES_java:%.java=$(CLASSBINDIR)/%.class)
# #
include $(BUILDDIR)/common/Rules.gmk include $(BUILDDIR)/common/Rules.gmk
build: properties $(SUNPKCS11) policy cacerts build: properties policy cacerts
install: all install: all
properties: classes $(PROPS_BUILD) properties: classes $(PROPS_BUILD)
sunpkcs11: classes $(SUNPKCS11_BUILD)
policy: classes $(POLICY_BUILD) policy: classes $(POLICY_BUILD)
cacerts: classes $(CACERTS_BUILD) cacerts: classes $(CACERTS_BUILD)
...@@ -88,9 +82,6 @@ cacerts: classes $(CACERTS_BUILD) ...@@ -88,9 +82,6 @@ cacerts: classes $(CACERTS_BUILD)
$(PROPS_BUILD): $(PROPS_SRC) $(PROPS_BUILD): $(PROPS_SRC)
$(install-file) $(install-file)
$(SUNPKCS11_BUILD): $(SUNPKCS11_SRC)
$(install-file)
$(POLICY_BUILD): $(POLICY_SRC) $(POLICY_BUILD): $(POLICY_SRC)
$(install-file) $(install-file)
...@@ -99,7 +90,7 @@ $(CACERTS_BUILD): $(CACERTS_SRC) ...@@ -99,7 +90,7 @@ $(CACERTS_BUILD): $(CACERTS_SRC)
clean clobber:: .delete.classlist clean clobber:: .delete.classlist
$(RM) -r $(CLASSBINDIR)/java/security $(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 # Additional Rule for building sun.security.util
$(CLASSBINDIR)/%.class: $(SHARE_SRC)/sun/%.java $(CLASSBINDIR)/%.class: $(SHARE_SRC)/sun/%.java
......
make/java/sql/Makefile
浏览文件 @ e1a13723
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
# #
BUILDDIR = ../.. BUILDDIR = ../..
MODULE = jdbc-base
PACKAGE = java.sql PACKAGE = java.sql
PRODUCT = sun PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk include $(BUILDDIR)/common/Defs.gmk
......
make/java/text/Makefile
浏览文件 @ e1a13723
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
# #
BUILDDIR = ../.. BUILDDIR = ../..
MODULE = base
PACKAGE = java.text PACKAGE = java.text
PRODUCT = sun PRODUCT = sun
......
make/java/verify/Makefile
浏览文件 @ e1a13723
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
# #
BUILDDIR = ../.. BUILDDIR = ../..
MODULE = base
PRODUCT = java PRODUCT = java
LIBRARY = verify LIBRARY = verify
include $(BUILDDIR)/common/Defs.gmk include $(BUILDDIR)/common/Defs.gmk
......
make/java/zip/Makefile
浏览文件 @ e1a13723
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
BUILDDIR = ../.. BUILDDIR = ../..
MODULE = base
PACKAGE = java.util.zip PACKAGE = java.util.zip
LIBRARY = zip LIBRARY = zip
PRODUCT = sun PRODUCT = sun
......
make/javax/crypto/Makefile
浏览文件 @ e1a13723
...@@ -108,6 +108,7 @@ ...@@ -108,6 +108,7 @@
# #
BUILDDIR = ../.. BUILDDIR = ../..
MODULE = base
PACKAGE = javax.crypto PACKAGE = javax.crypto
PRODUCT = sun PRODUCT = sun
...@@ -293,7 +294,7 @@ limited: \ ...@@ -293,7 +294,7 @@ limited: \
$(UNSIGNED_POLICY_BUILDDIR)/limited/US_export_policy.jar: \ $(UNSIGNED_POLICY_BUILDDIR)/limited/US_export_policy.jar: \
$(UNSIGNED_POLICY_BUILDDIR)/unlimited/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: \ $(UNSIGNED_POLICY_BUILDDIR)/limited/local_policy.jar: \
policy/limited/default_local.policy \ policy/limited/default_local.policy \
...@@ -414,7 +415,7 @@ $(JAR_DESTFILE): $(UNSIGNED_DIR)/jce.jar ...@@ -414,7 +415,7 @@ $(JAR_DESTFILE): $(UNSIGNED_DIR)/jce.jar
else else
$(JAR_DESTFILE): $(SIGNED_DIR)/jce.jar $(JAR_DESTFILE): $(SIGNED_DIR)/jce.jar
endif endif
$(install-file) $(install-non-module-file)
# #
# Install the appropriate policy file, depending on the type of build. # Install the appropriate policy file, depending on the type of build.
...@@ -425,7 +426,7 @@ else ...@@ -425,7 +426,7 @@ else
INSTALL_POLICYDIR = $(SIGNED_POLICY_BUILDDIR) INSTALL_POLICYDIR = $(SIGNED_POLICY_BUILDDIR)
endif endif
install-limited: \ install-limited-jars: \
$(INSTALL_POLICYDIR)/limited/US_export_policy.jar \ $(INSTALL_POLICYDIR)/limited/US_export_policy.jar \
$(INSTALL_POLICYDIR)/limited/local_policy.jar $(INSTALL_POLICYDIR)/limited/local_policy.jar
$(MKDIR) -p $(POLICY_DESTDIR) $(MKDIR) -p $(POLICY_DESTDIR)
...@@ -433,24 +434,28 @@ install-limited: \ ...@@ -433,24 +434,28 @@ install-limited: \
$(POLICY_DESTDIR)/US_export_policy.jar \ $(POLICY_DESTDIR)/US_export_policy.jar \
$(POLICY_DESTDIR)/local_policy.jar $(POLICY_DESTDIR)/local_policy.jar
$(CP) $^ $(POLICY_DESTDIR) $(CP) $^ $(POLICY_DESTDIR)
install-limited: install-limited-jars install-module-files
ifndef OPENJDK ifndef OPENJDK
$(release-warning) $(release-warning)
endif endif
install-unlimited: \ install-unlimited-jars: \
$(INSTALL_POLICYDIR)/unlimited/US_export_policy.jar \ $(INSTALL_POLICYDIR)/unlimited/US_export_policy.jar \
$(INSTALL_POLICYDIR)/unlimited/local_policy.jar $(INSTALL_POLICYDIR)/unlimited/local_policy.jar
$(MKDIR) -p $(POLICY_DESTDIR) $(MKDIR) -p $(POLICY_DESTDIR)
$(RM) \ $(RM) \
$(POLICY_DESTDIR)/US_export_policy.jar \ $(POLICY_DESTDIR)/US_export_policy.jar \
$(POLICY_DESTDIR)/local_policy.jar $(POLICY_DESTDIR)/local_policy.jar
$(CP) $^ $(POLICY_DESTDIR) $(CP) $^ $(POLICY_DESTDIR)
install-unlimited: install-unlimited-jars install-module-files
ifndef OPENJDK ifndef OPENJDK
$(release-warning) $(release-warning)
endif endif
ifndef OPENJDK ifndef OPENJDK
install-prebuilt: install-prebuilt-jars:
@$(ECHO) "\n>>>Installing prebuilt JCE framework..." @$(ECHO) "\n>>>Installing prebuilt JCE framework..."
$(RM) $(JAR_DESTFILE) \ $(RM) $(JAR_DESTFILE) \
$(POLICY_DESTDIR)/US_export_policy.jar \ $(POLICY_DESTDIR)/US_export_policy.jar \
...@@ -460,8 +465,16 @@ install-prebuilt: ...@@ -460,8 +465,16 @@ install-prebuilt:
$(PREBUILT_DIR)/jce/US_export_policy.jar \ $(PREBUILT_DIR)/jce/US_export_policy.jar \
$(PREBUILT_DIR)/jce/local_policy.jar \ $(PREBUILT_DIR)/jce/local_policy.jar \
$(POLICY_DESTDIR) $(POLICY_DESTDIR)
install-prebuilt: install-prebuilt-jars install-module-files
endif endif
install-module-files: \
$(POLICY_DESTDIR)/US_export_policy.jar \
$(POLICY_DESTDIR)/local_policy.jar
$(POLICY_DESTDIR)/%.jar :
$(install-module-file)
# ===================================================== # =====================================================
# Support routines. # Support routines.
......
make/javax/imageio/Makefile
浏览文件 @ e1a13723
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
# #
BUILDDIR = ../.. BUILDDIR = ../..
MODULE = imageio
PACKAGE = javax.imageio PACKAGE = javax.imageio
PRODUCT = jiio PRODUCT = jiio
include $(BUILDDIR)/common/Defs.gmk include $(BUILDDIR)/common/Defs.gmk
......
make/javax/print/Makefile
浏览文件 @ e1a13723
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
# #
BUILDDIR = ../.. BUILDDIR = ../..
MODULE = print
PACKAGE = javax.print PACKAGE = javax.print
PRODUCT = sun PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk include $(BUILDDIR)/common/Defs.gmk
......
make/javax/sound/Makefile
浏览文件 @ e1a13723
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
# WARNING: Make sure the OPENJDK plugs are up-to-date, see make/common/internal/BinaryPlugs.gmk # WARNING: Make sure the OPENJDK plugs are up-to-date, see make/common/internal/BinaryPlugs.gmk
BUILDDIR = ../.. BUILDDIR = ../..
MODULE = sound
PACKAGE = javax.sound PACKAGE = javax.sound
LIBRARY = jsound LIBRARY = jsound
PRODUCT = sun PRODUCT = sun
......
make/javax/sound/jsoundalsa/Makefile
浏览文件 @ e1a13723
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
# #
BUILDDIR = ../../.. BUILDDIR = ../../..
MODULE = sound
PACKAGE = javax.sound PACKAGE = javax.sound
LIBRARY = jsoundalsa LIBRARY = jsoundalsa
PRODUCT = sun PRODUCT = sun
......
make/javax/sound/jsoundds/Makefile
浏览文件 @ e1a13723
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
# #
BUILDDIR = ../../.. BUILDDIR = ../../..
MODULE = sound
PACKAGE = javax.sound PACKAGE = javax.sound
LIBRARY = jsoundds LIBRARY = jsoundds
PRODUCT = sun PRODUCT = sun
......
make/javax/sql/Makefile
浏览文件 @ e1a13723
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
# #
BUILDDIR = ../.. BUILDDIR = ../..
MODULE = jdbc-enterprise
PACKAGE = javax.sql PACKAGE = javax.sql
PRODUCT = sun PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk include $(BUILDDIR)/common/Defs.gmk
......
make/javax/swing/Makefile
浏览文件 @ e1a13723
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
# #
BUILDDIR = ../.. BUILDDIR = ../..
MODULE = swing
PACKAGE = javax.swing PACKAGE = javax.swing
PRODUCT = com PRODUCT = com
SWING_SRC = $(SHARE_SRC)/classes/javax/swing SWING_SRC = $(SHARE_SRC)/classes/javax/swing
......
make/javax/swing/plaf/Makefile
浏览文件 @ e1a13723
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
# #
BUILDDIR = ../../.. BUILDDIR = ../../..
MODULE = swing
PACKAGE = javax.swing.plaf PACKAGE = javax.swing.plaf
PRODUCT = com PRODUCT = com
SWING_SRC = $(SHARE_SRC)/classes/javax/swing SWING_SRC = $(SHARE_SRC)/classes/javax/swing
......
make/jpda/back/Makefile
浏览文件 @ e1a13723
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
# #
BUILDDIR = ../.. BUILDDIR = ../..
MODULE = debugging
LIBRARY = jdwp LIBRARY = jdwp
PRODUCT = jpda PRODUCT = jpda
......
make/jpda/transport/Makefile
浏览文件 @ e1a13723
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
# #
BUILDDIR = ../.. BUILDDIR = ../..
MODULE = debugging
PRODUCT = jpda PRODUCT = jpda
include $(BUILDDIR)/common/Defs.gmk include $(BUILDDIR)/common/Defs.gmk
......
make/jpda/transport/shmem/Makefile
浏览文件 @ e1a13723
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
# #
BUILDDIR = ../../.. BUILDDIR = ../../..
MODULE = debugging
LIBRARY = dt_shmem LIBRARY = dt_shmem
PRODUCT = jbug PRODUCT = jbug
......
make/jpda/transport/socket/Makefile
浏览文件 @ e1a13723
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
# #
BUILDDIR = ../../.. BUILDDIR = ../../..
MODULE = debugging
LIBRARY = dt_socket LIBRARY = dt_socket
PRODUCT = jbug PRODUCT = jbug
......
make/jpda/tty/Makefile
浏览文件 @ e1a13723
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
# #
BUILDDIR = ../.. BUILDDIR = ../..
MODULE = jdb
PACKAGE = com.sun.tools.example.debug.tty PACKAGE = com.sun.tools.example.debug.tty
PRODUCT = jpda PRODUCT = jpda
PROGRAM = jdb PROGRAM = jdb
......
make/launchers/Makefile
浏览文件 @ e1a13723
...@@ -28,33 +28,23 @@ ...@@ -28,33 +28,23 @@
# #
BUILDDIR = .. BUILDDIR = ..
MODULE = tools
PACKAGE = launchers PACKAGE = launchers
PRODUCT = sun PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk 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) # $(call make-launcher, name, mainclass, java-args, main-args)
define make-launcher define make-corba-launcher
$(CD) $(BUILDDIR)/launchers && \
$(MAKE) -f Makefile.launcher \ $(MAKE) -f Makefile.launcher \
PROGRAM=$(strip $1) \ MODULE=corba \
MAIN_CLASS=$(strip $2) \ PROGRAM=$(strip $1) \
MAIN_JAVA_ARGS="$(strip $3)" \ MAIN_CLASS=$(strip $2) \
MAIN_ARGS="$(strip $4)" $@ MAIN_JAVA_ARGS="$(strip $3)" \
MAIN_ARGS="$(strip $4)"
endef 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 # Run MAKE $@ for all generic launchers
define make-all-launchers define make-all-launchers
$(call make-launcher, appletviewer, sun.applet.Main, , ) $(call make-launcher, appletviewer, sun.applet.Main, , )
...@@ -85,36 +75,29 @@ $(call make-launcher, jstack, sun.tools.jstack.JStack, \ ...@@ -85,36 +75,29 @@ $(call make-launcher, jstack, sun.tools.jstack.JStack, \
-J-Dsun.jvm.hotspot.debugger.useWindbgDebugger, ) -J-Dsun.jvm.hotspot.debugger.useWindbgDebugger, )
$(call make-launcher, jstat, sun.tools.jstat.Jstat, , ) $(call make-launcher, jstat, sun.tools.jstat.Jstat, , )
$(call make-launcher, jstatd, sun.tools.jstatd.Jstatd, , ) $(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, native2ascii, sun.tools.native2ascii.Main, , )
$(call make-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, 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, schemagen, com.sun.tools.internal.jxc.SchemaGenerator, , )
$(call make-launcher, serialver, sun.tools.serialver.SerialVer, , ) $(call make-launcher, serialver, sun.tools.serialver.SerialVer, , )
$(call make-launcher, servertool, com.sun.corba.se.impl.activation.ServerTool, , ) $(call make-launcher, xjc, com.sun.tools.internal.xjc.Driver, , )
$(call make-launcher, tnameserv, com.sun.corba.se.impl.naming.cosnaming.TransientNameServer, \ $(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-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-Dcom.sun.CORBA.activation.DbDir=./orb.db \
-J-Djava.util.logging.LoggingPermission=contol \ -J-Djava.util.logging.LoggingPermission=contol \
-J-Dcom.sun.CORBA.POA.ORBServerId=1, ) -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 endef
build: build:
$(make-all-launchers) $(make-all-launchers)
$(make-platform-specific-launchers)
clean clobber:: clean clobber::
$(make-all-launchers) $(make-all-launchers)
$(make-platform-specific-launchers)
include $(BUILDDIR)/common/Rules.gmk include $(BUILDDIR)/common/Rules.gmk
make/mkdemo/jvmti/Makefile
浏览文件 @ e1a13723
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
# #
BUILDDIR = ../.. BUILDDIR = ../..
MODULE = demos
PRODUCT = demos PRODUCT = demos
include $(BUILDDIR)/common/Defs.gmk include $(BUILDDIR)/common/Defs.gmk
......
make/mkdemo/management/Makefile
浏览文件 @ e1a13723
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
# #
BUILDDIR = ../.. BUILDDIR = ../..
MODULE = demos
PRODUCT = demos PRODUCT = demos
include $(BUILDDIR)/common/Defs.gmk include $(BUILDDIR)/common/Defs.gmk
......
make/mksample/dtrace/Makefile
浏览文件 @ e1a13723
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
BUILDDIR = ../.. BUILDDIR = ../..
MODULE = samples
PRODUCT = java PRODUCT = java
include $(BUILDDIR)/common/Defs.gmk include $(BUILDDIR)/common/Defs.gmk
......
make/mksample/jmx/jmx-scandir/Makefile
浏览文件 @ e1a13723
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
BUILDDIR = ../../.. BUILDDIR = ../../..
MODULE = samples
PRODUCT = java PRODUCT = java
include $(BUILDDIR)/common/Defs.gmk include $(BUILDDIR)/common/Defs.gmk
......
make/mksample/nbproject/Makefile
浏览文件 @ e1a13723
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
BUILDDIR = ../.. BUILDDIR = ../..
MODULE = samples
PRODUCT = java PRODUCT = java
include $(BUILDDIR)/common/Defs.gmk include $(BUILDDIR)/common/Defs.gmk
......
make/mksample/nio/file/Makefile
浏览文件 @ e1a13723
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
BUILDDIR = ../../.. BUILDDIR = ../../..
MODULE = samples
PRODUCT = java PRODUCT = java
include $(BUILDDIR)/common/Defs.gmk include $(BUILDDIR)/common/Defs.gmk
......
make/mksample/nio/multicast/Makefile
浏览文件 @ e1a13723
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
BUILDDIR = ../../.. BUILDDIR = ../../..
MODULE = samples
PRODUCT = java PRODUCT = java
include $(BUILDDIR)/common/Defs.gmk include $(BUILDDIR)/common/Defs.gmk
......
make/mksample/nio/server/Makefile
浏览文件 @ e1a13723
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
BUILDDIR = ../../.. BUILDDIR = ../../..
MODULE = samples
PRODUCT = java PRODUCT = java
include $(BUILDDIR)/common/Defs.gmk include $(BUILDDIR)/common/Defs.gmk
......
make/mksample/scripting/scriptpad/Makefile
浏览文件 @ e1a13723
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
BUILDDIR = ../../.. BUILDDIR = ../../..
MODULE = samples
PRODUCT = java PRODUCT = java
include $(BUILDDIR)/common/Defs.gmk include $(BUILDDIR)/common/Defs.gmk
......
make/mksample/webservices/EbayClient/Makefile
浏览文件 @ e1a13723
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
BUILDDIR = ../../.. BUILDDIR = ../../..
MODULE = samples
PRODUCT = java PRODUCT = java
include $(BUILDDIR)/common/Defs.gmk include $(BUILDDIR)/common/Defs.gmk
......
make/mksample/webservices/EbayServer/Makefile
浏览文件 @ e1a13723
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
BUILDDIR = ../../.. BUILDDIR = ../../..
MODULE = samples
PRODUCT = java PRODUCT = java
include $(BUILDDIR)/common/Defs.gmk include $(BUILDDIR)/common/Defs.gmk
......
make/modules/Makefile
浏览文件 @ e1a13723
...@@ -40,32 +40,7 @@ MODULE_JAR_MANIFEST_FILE=$(ABS_TEMPDIR)/manifest.tmp ...@@ -40,32 +40,7 @@ MODULE_JAR_MANIFEST_FILE=$(ABS_TEMPDIR)/manifest.tmp
TMP=$(ABS_TEMPDIR)/modules TMP=$(ABS_TEMPDIR)/modules
MODULE_CLASSLIST = $(TMP)/classlist MODULE_CLASSLIST = $(TMP)/classlist
MODULE_CLASSES = $(TMP)/classes MODULE_CLASSES = $(TMP)/classes
MODULE_LIST = $(MODULE_CLASSLIST)/modules.list MODULES_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
SUBDIRS = tools SUBDIRS = tools
all build clean clobber:: all build clean clobber::
...@@ -76,7 +51,7 @@ all:: unpack-jars gen-classlist modularize ...@@ -76,7 +51,7 @@ all:: unpack-jars gen-classlist modularize
$(CLASSANALYZER_JAR): $(CLASSANALYZER_JAR):
$(CD) tools && $(MAKE) all $(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: unpack-jars:
$(RM) -rf $(MODULE_CLASSES) $(RM) -rf $(MODULE_CLASSES)
$(MKDIR) -p $(MODULE_CLASSES) $(MKDIR) -p $(MODULE_CLASSES)
...@@ -107,31 +82,29 @@ gen-classlist: $(CLASSANALYZER_JAR) ...@@ -107,31 +82,29 @@ gen-classlist: $(CLASSANALYZER_JAR)
modularize: $(MODULE_JAR_MANIFEST_FILE) modularize: $(MODULE_JAR_MANIFEST_FILE)
@$(ECHO) ">>>Making "$@" @ `$(DATE)` ..." @$(ECHO) ">>>Making "$@" @ `$(DATE)` ..."
@$(RM) -rf $(MODULE_LIB) @$(RM) -rf $(MODULE_LIB)
@$(MKDIR) -p $(MODULE_LIB)/lib
@$(MKDIR) -p $(MODULE_LIB)/jre/lib/ext
@# create modules @# create jar file for modules and
for m in `$(NAWK) '{print $$1}' $(MODULE_LIST)` ; do \ @# copy other files from all members of this module
for m in `$(NAWK) '{print $$1}' $(MODULES_LIST)` ; do \
$(ECHO) "Creating module $$m" ; \ $(ECHO) "Creating module $$m" ; \
$(SED) -e 's%\\%\/%g' < $(MODULE_CLASSLIST)/$$m.classlist > $(TMP)/tmp.cf ; \ $(SED) -e 's%\\%\/%g' < $(MODULE_CLASSLIST)/$$m.classlist > $(TMP)/tmp.cf ; \
if [ -f $(MODULE_CLASSLIST)/$$m.resources ] ; then \ if [ -f $(MODULE_CLASSLIST)/$$m.resources ] ; then \
$(SED) -e 's%\\%\/%g' < $(MODULE_CLASSLIST)/$$m.resources >> $(TMP)/tmp.cf ; \ $(SED) -e 's%\\%\/%g' < $(MODULE_CLASSLIST)/$$m.resources >> $(TMP)/tmp.cf ; \
fi ; \ fi ; \
$(MKDIR) -p $(MODULE_LIB)/$$m/lib; \
$(CD) $(MODULE_CLASSES) && \ $(CD) $(MODULE_CLASSES) && \
$(BOOT_JAR_CMD) c0mf $(MODULE_JAR_MANIFEST_FILE) \ $(BOOT_JAR_CMD) c0mf $(MODULE_JAR_MANIFEST_FILE) \
$(MODULE_LIB)/$$m.jar \ $(MODULE_LIB)/$$m/lib/$$m.jar \
@$(TMP)/tmp.cf \ @$(TMP)/tmp.cf \
$(BOOT_JAR_JFLAGS) ; \ $(BOOT_JAR_JFLAGS); \
done 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) @$(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)` ..." @$(ECHO) ">>>Finished making "$@" @ `$(DATE)` ..."
$(MODULE_JAR_MANIFEST_FILE): $(MODULE_JAR_MANIFEST_FILE):
...@@ -140,6 +113,5 @@ $(MODULE_JAR_MANIFEST_FILE): ...@@ -140,6 +113,5 @@ $(MODULE_JAR_MANIFEST_FILE):
clean clobber:: clean clobber::
$(RM) -rf $(MODULE_CLASSLIST) $(RM) -rf $(MODULE_CLASSLIST)
$(RM) -rf $(MODULE_LIB) $(RM) -rf $(MODULE_LIB)
$(RM) -f $(MODULE_JAR_MANIFEST_FILE) $(RM) $(MODULE_JAR_MANIFEST_FILE)
$(RM) -f $(CLASSANALYZER_JAR) $(RM) $(CLASSANALYZER_JAR)
make/modules/modules.config
浏览文件 @ e1a13723
...@@ -372,15 +372,19 @@ module management { ...@@ -372,15 +372,19 @@ module management {
/**************************************************************************/ /**************************************************************************/
module tracing {
// tracing
include com.sun.tracing.**, sun.tracing.**;
}
module instrument { module instrument {
// java.lang.instrument // java.lang.instrument
include java.lang.instrument.*, sun.instrument.*; include java.lang.instrument.*, sun.instrument.*;
// tracing
include com.sun.tracing.**, sun.tracing.**;
// HPROF support // HPROF support
include com.sun.demo.jvmti.hprof.*; include com.sun.demo.jvmti.hprof.*;
include tracing;
} }
/**************************************************************************/ /**************************************************************************/
...@@ -391,15 +395,17 @@ module rmi-activation { ...@@ -391,15 +395,17 @@ module rmi-activation {
sun.rmi.server.InactiveGroupException; sun.rmi.server.InactiveGroupException;
} }
module rmic {
// rmic is included in tools
include sun.rmi.rmic.**;
}
module rmi { module rmi {
include java.rmi.**, sun.rmi.**, com.sun.rmi.**; include java.rmi.**, sun.rmi.**, com.sun.rmi.**;
// SSL factories are in rmi // SSL factories are in rmi
include javax.rmi.ssl.**; include javax.rmi.ssl.**;
// rmic is in tools
exclude sun.rmi.rmic.**;
// supporting classes in sun.misc and dependencies // supporting classes in sun.misc and dependencies
include sun.misc.GC; include sun.misc.GC;
} }
...@@ -468,9 +474,14 @@ module security-smartcardio { ...@@ -468,9 +474,14 @@ module security-smartcardio {
include javax.smartcardio.**, sun.security.smartcardio.**; include javax.smartcardio.**, sun.security.smartcardio.**;
} }
module security-auth {
include com.sun.security.auth.**, sun.security.util.AuthResources_*;
}
module security-misc { module security-misc {
include com.sun.security.auth.**, sun.security.util.AuthResources_*, include security-auth;
sun.security.pkcs.*,
include sun.security.pkcs.*,
sun.security.pkcs12.*; sun.security.pkcs12.*;
// this class is a candidate to be removed. // this class is a candidate to be removed.
...@@ -500,9 +511,8 @@ module jndi-rmiregistry { ...@@ -500,9 +511,8 @@ module jndi-rmiregistry {
} }
module jndi-dns { module jndi-dns {
include net-dns;
include com.sun.jndi.dns.**, com.sun.jndi.url.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 { module jndi-cosnaming {
...@@ -677,31 +687,69 @@ module corba { ...@@ -677,31 +687,69 @@ module corba {
/**************************************************************************/ /**************************************************************************/
module client { module applet {
include java.applet.**, include java.applet.**,
java.awt.**, sun.applet.**;
javax.accessibility.*, }
javax.imageio.**,
javax.print.**, module awt {
javax.sound.**, include java.awt.**,
javax.swing.**,
sun.applet.**,
sun.audio.**,
sun.awt.**, sun.awt.**,
sun.dc.**, com.sun.awt.**;
sun.font.**, }
module font {
include sun.font.**;
}
module imageio {
include javax.imageio.**,
com.sun.imageio.**;
}
module java2d {
include sun.dc.**,
sun.java2d.**, 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.**, sun.swing.**,
com.sun.accessibility.**, // sajdi also contains classes in subpackages of com.sun.java.swing;
com.sun.awt.**, // so use '*' instead of '**'
com.sun.image.**, com.sun.java.swing.*,
com.sun.imageio.**,
com.sun.java.swing.*, // sajdi also contains classes in a subpackage;
// so use '*' instead of '**'
com.sun.java.swing.plaf.**, com.sun.java.swing.plaf.**,
com.sun.media.**,
com.sun.swing.**; 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 // Bidi class in client module for now
include java.text.Bidi, sun.text.bidi.*; include java.text.Bidi, sun.text.bidi.*;
...@@ -723,7 +771,13 @@ module client { ...@@ -723,7 +771,13 @@ module client {
/**************************************************************************/ /**************************************************************************/
module jkernel {
include sun.jkernel.*;
}
module deploy { module deploy {
include jkernel;
// For now, all plugin and JNLP // For now, all plugin and JNLP
include com.sun.java.browser.**, include com.sun.java.browser.**,
netscape.**, netscape.**,
...@@ -732,8 +786,7 @@ module deploy { ...@@ -732,8 +786,7 @@ module deploy {
com.sun.deploy.**, com.sun.deploy.**,
com.sun.javaws.**, com.sun.javaws.**,
javax.jnlp.*, javax.jnlp.*,
com.sun.jnlp.*, com.sun.jnlp.*;
sun.jkernel.*;
// Hook for http authentication // Hook for http authentication
include sun.net.www.protocol.http.AuthCacheBridge; include sun.net.www.protocol.http.AuthCacheBridge;
...@@ -741,6 +794,11 @@ module deploy { ...@@ -741,6 +794,11 @@ module deploy {
/**************************************************************************/ /**************************************************************************/
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 { module net-compat {
// NTLM authentication support // NTLM authentication support
include sun.net.www.protocol.http.ntlm.*; include sun.net.www.protocol.http.ntlm.*;
...@@ -824,6 +882,7 @@ module tools { ...@@ -824,6 +882,7 @@ module tools {
debugging, debugging,
jaxws-tools, jaxws-tools,
jdb, jdb,
rmic,
sajdi; sajdi;
// include gui-tools in tools module unless the tool binaries // include gui-tools in tools module unless the tool binaries
...@@ -834,8 +893,7 @@ module tools { ...@@ -834,8 +893,7 @@ module tools {
com.sun.jarsigner.**, com.sun.jarsigner.**,
com.sun.javac.**, com.sun.javac.**,
com.sun.javadoc.**, com.sun.source.**, com.sun.javadoc.**, com.sun.source.**,
sun.jvmstat.**, sun.jvmstat.**;
sun.rmi.rmic.**;
} }
/**************************************************************************/ /**************************************************************************/
...@@ -853,6 +911,19 @@ module inputmethods-ext { ...@@ -853,6 +911,19 @@ module inputmethods-ext {
/**************************************************************************/ /**************************************************************************/
// 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 { module other {
include **; include **;
} }
make/modules/tools/nbproject/project.xml
浏览文件 @ e1a13723
<?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
Copyright 2009 Sun Microsystems, Inc. All Rights Reserved. Copyright 2009 Sun Microsystems, Inc. All Rights Reserved.
...@@ -28,8 +29,6 @@ ...@@ -28,8 +29,6 @@
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 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"> <project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.java.j2seproject</type> <type>org.netbeans.modules.java.j2seproject</type>
<configuration> <configuration>
......
make/modules/tools/src/com/sun/classanalyzer/Module.java
浏览文件 @ e1a13723
...@@ -444,8 +444,8 @@ public class Module implements Comparable<Module> { ...@@ -444,8 +444,8 @@ public class Module implements Comparable<Module> {
} }
void printClassListTo(String output) throws IOException { void printClassListTo(String output) throws IOException {
// no file created if the module doesn't have any class // no file created if the module doesn't have any class nor resource
if (classes.isEmpty()) { if (isEmpty()) {
return; return;
} }
...@@ -482,7 +482,7 @@ public class Module implements Comparable<Module> { ...@@ -482,7 +482,7 @@ public class Module implements Comparable<Module> {
void printDependenciesTo(String output, boolean showDynamic) throws IOException { void printDependenciesTo(String output, boolean showDynamic) throws IOException {
// no file created if the module doesn't have any class // no file created if the module doesn't have any class
if (classes.isEmpty()) { if (isEmpty()) {
return; return;
} }
......
make/sun/applet/Makefile
浏览文件 @ e1a13723
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
# #
BUILDDIR = ../.. BUILDDIR = ../..
MODULE = applet
PACKAGE = sun.applet PACKAGE = sun.applet
PRODUCT = sun PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk include $(BUILDDIR)/common/Defs.gmk
......
make/sun/awt/Makefile
浏览文件 @ e1a13723
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
# #
BUILDDIR = ../.. BUILDDIR = ../..
MODULE = awt
PACKAGE = sun.awt PACKAGE = sun.awt
LIBRARY = awt LIBRARY = awt
PRODUCT = sun PRODUCT = sun
...@@ -312,15 +313,15 @@ dgalibs: $(DGALIBS) ...@@ -312,15 +313,15 @@ dgalibs: $(DGALIBS)
$(LIBDIR)/$(LIBARCH)/libxinerama.so: $(CLOSED_SRC)/solaris/lib/$(ARCH)/libxinerama.so $(LIBDIR)/$(LIBARCH)/libxinerama.so: $(CLOSED_SRC)/solaris/lib/$(ARCH)/libxinerama.so
$(install-file) $(install-file)
$(CHMOD) a+x $@ $(call chmod-file, a+x)
$(LIBDIR)/$(LIBARCH)/libjdgaSUNW%.so: $(CLOSED_SRC)/solaris/lib/$(ARCH)/libjdgaSUNW%.so $(LIBDIR)/$(LIBARCH)/libjdgaSUNW%.so: $(CLOSED_SRC)/solaris/lib/$(ARCH)/libjdgaSUNW%.so
$(install-file) $(install-file)
$(CHMOD) a+x $@ $(call chmod-file, a+x)
$(LIBDIR)/$(LIBARCH)/libjdgaSUNWafb.so: $(LIBDIR)/$(LIBARCH)/libjdgaSUNWffb.so $(LIBDIR)/$(LIBARCH)/libjdgaSUNWafb.so: $(LIBDIR)/$(LIBARCH)/libjdgaSUNWffb.so
$(prep-target) $(prep-target)
$(LN) -s libjdgaSUNWffb.so $(LIBDIR)/$(LIBARCH)/libjdgaSUNWafb.so $(call install-sym-link, libjdgaSUNWffb.so)
clean:: dgalib.clean clean:: dgalib.clean
...@@ -404,7 +405,8 @@ $(LIBDIR)/%.bfc: $(FONTCONFIGS_SRC)/$(FONTCONFIGS_SRC_PREFIX)%.properties \ ...@@ -404,7 +405,8 @@ $(LIBDIR)/%.bfc: $(FONTCONFIGS_SRC)/$(FONTCONFIGS_SRC_PREFIX)%.properties \
$(COMPILEFONTCONFIG_JARFILE) $(COMPILEFONTCONFIG_JARFILE)
$(prep-target) $(prep-target)
$(BOOT_JAVA_CMD) -jar $(COMPILEFONTCONFIG_JARFILE) $< $@ $(BOOT_JAVA_CMD) -jar $(COMPILEFONTCONFIG_JARFILE) $< $@
$(CHMOD) 444 $(@) $(install-module-file)
$(call chmod-file, 444)
@$(java-vm-cleanup) @$(java-vm-cleanup)
fontconfigs.clean : fontconfigs.clean :
......
make/sun/cmm/Makefile
浏览文件 @ e1a13723
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
# #
BUILDDIR = ../.. BUILDDIR = ../..
MODULE = java2d
PRODUCT = sun PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk include $(BUILDDIR)/common/Defs.gmk
...@@ -45,34 +46,24 @@ iccprofiles: $(ICCPROFILE_DEST_DIR)/sRGB.pf $(ICCPROFILE_DEST_DIR)/GRAY.pf \ ...@@ -45,34 +46,24 @@ iccprofiles: $(ICCPROFILE_DEST_DIR)/sRGB.pf $(ICCPROFILE_DEST_DIR)/GRAY.pf \
$(ICCPROFILE_DEST_DIR)/LINEAR_RGB.pf $(ICCPROFILE_DEST_DIR)/LINEAR_RGB.pf
$(ICCPROFILE_DEST_DIR)/sRGB.pf: $(ICCPROFILE_SRC_DIR)/sRGB.pf $(ICCPROFILE_DEST_DIR)/sRGB.pf: $(ICCPROFILE_SRC_DIR)/sRGB.pf
$(RM) $(ICCPROFILE_DEST_DIR)/sRGB.pf $(install-file)
-$(MKDIR) -p $(ICCPROFILE_DEST_DIR) $(call chmod-file, 444)
$(CP) $(ICCPROFILE_SRC_DIR)/sRGB.pf $(ICCPROFILE_DEST_DIR)
$(CHMOD) 444 $(ICCPROFILE_DEST_DIR)/sRGB.pf
$(ICCPROFILE_DEST_DIR)/GRAY.pf: $(ICCPROFILE_SRC_DIR)/GRAY.pf $(ICCPROFILE_DEST_DIR)/GRAY.pf: $(ICCPROFILE_SRC_DIR)/GRAY.pf
$(RM) $(ICCPROFILE_DEST_DIR)/GRAY.pf $(install-file)
-$(MKDIR) -p $(ICCPROFILE_DEST_DIR) $(call chmod-file, 444)
$(CP) $(ICCPROFILE_SRC_DIR)/GRAY.pf $(ICCPROFILE_DEST_DIR)
$(CHMOD) 444 $(ICCPROFILE_DEST_DIR)/GRAY.pf
$(ICCPROFILE_DEST_DIR)/CIEXYZ.pf: $(ICCPROFILE_SRC_DIR)/CIEXYZ.pf $(ICCPROFILE_DEST_DIR)/CIEXYZ.pf: $(ICCPROFILE_SRC_DIR)/CIEXYZ.pf
$(RM) $(ICCPROFILE_DEST_DIR)/CIEXYZ.pf $(install-file)
-$(MKDIR) -p $(ICCPROFILE_DEST_DIR) $(call chmod-file, 444)
$(CP) $(ICCPROFILE_SRC_DIR)/CIEXYZ.pf $(ICCPROFILE_DEST_DIR)
$(CHMOD) 444 $(ICCPROFILE_DEST_DIR)/CIEXYZ.pf
$(ICCPROFILE_DEST_DIR)/PYCC.pf: $(ICCPROFILE_SRC_DIR)/PYCC.pf $(ICCPROFILE_DEST_DIR)/PYCC.pf: $(ICCPROFILE_SRC_DIR)/PYCC.pf
$(RM) $(ICCPROFILE_DEST_DIR)/PYCC.pf $(install-file)
-$(MKDIR) -p $(ICCPROFILE_DEST_DIR) $(call chmod-file, 444)
$(CP) $(ICCPROFILE_SRC_DIR)/PYCC.pf $(ICCPROFILE_DEST_DIR)
$(CHMOD) 444 $(ICCPROFILE_DEST_DIR)/PYCC.pf
$(ICCPROFILE_DEST_DIR)/LINEAR_RGB.pf: $(ICCPROFILE_SRC_DIR)/LINEAR_RGB.pf $(ICCPROFILE_DEST_DIR)/LINEAR_RGB.pf: $(ICCPROFILE_SRC_DIR)/LINEAR_RGB.pf
$(RM) $(ICCPROFILE_DEST_DIR)/LINEAR_RGB.pf $(install-file)
-$(MKDIR) -p $(ICCPROFILE_DEST_DIR) $(call chmod-file, 444)
$(CP) $(ICCPROFILE_SRC_DIR)/LINEAR_RGB.pf $(ICCPROFILE_DEST_DIR)
$(CHMOD) 444 $(ICCPROFILE_DEST_DIR)/LINEAR_RGB.pf
iccprofiles.clean: iccprofiles.clean:
$(RM) -r $(ICCPROFILE_DEST_DIR) $(RM) -r $(ICCPROFILE_DEST_DIR)
......
make/sun/cmm/kcms/Makefile
浏览文件 @ e1a13723
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
# #
BUILDDIR = ../../.. BUILDDIR = ../../..
MODULE = java2d
PACKAGE = sun.java2d.cmm.kcms PACKAGE = sun.java2d.cmm.kcms
LIBRARY = kcms LIBRARY = kcms
PRODUCT = sun PRODUCT = sun
......
make/sun/cmm/lcms/Makefile
浏览文件 @ e1a13723
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
# #
BUILDDIR = ../../.. BUILDDIR = ../../..
MODULE = java2d
PACKAGE = sun.java2d.cmm.lcms PACKAGE = sun.java2d.cmm.lcms
LIBRARY = lcms LIBRARY = lcms
PRODUCT = sun PRODUCT = sun
......
make/sun/dcpr/Makefile
浏览文件 @ e1a13723
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
# WARNING: Make sure the OPENJDK plugs are up-to-date, see make/common/internal/BinaryPlugs.gmk # WARNING: Make sure the OPENJDK plugs are up-to-date, see make/common/internal/BinaryPlugs.gmk
BUILDDIR = ../.. BUILDDIR = ../..
MODULE = java2d
PACKAGE = sun.dc PACKAGE = sun.dc
LIBRARY = dcpr LIBRARY = dcpr
PRODUCT = sun PRODUCT = sun
......
make/sun/font/Makefile
浏览文件 @ e1a13723
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
# #
BUILDDIR = ../.. BUILDDIR = ../..
MODULE = font
PACKAGE = sun.font PACKAGE = sun.font
LIBRARY = fontmanager LIBRARY = fontmanager
PRODUCT = sun PRODUCT = sun
...@@ -121,16 +122,21 @@ FILES_m=mapfile-vers.openjdk ...@@ -121,16 +122,21 @@ FILES_m=mapfile-vers.openjdk
# #
#TODO: rework this to avoid hardcoding library name in the makefile #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) 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 else
ifeq ($(USING_SYSTEM_FT_LIB), false) 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 endif
OTHER_LDLIBS += -L$(FREETYPE_LIB_PATH) -lfreetype
endif endif
library:: $(FREETYPE_LIB)
$(FREETYPE_LIB):
$(CP) $(FREETYPE_LIB_PATH)/$(LIB_PREFIX)freetype.$(LIBRARY_SUFFIX) $@
$(install-module-file)
endif endif
#ifeq ($(PLATFORM), solaris) #ifeq ($(PLATFORM), solaris)
...@@ -158,7 +164,6 @@ ifndef OPENJDK ...@@ -158,7 +164,6 @@ ifndef OPENJDK
CPPFLAGS += -I$(CLOSED_SRC)/share/native/$(PKGDIR)/t2k CPPFLAGS += -I$(CLOSED_SRC)/share/native/$(PKGDIR)/t2k
else else
CPPFLAGS += -I$(FREETYPE_HEADERS_PATH) -I$(FREETYPE_HEADERS_PATH)/freetype2 CPPFLAGS += -I$(FREETYPE_HEADERS_PATH) -I$(FREETYPE_HEADERS_PATH)/freetype2
OTHER_LDLIBS += $(FREETYPE_LIB)
endif endif
ifeq ($(PLATFORM), windows) ifeq ($(PLATFORM), windows)
......
make/sun/font/t2k/Makefile
浏览文件 @ e1a13723
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
# #
BUILDDIR = ../../.. BUILDDIR = ../../..
MODULE = font
PACKAGE = sun.font PACKAGE = sun.font
LIBRARY = t2k LIBRARY = t2k
PRODUCT = sun PRODUCT = sun
......
make/sun/headless/Makefile
浏览文件 @ e1a13723
...@@ -30,6 +30,7 @@ MOTIF_VERSION = none ...@@ -30,6 +30,7 @@ MOTIF_VERSION = none
MOTIF_VERSION_STRING=none MOTIF_VERSION_STRING=none
LIB_LOCATION = $(LIBDIR)/$(LIBARCH)/headless LIB_LOCATION = $(LIBDIR)/$(LIBARCH)/headless
MODULE = awt
PACKAGE = sun.awt PACKAGE = sun.awt
LIBRARY = mawt LIBRARY = mawt
LIBRARY_OUTPUT = headless LIBRARY_OUTPUT = headless
......
make/sun/image/generic/Makefile
浏览文件 @ e1a13723
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
# #
BUILDDIR = ../../.. BUILDDIR = ../../..
MODULE = media
PACKAGE = sun.awt.medialib PACKAGE = sun.awt.medialib
LIBRARY = mlib_image LIBRARY = mlib_image
PRODUCT = sun PRODUCT = sun
......
make/sun/image/vis/Makefile
浏览文件 @ e1a13723
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
# Makefile for building the VIS (solaris-only) version of medialib # Makefile for building the VIS (solaris-only) version of medialib
# #
BUILDDIR = ../../.. BUILDDIR = ../../..
MODULE = media
PACKAGE = sun.awt.medialib PACKAGE = sun.awt.medialib
LIBRARY = mlib_image_v LIBRARY = mlib_image_v
PRODUCT = sun PRODUCT = sun
......
make/sun/jar/Makefile
浏览文件 @ e1a13723
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
# #
BUILDDIR = ../.. BUILDDIR = ../..
MODULE = jar-tool
PACKAGE = sun.tools PACKAGE = sun.tools
PRODUCT = sun PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk include $(BUILDDIR)/common/Defs.gmk
......
make/sun/javazic/Makefile
浏览文件 @ e1a13723
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
BUILDDIR = ../.. BUILDDIR = ../..
MODULE = base
PACKAGE = sun.javazic PACKAGE = sun.javazic
PRODUCT = sun PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk include $(BUILDDIR)/common/Defs.gmk
...@@ -69,6 +70,7 @@ $(INSTALLDIR)/$(MAPFILE): $(WORKDIR)/$(MAPFILE) ...@@ -69,6 +70,7 @@ $(INSTALLDIR)/$(MAPFILE): $(WORKDIR)/$(MAPFILE)
$(RM) -r $(@D) $(RM) -r $(@D)
$(prep-target) $(prep-target)
$(CP) -r $(WORKDIR)/* $(@D) $(CP) -r $(WORKDIR)/* $(@D)
$(install-module-dir)
clean clobber:: clean clobber::
$(RM) -r $(TEMPDIR) $(INSTALLDIR) $(RM) -r $(TEMPDIR) $(INSTALLDIR)
make/sun/jawt/Makefile
浏览文件 @ e1a13723
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
# #
BUILDDIR = ../.. BUILDDIR = ../..
MODULE = awt
PACKAGE = sun.awt PACKAGE = sun.awt
LIBRARY = jawt LIBRARY = jawt
PRODUCT = sun PRODUCT = sun
......
make/sun/jconsole/Makefile
浏览文件 @ e1a13723
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
# #
BUILDDIR = ../.. BUILDDIR = ../..
MODULE = jconsole
PACKAGE = sun.tools.jconsole PACKAGE = sun.tools.jconsole
PRODUCT = sun PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk include $(BUILDDIR)/common/Defs.gmk
...@@ -79,7 +80,7 @@ $(CLASSBINDIR)/$(PKGDIR)/resources/%: $(SHARE_SRC)/classes/$(PKGDIR)/resources/% ...@@ -79,7 +80,7 @@ $(CLASSBINDIR)/$(PKGDIR)/resources/%: $(SHARE_SRC)/classes/$(PKGDIR)/resources/%
$(install-file) $(install-file)
$(TEMPDIR)/manifest: $(SHARE_SRC)/classes/$(PKGDIR)/manifest $(TEMPDIR)/manifest: $(SHARE_SRC)/classes/$(PKGDIR)/manifest
$(install-file) $(install-manifest-file)
# #
# Extra rule to build jconsole.jar # Extra rule to build jconsole.jar
......
make/sun/jdbc/Makefile
浏览文件 @ e1a13723
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
# #
BUILDDIR = ../.. BUILDDIR = ../..
MODULE = jdbc-odbc
PACKAGE = sun.jdbc.odbc PACKAGE = sun.jdbc.odbc
LIBRARY = JdbcOdbc LIBRARY = JdbcOdbc
PRODUCT = sun PRODUCT = sun
......
make/sun/jdga/Makefile
浏览文件 @ e1a13723
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
BUILDDIR = ../.. BUILDDIR = ../..
MODULE = java2d
PACKAGE = sun.jdga PACKAGE = sun.jdga
LIBRARY = sunwjdga LIBRARY = sunwjdga
PRODUCT = sun PRODUCT = sun
......
make/sun/jkernel/Makefile
浏览文件 @ e1a13723
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
# #
BUILDDIR = ../.. BUILDDIR = ../..
MODULE = jkernel
PACKAGE = sun.jkernel PACKAGE = sun.jkernel
LIBRARY = jkernel LIBRARY = jkernel
PRODUCT = sun PRODUCT = sun
......
make/sun/jpeg/Makefile
浏览文件 @ e1a13723
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
# #
BUILDDIR = ../.. BUILDDIR = ../..
MODULE = java2d
PACKAGE = sun.awt PACKAGE = sun.awt
LIBRARY = jpeg LIBRARY = jpeg
PRODUCT = sun PRODUCT = sun
......
make/sun/launcher/Makefile
浏览文件 @ e1a13723
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
# #
BUILDDIR = ../.. BUILDDIR = ../..
MODULE = base
PACKAGE = sun.launcher PACKAGE = sun.launcher
PRODUCT = sun PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk include $(BUILDDIR)/common/Defs.gmk
......
make/sun/management/Makefile
浏览文件 @ e1a13723
...@@ -28,6 +28,8 @@ ...@@ -28,6 +28,8 @@
# #
BUILDDIR = ../.. BUILDDIR = ../..
MODULE = management
include $(BUILDDIR)/common/Defs.gmk include $(BUILDDIR)/common/Defs.gmk
MGMT_LIBDIR = $(LIBDIR)/management MGMT_LIBDIR = $(LIBDIR)/management
...@@ -56,17 +58,17 @@ jmxremotefiles: $(MGMT_LIBDIR)/jmxremote.password.template $(MGMT_LIBDIR)/jmxrem ...@@ -56,17 +58,17 @@ jmxremotefiles: $(MGMT_LIBDIR)/jmxremote.password.template $(MGMT_LIBDIR)/jmxrem
$(MGMT_LIBDIR)/management.properties: $(MGMT_LIB_SRC)/management.properties $(MGMT_LIBDIR)/management.properties: $(MGMT_LIB_SRC)/management.properties
$(install-file) $(install-file)
$(CHMOD) 644 $@ $(call chmod-file, 644)
$(MGMT_LIBDIR)/snmp.acl.template: $(MGMT_LIB_SRC)/snmp.acl.template $(MGMT_LIBDIR)/snmp.acl.template: $(MGMT_LIB_SRC)/snmp.acl.template
$(install-file) $(install-file)
$(CHMOD) 444 $@ $(call chmod-file, 444)
$(MGMT_LIBDIR)/jmxremote.password.template: $(MGMT_LIB_SRC)/jmxremote.password.template $(MGMT_LIBDIR)/jmxremote.password.template: $(MGMT_LIB_SRC)/jmxremote.password.template
$(install-file) $(install-file)
$(CHMOD) 444 $@ $(call chmod-file, 444)
$(MGMT_LIBDIR)/jmxremote.access: $(MGMT_LIB_SRC)/jmxremote.access $(MGMT_LIBDIR)/jmxremote.access: $(MGMT_LIB_SRC)/jmxremote.access
$(install-file) $(install-file)
$(CHMOD) 644 $@ $(call chmod-file, 644)
make/sun/native2ascii/Makefile
浏览文件 @ e1a13723
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
# #
BUILDDIR = ../.. BUILDDIR = ../..
MODULE = tools
PACKAGE = sun.tools.native2ascii PACKAGE = sun.tools.native2ascii
PRODUCT = sun PRODUCT = sun
OTHER_JAVACFLAGS += -Xlint:serial -Werror OTHER_JAVACFLAGS += -Xlint:serial -Werror
......
make/sun/net/others/Makefile
浏览文件 @ e1a13723
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
# #
BUILDDIR = ../../.. BUILDDIR = ../../..
MODULE = base
PACKAGE = sun.net PACKAGE = sun.net
PRODUCT = sun PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk include $(BUILDDIR)/common/Defs.gmk
......
make/sun/nio/Makefile
浏览文件 @ e1a13723
此差异已折叠。
make/sun/nio/cs/Makefile 0 → 100644
浏览文件 @ e1a13723
此差异已折叠。
make/sun/pisces/Makefile
浏览文件 @ e1a13723
此差异已折叠。
make/sun/rmi/cgi/Makefile
浏览文件 @ e1a13723
此差异已折叠。
make/sun/rmi/oldtools/Makefile
浏览文件 @ e1a13723
此差异已折叠。
make/sun/rmi/registry/Makefile
浏览文件 @ e1a13723
此差异已折叠。
make/sun/rmi/rmi/Makefile
浏览文件 @ e1a13723
此差异已折叠。
make/sun/rmi/rmic/Makefile
浏览文件 @ e1a13723
此差异已折叠。
make/sun/rmi/rmid/Makefile
浏览文件 @ e1a13723
此差异已折叠。
make/sun/security/ec/Makefile
浏览文件 @ e1a13723
此差异已折叠。
make/sun/security/krb5/Makefile
浏览文件 @ e1a13723
此差异已折叠。
make/sun/security/mscapi/Makefile
浏览文件 @ e1a13723
此差异已折叠。
make/sun/security/pkcs11/Makefile
浏览文件 @ e1a13723
此差异已折叠。
make/sun/security/tools/Makefile
浏览文件 @ e1a13723
此差异已折叠。
make/sun/serialver/Makefile
浏览文件 @ e1a13723
此差异已折叠。
make/sun/splashscreen/Makefile
浏览文件 @ e1a13723
此差异已折叠。
make/sun/text/Makefile
浏览文件 @ e1a13723
此差异已折叠。
make/sun/tools/Makefile
浏览文件 @ e1a13723
此差异已折叠。
make/sun/tracing/dtrace/Makefile
浏览文件 @ e1a13723
此差异已折叠。
make/sun/xawt/Makefile
浏览文件 @ e1a13723
此差异已折叠。
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或