Skip to content

D
dragonwell11

openanolis / dragonwell11

通知 7
Star 2
Fork 0
D
dragonwell11
提交 7c40dd09 编写于 作者: T trims
浏览文件
操作

Merge

上级 0bd6d24f 3165ebeb
展开全部 隐藏空白更改
内联 并排
Showing with 3150 addition and 929 deletion
.hgtags
浏览文件 @ 7c40dd09
......@@ -54,3 +54,5 @@ ce74bd35ce948d629a356e168797f44b593b1578 jdk7-b73
1d0121b741f029dc4b828e4b36ba6fda92907dd7 jdk7-b77
4061c66ba1af1a2e27c2c839ba887407dd3ce050 jdk7-b78
e9c98378f6b9256c0595ef2985ca5899f0c0e274 jdk7-b79
e6abd38682d237306d6c147c17538ec9e7f8e3a7 jdk7-b80
dcc938ac40cc45f1ef454d76020b5db5d943001c jdk7-b81
.hgtags-top-repo
浏览文件 @ 7c40dd09
......@@ -54,3 +54,5 @@ c8b63075403d53a208104a8a6ea5072c1cb66aab jdk7-b76
1f17ca8353babb13f4908c1f87d11508232518c8 jdk7-b77
ab4ae8f4514693a9fe17ca2fec0239d8f8450d2c jdk7-b78
20aeeb51713990dbea6929a2e100a8bbf5df70d4 jdk7-b79
a3242906c7747b5d9bcc3d118c7c3c69aa40f4b7 jdk7-b80
8403096d1fe7ff5318df9708cfec84a3fd3e1cf9 jdk7-b81
corba/.hgtags
浏览文件 @ 7c40dd09
......@@ -54,3 +54,5 @@ b751c528c55560cf2adeaeef24b39ca1f4d1cbf7 jdk7-b73
6881f0383f623394b5ec73f27a5f329ff55d0467 jdk7-b77
a7f7276b48cd74d8eb1baa83fbf3d1ef4a2603c8 jdk7-b78
ec0421b5703b677e2226cf4bf7ae4eaafd8061c5 jdk7-b79
0336e70ca0aeabc783cc01658f36cb6e27ea7934 jdk7-b80
e08a42a2a94d97ea8eedb187a94dbff822c8fbba jdk7-b81
hotspot/.hgtags
浏览文件 @ 7c40dd09
......@@ -54,3 +54,5 @@ d8dd291a362acb656026a9c0a9da48501505a1e7 jdk7-b75
455105fc81d941482f8f8056afaa7aa0949c9300 jdk7-b77
e703499b4b51e3af756ae77c3d5e8b3058a14e4e jdk7-b78
a5a6adfca6ecefb5894a848debabfe442ff50e25 jdk7-b79
3003ddd1d4330b06cb4691ae74d600d3685899eb jdk7-b80
1f9b07674480c224828852ffe137beea36b3cab5 jdk7-b81
hotspot/make/hotspot_version
浏览文件 @ 7c40dd09
......@@ -35,7 +35,7 @@ HOTSPOT_VM_COPYRIGHT=Copyright 2009
HS_MAJOR_VER=17
HS_MINOR_VER=0
HS_BUILD_NUMBER=07
HS_BUILD_NUMBER=08
JDK_MAJOR_VER=1
JDK_MINOR_VER=7
......
jaxp/.hgtags
浏览文件 @ 7c40dd09
......@@ -54,3 +54,5 @@ ea7b88c676dd8b269bc858a4a17c14dc96c8aed1 jdk7-b74
bfadab8c7b1bf806a49d3e1bc19ec919717f057a jdk7-b77
7a12d3789e1b07a560fc79568b991818d617ede2 jdk7-b78
b1005c504358c18694c84e95fec16b28cdce7ae1 jdk7-b79
9219574db5936367114b0f31469837f27d5a375a jdk7-b80
204e59d488cdaa9eafa8cb7164ea955b5a9d4a51 jdk7-b81
jaxws/.hgtags
浏览文件 @ 7c40dd09
......@@ -54,3 +54,5 @@ fcf2b8b5d606641659419f247fcee4b284c45e6e jdk7-b75
5b4968c110476085225d3a71c4210fad2c1116c1 jdk7-b77
fc1c72d1dfbb17db7d46bba8db9afc39cbbb9299 jdk7-b78
c08894f5b6e594b9b12993e256b96c1b38099632 jdk7-b79
447767dee56a0f8cb89acc8bf7be5f9be7d84e8b jdk7-b80
f051045fe94a48fae1097f90cbd9227e6aae6b7e jdk7-b81
jdk/.hgtags
浏览文件 @ 7c40dd09
......@@ -54,3 +54,5 @@ eacb36e30327e7ae33baa068e82ddccbd91eaae2 jdk7-b74
e6a5d095c356a547cf5b3c8885885aca5e91e09b jdk7-b77
1143e498f813b8223b5e3a696d79da7ff7c25354 jdk7-b78
918920710d65432a2d54fdf407c1524a5571c4ad jdk7-b79
049cfaaa9a7374e3768a79969a799e8b59ad52fa jdk7-b80
10b993d417fcdb40480dad7032ac241f4b87f1af jdk7-b81
jdk/make/com/sun/crypto/provider/Makefile
浏览文件 @ 7c40dd09
......@@ -249,7 +249,7 @@ $(JAR_DESTFILE): $(UNSIGNED_DIR)/sunjce_provider.jar
else
$(JAR_DESTFILE): $(SIGNED_DIR)/sunjce_provider.jar
endif
$(install-file)
$(install-non-module-file)
ifndef OPENJDK
install-prebuilt:
......
jdk/make/com/sun/java/pack/Makefile
浏览文件 @ 7c40dd09
......@@ -28,6 +28,7 @@
#
BUILDDIR = ../../../..
MODULE = pack200
PACKAGE = com.sun.java.util.jar.pack
LIBRARY = unpack
PRODUCT = sun
......@@ -123,11 +124,14 @@ COBJDIR = $(strip $(subst unpack,unpack-cmd,$(OBJDIR)))
all: build
build: prop
build: prop pack200-tool
prop:
$(MAKE) -C prop
pack200-tool:
$(call make-launcher, pack200, com.sun.java.util.jar.pack.Driver, , --pack)
unpacker:
$(MAKE) $(UNPACK_EXE) STANDALONE=true LDMAPFLAGS_OPT= LDMAPFLAGS_DBG=
......@@ -151,6 +155,7 @@ ifdef MT
$(MT) /manifest $(TEMPDIR)/unpack200$(EXE_SUFFIX).manifest /outputresource:$(TEMPDIR)/unpack200$(EXE_SUFFIX);#1
endif
$(CP) $(TEMPDIR)/unpack200$(EXE_SUFFIX) $(UNPACK_EXE)
$(install-module-file)
ifeq ($(PLATFORM), windows)
$(RES):: $(VERSIONINFO_RESOURCE)
......
jdk/make/com/sun/java/pack/prop/Makefile
浏览文件 @ 7c40dd09
......@@ -29,6 +29,7 @@
# to a collision of rules with Classes.gmk and Library.gmk
BUILDDIR = ../../../../..
MODULE = pack200
PACKAGE = com.sun.java.util.jar.pack
PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk
......
jdk/make/com/sun/jndi/cosnaming/Makefile
浏览文件 @ 7c40dd09
......@@ -28,6 +28,7 @@
#
BUILDDIR = ../../../..
MODULE = jndi-cosnaming
PACKAGE = com.sun.jndi.cosnaming
PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk
......
jdk/make/com/sun/jndi/dns/Makefile
浏览文件 @ 7c40dd09
......@@ -28,6 +28,7 @@
#
BUILDDIR = ../../../..
MODULE = jndi-dns
PACKAGE = com.sun.jndi.dns
PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk
......
jdk/make/com/sun/jndi/ldap/Makefile
浏览文件 @ 7c40dd09
......@@ -28,6 +28,7 @@
#
BUILDDIR = ../../../..
MODULE = jndi-ldap
PACKAGE = com.sun.jndi.ldap
PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk
......
jdk/make/com/sun/jndi/rmi/registry/Makefile
浏览文件 @ 7c40dd09
......@@ -28,6 +28,7 @@
#
BUILDDIR = ../../../../..
MODULE = jndi-rmiregistry
PACKAGE = com.sun.jndi.rmi.registry
PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk
......
jdk/make/com/sun/nio/sctp/FILES_java.gmk
浏览文件 @ 7c40dd09
......@@ -57,8 +57,7 @@ FILES_java += \
sun/nio/ch/SctpResultContainer.java \
sun/nio/ch/SctpSendFailed.java \
sun/nio/ch/SctpServerChannelImpl.java \
sun/nio/ch/SctpShutdown.java \
sun/nio/ch/SctpSocketDispatcher.java
sun/nio/ch/SctpShutdown.java
else
FILES_java += \
sun/nio/ch/SctpChannelImpl.java \
......
jdk/make/com/sun/nio/sctp/Makefile
浏览文件 @ 7c40dd09
......@@ -28,6 +28,7 @@
#
BUILDDIR = ../../../..
MODULE = sctp
PACKAGE = com.sun.nio.sctp
LIBRARY = sctp
PRODUCT = sun
......
jdk/make/com/sun/nio/sctp/mapfile-vers
浏览文件 @ 7c40dd09
......@@ -25,9 +25,14 @@
SUNWprivate_1.1 {
global:
Java_sun_nio_ch_SctpNet_init;
Java_sun_nio_ch_SctpNet_socket0;
Java_sun_nio_ch_SctpNet_bindx;
Java_sun_nio_ch_SctpNet_branch0;
Java_sun_nio_ch_SctpNet_listen0;
Java_sun_nio_ch_SctpNet_connect0;
Java_sun_nio_ch_SctpNet_close0;
Java_sun_nio_ch_SctpNet_preClose0;
Java_sun_nio_ch_SctpNet_getLocalAddresses0;
Java_sun_nio_ch_SctpNet_getRemoteAddresses0;
Java_sun_nio_ch_SctpNet_getPrimAddrOption0;
......
jdk/make/com/sun/org/apache/xml/Makefile
浏览文件 @ 7c40dd09
......@@ -28,6 +28,7 @@
#
BUILDDIR = ../../../../..
MODULE = security-xmldsig
PACKAGE = com.sun.org.apache.xml
PRODUCT = xml
include $(BUILDDIR)/common/Defs.gmk
......
jdk/make/com/sun/rowset/Makefile
浏览文件 @ 7c40dd09
......@@ -28,6 +28,7 @@
#
BUILDDIR = ../../..
MODULE = jdbc-enterprise
PACKAGE = com.sun.rowset
PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk
......
jdk/make/com/sun/script/Makefile
浏览文件 @ 7c40dd09
......@@ -25,6 +25,7 @@
BUILDDIR = ../../..
MODULE = scripting-rhino
PACKAGE = com.sun.script
PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk
......
jdk/make/com/sun/security/auth/module/Makefile
浏览文件 @ 7c40dd09
......@@ -26,6 +26,7 @@
# Makefile for building auth modules.
BUILDDIR = ../../../../..
MODULE = security-auth
PACKAGE = com.sun.security.auth.module
PRODUCT = sun
......
jdk/make/com/sun/servicetag/Makefile
浏览文件 @ 7c40dd09
......@@ -22,6 +22,7 @@
# have any questions.
BUILDDIR = ../../..
MODULE = servicetag
PACKAGE = com.sun.servicetag
PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk
......@@ -68,7 +69,7 @@ $(CLASSBINDIR)/%: $(SHARE_SRC)/classes/%
$(SERVICETAG_LIBDIR)/jdk_header.png: $(SHARE_SRC)/classes/com/sun/servicetag/resources/jdk_header.png
$(install-file)
$(CHMOD) 444 $@
$(call chmod-file, 444)
install-servicetag-lib:
@$(RM) -rf $(SERVICETAG_LIBDIR)
......
jdk/make/com/sun/tools/attach/Makefile
浏览文件 @ 7c40dd09
......@@ -25,6 +25,7 @@
BUILDDIR = ../../../..
MODULE = attach
PACKAGE = com.sun.tools.attach
LIBRARY = attach
PRODUCT = sun
......@@ -65,6 +66,7 @@ $(SERVICEDIR)/%: $(SHARE_SRC)/classes/sun/tools/attach/META-INF/services/%
@$(MKDIR) -p $(@D)
@$(RM) $@
@$(CAT) $< | $(SED) -e "s/^#\[$(PLATFORM)\]//" > $@
@$(install-module-file)
.PHONY: copy-files
......
jdk/make/common/Defs.gmk
浏览文件 @ 7c40dd09
......@@ -225,12 +225,6 @@ DEVTOOLS_FT_DIR_EXISTS = $(shell \
endif
endif
ifeq ($(PLATFORM), windows)
FREETYPE_LIB = $(FREETYPE_LIB_PATH)/freetype.lib
else
FREETYPE_LIB = -L$(FREETYPE_LIB_PATH) -lfreetype
endif
ifdef ALT_FREETYPE_HEADERS_PATH
FREETYPE_HEADERS_PATH = $(ALT_FREETYPE_HEADERS_PATH)
else
......@@ -313,6 +307,9 @@ INCLUDEDIR = $(OUTPUTDIR)/include
# for generated class files
CLASSBINDIR = $(OUTPUTDIR)/classes
DEMOCLASSDIR = $(OUTPUTDIR)/democlasses
# for modules
MODULES_DIR = $(OUTPUTDIR)/modules
ABS_MODULES_DIR = $(ABS_OUTPUTDIR)/modules
# for generated tool class files
BUILDTOOLCLASSDIR = $(OUTPUTDIR)/btclasses
# for build tool jar files
......@@ -388,6 +385,22 @@ ifneq ($(THREADDIR),)
UNIQUE_LOCATION_STRING += /$(THREADDIR)
endif
#
# Build units may or may not define MODULE. Default to "other".
#
# MODULE variable defines the lowest-level module name that
# might or might not be the name of the modules created in
# the modules build (see make/modules/modules.config and
# modules.group).
#
MODULES_TEMPDIR = $(OUTPUTDIR)/tmp/modules
ABS_MODULES_TEMPDIR = $(ABS_OUTPUTDIR)/tmp/modules
ifndef MODULE
MODULE = other
endif
override MODULE_DEST_DIR = $(MODULES_TEMPDIR)/$(MODULE)
# the use of += above makes a space separated list which we need to
# remove for filespecs.
#
......@@ -497,6 +510,58 @@ PKGDIR = $(subst .,/,$(PACKAGE))
#
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) -f $@ $(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) -sf $1 $(MODULE_DEST_DIR)/$$dest
endef
# Run MAKE $@ for a launcher:
# $(call make-launcher, name, mainclass, java-args, main-args)
define make-launcher
$(CD) $(BUILDDIR)/launchers && \
$(MAKE) -f Makefile.launcher \
MODULE=$(MODULE) \
PROGRAM=$(strip $1) \
MAIN_CLASS=$(strip $2) \
MAIN_JAVA_ARGS="$(strip $3)" \
MAIN_ARGS="$(strip $4)"
endef
#
# Convenient macros
#
......@@ -511,6 +576,28 @@ endef
define install-file
$(prep-target)
$(CP) $< $@
$(install-module-file)
endef
define chmod-file
$(CHMOD) $1 $@
$(call chmod-module-file, $1)
endef
define install-sym-link
$(LN) -s $1 $@
$(call install-module-sym-link, $1)
endef
#
# Marcos for files not belonging to any module
define install-non-module-file
$(prep-target)
$(CP) $< $@
endef
define install-manifest-file
$(install-non-module-file)
endef
# Cleanup rule for after debug java run (hotspot.log file is left around)
......@@ -712,7 +799,7 @@ else
endif
# Install of imported file (JDK_IMPORT_PATH, or some other external location)
define install-import-file
define install-importonly-file
@$(ECHO) "ASSEMBLY_IMPORT: $@"
$(prep-target)
$(CP) $< $@
......@@ -730,4 +817,9 @@ $(CP) $< $@
fi
endef
define install-import-file
$(install-importonly-file)
$(install-module-file)
endef
.PHONY: all build clean clobber
jdk/make/common/Demo.gmk
浏览文件 @ 7c40dd09
......@@ -25,6 +25,8 @@
# JDK Demo building jar file.
MODULE = demos
# Some names are defined with LIBRARY inside the Defs.gmk file
LIBRARY=$(DEMONAME)
OBJDIR=$(TEMPDIR)/$(DEMONAME)
......
jdk/make/common/Library.gmk
浏览文件 @ 7c40dd09
......@@ -193,9 +193,18 @@ ifdef MT
$(MT) /manifest $(OBJDIR)/$(@F).manifest /outputresource:$(OBJDIR)/$(@F);#2
endif
$(CP) $(OBJDIR)/$(@F) $@
$(install-module-file)
$(CP) $(OBJDIR)/$(LIBRARY).map $(@D)
$(CP) $(OBJDIR)/$(LIBRARY).pdb $(@D)
$(ACTUAL_LIBRARY):: $(ACTUAL_LIBRARY_DIR)/$(LIBRARY).map $(ACTUAL_LIBRARY_DIR)/$(LIBRARY).pdb
$(ACTUAL_LIBRARY_DIR)/%.map: FORCE
$(install-module-file)
$(ACTUAL_LIBRARY_DIR)/%.pdb: FORCE
$(install-module-file)
endif # LIBRARY
$(OBJDIR)/$(LIBRARY).lcf: $(OBJDIR)/$(LIBRARY).res $(COMPILE_FILES_o) $(FILES_m)
......@@ -250,6 +259,7 @@ ifeq ($(LIBRARY), fdlibm)
$(AR) -r $@ $(FILES_o)
else # LIBRARY
$(LINKER) $(SHARED_LIBRARY_FLAG) -o $@ $(FILES_o) $(LDLIBS)
$(install-module-file)
ifeq ($(WRITE_LIBVERSION),true)
$(MCS) -d -a "$(FULL_VERSION)" $@
endif # WRITE_LIBVERSION
......@@ -353,5 +363,7 @@ fastdebug:
openjdk:
$(MAKE) OPENJDK=true build
FORCE:
.PHONY: all build debug fastdebug
jdk/make/common/Modules.gmk
浏览文件 @ 7c40dd09
......@@ -34,12 +34,10 @@ JRE_MODULE_IMAGE_DIR = $(ABS_OUTPUTDIR)/jre-module-image
#
# Open issues that need further investigation:
# 1. Classes in jre/lib/ext/dnsns.jar are currently put in jre/lib/jndi-dns
# module.
# module. META-INF/services file is not installed.
# 2. Signed jars
# For JDK build, signed jars are copied to the build.
# All jars in the module image are unsigned.
# 3. jre/lib/security/US_export_policy.jar and local_policy.jar
# are not included in the module image yet.
MODULE_IMAGEBINDIR = bin
......@@ -63,7 +61,8 @@ process-module-image-jre process-module-image-jdk ::
@$(ECHO) ">>>Making "$@" @ `$(DATE)` ..."
# Order is important here, trim jre after jdk image is created
modules:: sanity-module-images post-sanity-module-images \
modules:: gen-modules \
sanity-module-images post-sanity-module-images \
$(INITIAL_MODULE_IMAGE_JRE) $(INITIAL_MODULE_IMAGE_JDK) \
trim-module-image-jre trim-module-image-jdk \
process-module-image-jre process-module-image-jdk
......@@ -122,8 +121,33 @@ endif
# JRE Image
######################################################
MODULES_TEMPDIR=$(ABS_TEMPDIR)/modules
MODULES_LIB = $(ABS_OUTPUTDIR)/modules
MODULES_LIST = $(MODULES_TEMPDIR)/classlist/modules.list
# Modules in the jre/lib/security directory
POLICY_MODULES = US_export_policy local_policy
# Modules in the modules/ext directory
EXT_MODULES = localedata security-sunec security-sunjce
# Build PKCS#11 on all platforms except 64-bit Windows.
PKCS11 = security-sunpkcs11
ifeq ($(ARCH_DATA_MODEL), 64)
ifeq ($(PLATFORM), windows)
PKCS11 =
endif
endif
EXT_MODULES += $(PKCS11)
# Build Microsoft CryptoAPI provider only on (non-64-bit) Windows platform.
ifeq ($(PLATFORM), windows)
ifneq ($(ARCH_DATA_MODEL), 64)
EXT_MODULES += security-sunmscapi
endif
endif
# Modules for JDK only
JDK_MODULES = tools
gen-modules:
$(CD) modules; $(MAKE) all
......@@ -151,7 +175,6 @@ initial-module-image-jre-sol64:: initial-module-image-jre-setup \
# Construct an initial jre image (initial jdk jre) no trimming or stripping
initial-module-image-jre:: initial-module-image-jre-setup \
$(JRE_LICENSES) $(JRE_MODULE_DOCFILES) \
gen-modules \
$(BUILDMETAINDEX_JARFILE)
@# Copy in bin directory
$(CD) $(OUTPUTDIR) && $(FIND) bin -depth | $(CPIO) -pdum $(JRE_MODULE_IMAGE_DIR)
......@@ -162,7 +185,21 @@ initial-module-image-jre:: initial-module-image-jre-setup \
@#
@# 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_DIR)/$$m/lib/$$m.jar $(JRE_MODULE_IMAGE_DIR)/lib ; \
done
$(MKDIR) -p $(JRE_MODULE_IMAGE_DIR)/lib/ext
for m in $(EXT_MODULES) ; do \
$(MV) $(JRE_MODULE_IMAGE_DIR)/lib/$$m.jar $(JRE_MODULE_IMAGE_DIR)/lib/ext ; \
done
for m in $(POLICY_MODULES) ; do \
$(MV) $(JRE_MODULE_IMAGE_DIR)/lib/$$m.jar $(JRE_MODULE_IMAGE_DIR)/lib/security; \
done
@# Remove jdk modules
for m in $(JDK_MODULES) ; do \
$(RM) $(JRE_MODULE_IMAGE_DIR)/lib/$$m.jar ; \
done
@# Make sure all directories are read/execute for everyone
$(CHMOD) a+rx `$(FIND) $(JRE_MODULE_IMAGE_DIR) -type d`
@# Remove some files from the jre area
......@@ -304,7 +341,9 @@ initial-module-image-jdk:: initial-module-image-jdk-setup \
@# copy jdk modules to jdk/lib
@#
$(MKDIR) -p $(JDK_MODULE_IMAGE_DIR)/lib
$(CP) -rf $(MODULES_LIB)/lib/* $(JDK_MODULE_IMAGE_DIR)/lib
for m in $(JDK_MODULES) ; do \
$(CP) $(MODULES_DIR)/$$m/lib/$$m.jar $(JDK_MODULE_IMAGE_DIR)/lib ; \
done
ifeq ($(PLATFORM), windows)
@#
@# lib/
......
jdk/make/common/Program.gmk
浏览文件 @ 7c40dd09
......@@ -50,8 +50,6 @@ ACTUAL_PROGRAM_NAME = $(PROGRAM)$(EXE_SUFFIX)
ACTUAL_PROGRAM_DIR = $(BINDIR)
ACTUAL_PROGRAM = $(ACTUAL_PROGRAM_DIR)/$(ACTUAL_PROGRAM_NAME)
JVMCFG = $(LIBDIR)/$(LIBARCH)/jvm.cfg
# Make sure the default rule is all
program_default_rule: all
......@@ -116,7 +114,7 @@ endif
ifeq ($(COMPILE_IT),true)
$(ACTUAL_PROGRAM):: classes $(JVMCFG) $(INIT)
$(ACTUAL_PROGRAM):: classes $(INIT)
#
# Windows only
......@@ -190,12 +188,13 @@ $(ACTUAL_PROGRAM):: $(FILES_o)
@$(MKDIR) -p $(TEMPDIR)
$(LINK_PRE_CMD) $(CC) $(CC_OBJECT_OUTPUT_FLAG)$@ $(LDFLAGS) \
$(FILES_o) $(THREADLIBS) $(LDLIBS)
$(install-module-file)
endif # PLATFORM
else # COMPILE_IT
$(ACTUAL_PROGRAM):: $(JVMCFG)
$(ACTUAL_PROGRAM)::
# Copies in the file from the JDK_IMPORT_PATH area
$(ACTUAL_PROGRAM_DIR)/%: $(JDK_IMPORT_PATH)/jre/bin/%
......@@ -271,18 +270,6 @@ $(OBJDIR)/main.$(OBJECT_SUFFIX): $(LAUNCHER_SHARE_SRC)/bin/main.c
$(COMPILE.c) $(CC_OBJECT_OUTPUT_FLAG)$(OBJDIR)/main.$(OBJECT_SUFFIX) \
$(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
#
......
jdk/make/common/internal/BinaryPlugs.gmk
浏览文件 @ 7c40dd09
......@@ -116,7 +116,7 @@ PLUG_IMPORT_JARFILE=$(BINARY_PLUGS_JARFILE)
define import-binary-plug-file
@$(ECHO) "PLUG IMPORT: $(@F)"
$(install-file)
$(install-non-module-file)
endef # import-binary-plug-file
# Import classes command
......@@ -184,7 +184,7 @@ PLUG_EXPORT_JARFILE=$(PLUG_EXPORT_DIR)/jre/lib/$(BINARY_PLUGS_JARNAME)
define export-binary-plug-file
@$(ECHO) "PLUG EXPORT: $(@F)"
$(install-file)
$(install-non-module-file)
endef # export-binary-plug-file
# OpenJDK Binary Plug License
......
jdk/make/common/internal/Resources.gmk
浏览文件 @ 7c40dd09
......@@ -139,7 +139,7 @@ STRIP_PROP_FILES = $(PROPERTIES_FILES:%=$(CLASSDESTDIR)/%)
STRIP_PROP_options=$(TEMPDIR)/strip_prop_options
define install-properties-file
$(install-file)
$(CHMOD) a+rw $@
$(call chmod-file, a+rw)
@$(ECHO) "# Adding to strip properties list: $@"
$(ECHO) "$@" >> $(STRIP_PROP_options)
endef
......
jdk/make/common/shared/Defs-java.gmk
浏览文件 @ 7c40dd09
......@@ -138,6 +138,10 @@ JAVACFLAGS += $(OTHER_JAVACFLAGS)
# Needed for javah
JAVAHFLAGS += -bootclasspath $(CLASSBINDIR)
# Needed for javadoc to ensure it builds documentation
# against the newly built classes
JAVADOCFLAGS += -bootclasspath $(CLASSBINDIR)
# Needed for JAVADOC and BOOT_JAVACFLAGS
NO_PROPRIETARY_API_WARNINGS = -XDignore.symbol.file=true
......@@ -155,14 +159,15 @@ ifdef LANGTOOLS_DIST
-jar $(JAVAH_JAR) $(JAVAHFLAGS)
JAVADOC_CMD = $(BOOT_JAVA_CMD) \
"-Xbootclasspath/p:$(JAVADOC_JAR)$(CLASSPATH_SEPARATOR)$(JAVAC_JAR)$(CLASSPATH_SEPARATOR)$(DOCLETS_JAR)" \
-jar $(JAVADOC_JAR)
-jar $(JAVADOC_JAR) $(JAVADOCFLAGS)
else
# If no explicit tools, use boot tools (add VM flags in this case)
JAVAC_CMD = $(JAVA_TOOLS_DIR)/javac $(JAVAC_JVM_FLAGS) \
$(JAVACFLAGS)
JAVAH_CMD = $(JAVA_TOOLS_DIR)/javah \
$(JAVAHFLAGS)
JAVADOC_CMD = $(JAVA_TOOLS_DIR)/javadoc $(JAVA_TOOLS_FLAGS:%=-J%)
JAVADOC_CMD = $(JAVA_TOOLS_DIR)/javadoc $(JAVA_TOOLS_FLAGS:%=-J%) \
$(JAVADOCFLAGS)
endif
# Override of what javac to use (see deploy workspace)
......
jdk/make/common/shared/Sanity.gmk
浏览文件 @ 7c40dd09
......@@ -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
# HOTSPOT_IMPORT_PATH includes these files in it's 'include' directory).
$(TEMPDIR)/%.h: $(SHARE_SRC)/javavm/export/%.h
@$(install-file)
@$(install-non-module-file)
@$(RM) $@.IMPORT
@if [ -r $(HOTSPOT_IMPORT_PATH)/include/$(@F) ]; then \
$(CP) $(HOTSPOT_IMPORT_PATH)/include/$(@F) $@.IMPORT ; \
......@@ -1131,7 +1131,7 @@ $(TEMPDIR)/%.h: $(SHARE_SRC)/javavm/export/%.h
fi
$(TEMPDIR)/%.h: $(PLATFORM_SRC)/javavm/export/%.h
@$(install-file)
@$(install-non-module-file)
@$(RM) $@.IMPORT
@if [ -r $(HOTSPOT_IMPORT_PATH)/include/$(PLATFORM_INCLUDE_NAME)/$(@F) ]; then \
$(CP) $(HOTSPOT_IMPORT_PATH)/include/$(PLATFORM_INCLUDE_NAME)/$(@F) $@.IMPORT ; \
......
jdk/make/docs/Makefile
浏览文件 @ 7c40dd09
......@@ -69,7 +69,7 @@ DRAFT = '<br><strong>DRAFT&nbsp;'$(MILESTONE)-$(BUILD_NUMBER)'</strong>'
THIS_YEAR := $(shell $(DATE) | $(SED) -e 's/ / /g' | $(CUT) -d' ' -f6)
TRADEMARK = &\#x2122;
IGNORED_TAGS = beaninfo revised since.unbundled spec Note ToDo
IGNORED_TAGS = beaninfo revised since.unbundled spec specdefault Note ToDo
JLS3_URL = http://java.sun.com/docs/books/jls/
JLS3_CITE = <a href="$(JLS3_URL)"> \
......
jdk/make/java/awt/Makefile
浏览文件 @ 7c40dd09
......@@ -24,6 +24,7 @@
#
BUILDDIR = ../..
MODULE = awt
PACKAGE = java.awt
PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk
......
jdk/make/java/fdlibm/Makefile
浏览文件 @ 7c40dd09
......@@ -31,6 +31,7 @@
#
BUILDDIR = ../..
MODULE = base
LIBRARY = fdlibm
PRODUCT = java
......
jdk/make/java/hpi/native/Makefile
浏览文件 @ 7c40dd09
......@@ -28,6 +28,7 @@
#
BUILDDIR = ../../..
MODULE = base
LIBRARY = hpi
PRODUCT = java
THREADDIR = native_threads
......
jdk/make/java/hpi/windows/Makefile
浏览文件 @ 7c40dd09
......@@ -26,8 +26,9 @@
#
# Makefile for Windows HPI DLL
#
BUILDDIR = ../../..
LIBRARY = hpi
BUILDDIR = ../../..
MODULE = base
LIBRARY = hpi
PRODUCT = java
THREADDIR = windows_threads
LIB_LOCATION = $(BINDIR)
......
jdk/make/java/instrument/Makefile
浏览文件 @ 7c40dd09
......@@ -27,6 +27,7 @@
# agent, supporting java.lang.instrument
BUILDDIR = ../..
MODULE = instrument
PACKAGE = sun.instrument
LIBRARY = instrument
PRODUCT = sun
......
jdk/make/java/java/Makefile
浏览文件 @ 7c40dd09
......@@ -29,6 +29,7 @@
#
BUILDDIR = ../..
MODULE = base
PACKAGE = java.lang
LIBRARY = java
PRODUCT = java
......@@ -241,7 +242,7 @@ ifneq ($(PLATFORM),windows)
$(GENSRCDIR)/java/lang/UNIXProcess.java: \
$(PLATFORM_SRC)/classes/java/lang/UNIXProcess.java.$(PLATFORM)
$(install-file)
$(install-non-module-file)
clean::
$(RM) $(GENSRCDIR)/java/lang/UNIXProcess.java
......@@ -285,7 +286,7 @@ TZMAPFILE = $(PLATFORM_SRC)/lib/tzmappings
$(TZMAP): $(TZMAPFILE)
$(install-file)
$(CHMOD) 444 $@
$(call chmod-file, 444)
endif
build: $(LIBDIR)/$(PROPS) $(LIBDIR)/$(CAL_PROPS) $(TZMAP)
......@@ -315,7 +316,8 @@ $(CURDATA): \
$(BOOT_JAVA_CMD) -jar $(GENERATECURRENCYDATA_JARFILE) -o $@.temp \
< $(SHARE_SRC)/classes/java/util/CurrencyData.properties
$(MV) $@.temp $@
$(CHMOD) 444 $@
$(install-module-file)
$(call chmod-file, 444)
clean::
$(RM) $(CURDATA)
......@@ -369,7 +371,7 @@ $(GENSRCDIR)/java/lang/CharacterDataLatin1.java \
-usecharforbyte 11 4 1
$(GENSRCDIR)/java/lang/%.java : $(CHARACTERDATA)/%.java.template
$(install-file)
$(install-non-module-file)
clean::
$(RM) $(GENSRCDIR)/java/lang/CharacterDataLatin1.java
......
jdk/make/java/java_crw_demo/Makefile
浏览文件 @ 7c40dd09
......@@ -24,6 +24,8 @@
#
BUILDDIR = ../..
MODULE = demos
LIBRARY = java_crw_demo
PRODUCT = sun
LIBRARY_OUTPUT = java_crw_demo
......
jdk/make/java/java_hprof_demo/Makefile
浏览文件 @ 7c40dd09
......@@ -24,6 +24,7 @@
#
BUILDDIR = ../..
MODULE = instrument
LIBRARY = hprof
PRODUCT = sun
LIBRARY_OUTPUT = hprof_jvmti
......
jdk/make/java/jli/Makefile
浏览文件 @ 7c40dd09
......@@ -30,6 +30,7 @@
# its manifestations (java, javaw, javac, ...).
#
BUILDDIR = ../..
MODULE = base
LIBRARY = jli
PRODUCT = java
......
jdk/make/java/jvm/Makefile
浏览文件 @ 7c40dd09
......@@ -24,6 +24,8 @@
#
BUILDDIR = ../..
MODULE = base
include $(BUILDDIR)/common/Defs.gmk
#
......@@ -36,15 +38,29 @@ FILES_h = $(INCLUDEDIR)/jni.h \
$(INCLUDEDIR)/classfile_constants.h
$(INCLUDEDIR)/%.h: $(SHARE_SRC)/javavm/export/%.h
$(install-file)
$(install-non-module-file)
$(PLATFORM_INCLUDE)/%.h: $(PLATFORM_SRC)/javavm/export/%.h
$(install-non-module-file)
JVMCFG = $(LIBDIR)/$(LIBARCH)/jvm.cfg
#
# How to install jvm.cfg.
#
ifeq ($(ZERO_BUILD), true)
JVMCFG_ARCH = zero
else
JVMCFG_ARCH = $(ARCH)
endif
$(JVMCFG): $(PLATFORM_SRC)/bin/$(JVMCFG_ARCH)/jvm.cfg
$(install-file)
all: build
build: $(FILES_h)
build: $(FILES_h) $(JVMCFG)
clean clobber::
$(RM) $(FILES_h)
$(RM) $(FILES_h) $(JVMCFG)
jdk/make/java/logging/Makefile
浏览文件 @ 7c40dd09
......@@ -24,6 +24,7 @@
#
BUILDDIR = ../..
MODULE = logging
PACKAGE = java.util.logging
PRODUCT = java
include $(BUILDDIR)/common/Defs.gmk
......
jdk/make/java/main/java/Makefile
浏览文件 @ 7c40dd09
......@@ -24,6 +24,7 @@
#
BUILDDIR = ../../..
MODULE = base
PROGRAM = java
PRODUCT = java
......
jdk/make/java/main/javaw/Makefile
浏览文件 @ 7c40dd09
......@@ -28,6 +28,7 @@
#
BUILDDIR = ../../..
MODULE = base
PROGRAM = javaw
PRODUCT = java
......
jdk/make/java/management/Makefile
浏览文件 @ 7c40dd09
......@@ -24,6 +24,7 @@
#
BUILDDIR = ../..
MODULE = management
PACKAGE = java.lang.management
LIBRARY = management
PRODUCT = java
......@@ -99,7 +100,7 @@ $(AGENTJAR): $(LIBDIR) $(TEMPDIR)/manifest
@$(java-vm-cleanup)
$(TEMPDIR)/manifest: $(MANIFEST)
$(install-file)
$(install-manifest-file)
build: $(AGENTJAR)
......
jdk/make/java/net/Makefile
浏览文件 @ 7c40dd09
......@@ -24,6 +24,7 @@
#
BUILDDIR = ../..
MODULE = base
PACKAGE = java.net
LIBRARY = net
PRODUCT = sun
......@@ -111,8 +112,7 @@ LOCALE_SET_DEFINITION = jre
MISC_FILES = $(LIBDIR) $(LIBDIR)/net.properties
$(LIBDIR)/net.properties: $(SHARE_SRC)/lib/net.properties
@$(RM) $@
$(CP) $< $@
$(install-file)
#
# SDP configuration template
......
jdk/make/java/nio/Makefile
浏览文件 @ 7c40dd09
......@@ -28,6 +28,7 @@
#
BUILDDIR = ../..
MODULE = nio
PACKAGE = java.nio
LIBRARY = nio
PRODUCT = java
......@@ -816,7 +817,7 @@ SOR_COPYRIGHT_YEARS = $(shell $(CAT) $(GENSOR_SRC) | \
$(NAWK) '/^.*Copyright.*Sun/ { print $$3 }')
$(TEMPDIR)/$(GENSOR_SRC) : $(GENSOR_SRC)
$(install-file)
$(install-non-module-file)
$(GENSOR_EXE) : $(TEMPDIR)/$(GENSOR_SRC)
$(prep-target)
......
jdk/make/java/npt/Makefile
浏览文件 @ 7c40dd09
......@@ -24,6 +24,9 @@
#
BUILDDIR = ../..
# It's currently used by jpda and hprof. Put it in base module for now.
MODULE = base
LIBRARY = npt
PRODUCT = sun
LIBRARY_OUTPUT = npt
......
jdk/make/java/redist/Makefile
浏览文件 @ 7c40dd09
......@@ -35,6 +35,7 @@
#
BUILDDIR = ../..
MODULE = base
PRODUCT = java
include $(BUILDDIR)/common/Defs.gmk
......@@ -61,7 +62,11 @@ CLASSSHARINGDATA_DIR = $(BUILDDIR)/tools/sharing
# Needed to do file copy
ABS_BUILDDIR :=$(call FullPath,$(BUILDDIR))
all: build
SUBDIRS = fonts sajdi
all clean clobber::
$(SUBDIRS-loop)
all:: build
# List of files created here or coming from BUILDDIR area (this workspace)
INTERNAL_IMPORT_LIST = $(LIBDIR)/classlist
......@@ -70,30 +75,6 @@ INTERNAL_IMPORT_LIST = $(LIBDIR)/classlist
IMPORT_LIST = $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVM_NAME) \
$(LIB_LOCATION)/$(SERVER_LOCATION)/Xusage.txt
# INCLUDE_SA is false on platforms where SA is not supported.
# On platforms where it is supported, we want to allow it to
# not be present, at least temporarily. So,
# if the SA files (well, just sa-jdi.jar) do not exist
# in the HOTSPOT_IMPORT_PATH, then we won't build SA.
SA_EXISTS := $(shell if [ -r $(HOTSPOT_IMPORT_PATH)/lib/sa-jdi.jar ] ; then \
$(ECHO) true; \
else \
$(ECHO) false; \
fi)
ifeq ($(SA_EXISTS), false)
INCLUDE_SA := false
endif
ifeq ($(INCLUDE_SA), true)
IMPORT_LIST += $(LIBDIR)/sa-jdi.jar \
$(LIB_LOCATION)/$(SALIB_NAME)
ifeq ($(PLATFORM), windows)
IMPORT_LIST += $(LIB_LOCATION)/$(SAMAP_NAME) \
$(LIB_LOCATION)/$(SAPDB_NAME)
endif
endif # INCLUDE_SA
# Hotspot client is only available on 32-bit non-Zero builds
ifneq ($(ZERO_BUILD), true)
ifeq ($(ARCH_DATA_MODEL), 32)
......@@ -110,10 +91,10 @@ IMPORT_LIST += $(MS_RUNTIME_LIBRARIES:%=$(BINDIR)/%)
# NOTE: These might actually come from BUILDDIR, depends on the settings.
$(BINDIR)/msvcrt.dll: $(MSVCRT_DLL_PATH)/msvcrt.dll
$(install-import-file)
$(CHMOD) a+x $@
$(call chmod-file, a+x)
$(BINDIR)/$(MSVCRNN_DLL): $(MSVCRNN_DLL_PATH)/$(MSVCRNN_DLL)
$(install-import-file)
$(CHMOD) a+x $@
$(call chmod-file, a+x)
# Get the hotspot .map and .pdb files for client and server
IMPORT_LIST += \
......@@ -140,26 +121,32 @@ $(LIBDIR)/$(JVMLIB_NAME): $(HOTSPOT_LIB_PATH)/$(JVMLIB_NAME)
$(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMMAP_NAME):
@$(prep-target)
-$(CP) $(HOTSPOT_CLIENT_PATH)/$(JVMMAP_NAME) $@
@$(install-module-file)
$(LIB_LOCATION)/$(KERNEL_LOCATION)/$(JVMMAP_NAME):
@$(prep-target)
-$(CP) $(HOTSPOT_KERNEL_PATH)/$(JVMMAP_NAME) $@
@$(install-module-file)
$(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMMAP_NAME):
@$(prep-target)
-$(CP) $(HOTSPOT_SERVER_PATH)/$(JVMMAP_NAME) $@
@$(install-module-file)
$(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMPDB_NAME):
@$(prep-target)
-$(CP) $(HOTSPOT_CLIENT_PATH)/$(JVMPDB_NAME) $@
@$(install-module-file)
$(LIB_LOCATION)/$(KERNEL_LOCATION)/$(JVMPDB_NAME):
@$(prep-target)
-$(CP) $(HOTSPOT_KERNEL_PATH)/$(JVMPDB_NAME) $@
@$(install-module-file)
$(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMPDB_NAME):
@$(prep-target)
-$(CP) $(HOTSPOT_SERVER_PATH)/$(JVMPDB_NAME) $@
@$(install-module-file)
# Windows ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Windows
else # PLATFORM
......@@ -220,7 +207,7 @@ $(LIB_LOCATION)/$(LIBJSIG_NAME): $(HOTSPOT_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/$(LIBJ
$(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_NAME) \
$(LIB_LOCATION)/$(SERVER_LOCATION)/$(LIBJSIG_NAME):
@$(prep-target)
$(LN) -s ../$(LIBJSIG_NAME) $@
$(call install-sym-link, ../$(LIBJSIG_NAME))
$(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMDB_NAME): $(HOTSPOT_CLIENT_PATH)/$(JVMDB_NAME)
$(install-import-file)
......@@ -246,28 +233,6 @@ $(LIB_LOCATION)/$(CLIENT_LOCATION)/Xusage.txt : $(HOTSPOT_CLIENT_PATH)/Xusage.tx
$(LIB_LOCATION)/$(KERNEL_LOCATION)/Xusage.txt : $(HOTSPOT_KERNEL_PATH)/Xusage.txt
$(install-file)
ifeq ($(INCLUDE_SA), true)
# The Serviceability Agent is built in the Hotspot workspace.
# It contains two files:
# - sa-jdi.jar: This goes into the same dir as tools.jar.
# - a shared library: sawindbg.dll on windows / libproc.sa on unix
# This goes into the same dir as the other
# shared libs, eg. libjdwp.so.
$(LIBDIR)/sa-jdi.jar: $(HOTSPOT_IMPORT_PATH)/lib/sa-jdi.jar
$(install-import-file)
$(LIB_LOCATION)/$(SALIB_NAME): $(HOTSPOT_SALIB_PATH)/$(SALIB_NAME)
$(install-import-file)
ifeq ($(PLATFORM), windows)
$(LIB_LOCATION)/$(SAPDB_NAME): $(HOTSPOT_SALIB_PATH)/$(SAPDB_NAME)
$(install-import-file)
$(LIB_LOCATION)/$(SAMAP_NAME): $(HOTSPOT_SALIB_PATH)/$(SAMAP_NAME)
$(install-import-file)
endif # windows
endif # INCLUDE_SA
#
# Specific to OpenJDK building
#
......@@ -288,7 +253,7 @@ INTERNAL_IMPORT_LIST += \
$(LIBDIR)/jce.jar: \
$(BUILDDIR)/closed/tools/crypto/jce/jce.jar
$(install-file)
$(install-non-module-file)
$(LIBDIR)/security/US_export_policy.jar: \
$(BUILDDIR)/closed/tools/crypto/jce/US_export_policy.jar
$(install-file)
......@@ -310,46 +275,6 @@ $(LIBDIR)/classlist: \
$(CLASSSHARINGDATA_DIR)/classlist.$(PLATFORM) $@.temp
$(MV) $@.temp $@
ifndef OPENJDK
# Lucida font files are not included in the OpenJDK distribution.
# Get names of font files
include FILES.gmk
# Copy font files into OUTPUTDIR area
FONTFILES = $(SHARED_FONTFILES)
FONTSDIR = $(LIBDIR)/fonts
FONTSDIRFILE = $(FONTSDIR)/fonts.dir
INTERNAL_IMPORT_LIST += $(FONTFILES)
ifneq ($(PLATFORM), windows)
INTERNAL_IMPORT_LIST += $(FONTSDIRFILE)
endif
$(LIBDIR)/fonts/%.ttf: $(CLOSED_SRC)/share/lib/fonts/%.ttf
$(install-file)
$(FONTSDIRFILE): $(PLATFORM_SRC)/classes/sun/awt/motif/java.fonts.dir
$(install-file)
ifeq ($(PLATFORM), linux)
# The oblique fonts are only needed/wanted on Linux.
OBLFONTSDIR = $(LIBDIR)/oblique-fonts
OBLFONTSDIRFILE = $(OBLFONTSDIR)/fonts.dir
INTERNAL_IMPORT_LIST += $(OBLIQUE_FONTFILES) $(OBLFONTSDIRFILE)
$(LIBDIR)/oblique-fonts/%.ttf: $(CLOSED_SRC)/share/lib/fonts/oblique/%.ttf
$(install-file)
$(OBLFONTSDIRFILE): $(PLATFORM_SRC)/classes/sun/awt/motif/java.oblique-fonts.dir
$(install-file)
endif # linux
endif # !OPENJDK
# Import internal files (ones that are stashed in this source tree)
import_internal_files : $(INTERNAL_IMPORT_LIST)
......
jdk/make/java/redist/FILES.gmk → jdk/make/java/redist/fonts/Makefile
浏览文件 @ 7c40dd09
#
# 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.
#
# This code is free software; you can redistribute it and/or modify it
......@@ -23,6 +23,12 @@
# have any questions.
#
BUILDDIR = ../../..
MODULE = font
PRODUCT = java
include $(BUILDDIR)/common/Defs.gmk
#
# List of lucida font files that we redistribute.
#
......@@ -54,3 +60,52 @@ OBLIQUE_FONTFILES = \
$(LIBDIR)/oblique-fonts/LucidaSansDemiOblique.ttf \
endif
ifndef OPENJDK
# Lucida font files are not included in the OpenJDK distribution.
# Get names of font files
# Copy font files into OUTPUTDIR area
FONTFILES = $(SHARED_FONTFILES)
FONTSDIR = $(LIBDIR)/fonts
FONTSDIRFILE = $(FONTSDIR)/fonts.dir
INTERNAL_IMPORT_LIST = $(FONTFILES)
ifneq ($(PLATFORM), windows)
INTERNAL_IMPORT_LIST += $(FONTSDIRFILE)
endif
$(LIBDIR)/fonts/%.ttf: $(CLOSED_SRC)/share/lib/fonts/%.ttf
$(install-file)
$(FONTSDIRFILE): $(PLATFORM_SRC)/classes/sun/awt/motif/java.fonts.dir
$(install-file)
ifeq ($(PLATFORM), linux)
# The oblique fonts are only needed/wanted on Linux.
OBLFONTSDIR = $(LIBDIR)/oblique-fonts
OBLFONTSDIRFILE = $(OBLFONTSDIR)/fonts.dir
INTERNAL_IMPORT_LIST += $(OBLIQUE_FONTFILES) $(OBLFONTSDIRFILE)
$(LIBDIR)/oblique-fonts/%.ttf: $(CLOSED_SRC)/share/lib/fonts/oblique/%.ttf
$(install-file)
$(OBLFONTSDIRFILE): $(PLATFORM_SRC)/classes/sun/awt/motif/java.oblique-fonts.dir
$(install-file)
endif # linux
all build : $(INTERNAL_IMPORT_LIST)
clean clobber::
$(RM) $(INTERNAL_IMPORT_LIST)
else
all build clean clobber :
endif # !OPENJDK
jdk/make/java/redist/sajdi/Makefile 0 → 100644
浏览文件 @ 7c40dd09
#
# 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::
jdk/make/java/security/Makefile
浏览文件 @ 7c40dd09
......@@ -24,6 +24,7 @@
#
BUILDDIR = ../..
MODULE = base
PACKAGE = java.security
PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk
......@@ -38,11 +39,9 @@ AUTO_FILES_JAVA_DIRS = java/security
#
PROPS_SRC = $(TOPDIR)/src/share/lib/security/java.security
SUNPKCS11 =
ifeq ($(PLATFORM), solaris)
PROPS_SRC = $(TOPDIR)/src/share/lib/security/java.security-solaris
SUNPKCS11 = sunpkcs11
else # PLATFORM
......@@ -57,9 +56,6 @@ endif # PLATFORM
PROPS_BUILD = $(LIBDIR)/security/java.security
SUNPKCS11_SRC = $(TOPDIR)/src/share/lib/security/sunpkcs11-solaris.cfg
SUNPKCS11_BUILD = $(LIBDIR)/security/sunpkcs11-solaris.cfg
POLICY_SRC = $(TOPDIR)/src/share/lib/security/java.policy
POLICY_BUILD = $(LIBDIR)/security/java.policy
......@@ -73,14 +69,12 @@ FILES_class = $(FILES_java:%.java=$(CLASSBINDIR)/%.class)
#
include $(BUILDDIR)/common/Rules.gmk
build: properties $(SUNPKCS11) policy cacerts
build: properties policy cacerts
install: all
properties: classes $(PROPS_BUILD)
sunpkcs11: classes $(SUNPKCS11_BUILD)
policy: classes $(POLICY_BUILD)
cacerts: classes $(CACERTS_BUILD)
......@@ -88,9 +82,6 @@ cacerts: classes $(CACERTS_BUILD)
$(PROPS_BUILD): $(PROPS_SRC)
$(install-file)
$(SUNPKCS11_BUILD): $(SUNPKCS11_SRC)
$(install-file)
$(POLICY_BUILD): $(POLICY_SRC)
$(install-file)
......@@ -99,7 +90,7 @@ $(CACERTS_BUILD): $(CACERTS_SRC)
clean clobber:: .delete.classlist
$(RM) -r $(CLASSBINDIR)/java/security
$(RM) $(PROPS_BUILD) $(POLICY_BUILD) $(CACERTS_BUILD) $(SUNPKCS11_BUILD)
$(RM) $(PROPS_BUILD) $(POLICY_BUILD) $(CACERTS_BUILD)
# Additional Rule for building sun.security.util
$(CLASSBINDIR)/%.class: $(SHARE_SRC)/sun/%.java
......
jdk/make/java/sql/Makefile
浏览文件 @ 7c40dd09
......@@ -28,6 +28,7 @@
#
BUILDDIR = ../..
MODULE = jdbc-base
PACKAGE = java.sql
PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk
......
jdk/make/java/text/Makefile
浏览文件 @ 7c40dd09
......@@ -24,7 +24,7 @@
#
BUILDDIR = ../..
MODULE = base
PACKAGE = java.text
PRODUCT = sun
......
jdk/make/java/verify/Makefile
浏览文件 @ 7c40dd09
......@@ -28,6 +28,7 @@
#
BUILDDIR = ../..
MODULE = base
PRODUCT = java
LIBRARY = verify
include $(BUILDDIR)/common/Defs.gmk
......
jdk/make/java/zip/Makefile
浏览文件 @ 7c40dd09
......@@ -25,6 +25,7 @@
BUILDDIR = ../..
MODULE = base
PACKAGE = java.util.zip
LIBRARY = zip
PRODUCT = sun
......
jdk/make/javax/crypto/Makefile
浏览文件 @ 7c40dd09
......@@ -108,6 +108,7 @@
#
BUILDDIR = ../..
MODULE = base
PACKAGE = javax.crypto
PRODUCT = sun
......@@ -293,7 +294,7 @@ limited: \
$(UNSIGNED_POLICY_BUILDDIR)/limited/US_export_policy.jar: \
$(UNSIGNED_POLICY_BUILDDIR)/unlimited/US_export_policy.jar
$(install-file)
$(install-non-module-file)
$(UNSIGNED_POLICY_BUILDDIR)/limited/local_policy.jar: \
policy/limited/default_local.policy \
......@@ -414,7 +415,7 @@ $(JAR_DESTFILE): $(UNSIGNED_DIR)/jce.jar
else
$(JAR_DESTFILE): $(SIGNED_DIR)/jce.jar
endif
$(install-file)
$(install-non-module-file)
#
# Install the appropriate policy file, depending on the type of build.
......@@ -425,7 +426,7 @@ else
INSTALL_POLICYDIR = $(SIGNED_POLICY_BUILDDIR)
endif
install-limited: \
install-limited-jars: \
$(INSTALL_POLICYDIR)/limited/US_export_policy.jar \
$(INSTALL_POLICYDIR)/limited/local_policy.jar
$(MKDIR) -p $(POLICY_DESTDIR)
......@@ -433,24 +434,28 @@ install-limited: \
$(POLICY_DESTDIR)/US_export_policy.jar \
$(POLICY_DESTDIR)/local_policy.jar
$(CP) $^ $(POLICY_DESTDIR)
install-limited: install-limited-jars install-module-files
ifndef OPENJDK
$(release-warning)
endif
install-unlimited: \
install-unlimited-jars: \
$(INSTALL_POLICYDIR)/unlimited/US_export_policy.jar \
$(INSTALL_POLICYDIR)/unlimited/local_policy.jar
$(INSTALL_POLICYDIR)/unlimited/local_policy.jar
$(MKDIR) -p $(POLICY_DESTDIR)
$(RM) \
$(POLICY_DESTDIR)/US_export_policy.jar \
$(POLICY_DESTDIR)/local_policy.jar
$(CP) $^ $(POLICY_DESTDIR)
install-unlimited: install-unlimited-jars install-module-files
ifndef OPENJDK
$(release-warning)
endif
ifndef OPENJDK
install-prebuilt:
install-prebuilt-jars:
@$(ECHO) "\n>>>Installing prebuilt JCE framework..."
$(RM) $(JAR_DESTFILE) \
$(POLICY_DESTDIR)/US_export_policy.jar \
......@@ -460,8 +465,16 @@ install-prebuilt:
$(PREBUILT_DIR)/jce/US_export_policy.jar \
$(PREBUILT_DIR)/jce/local_policy.jar \
$(POLICY_DESTDIR)
install-prebuilt: install-prebuilt-jars install-module-files
endif
install-module-files: \
$(POLICY_DESTDIR)/US_export_policy.jar \
$(POLICY_DESTDIR)/local_policy.jar
$(POLICY_DESTDIR)/%.jar :
$(install-module-file)
# =====================================================
# Support routines.
......
jdk/make/javax/imageio/Makefile
浏览文件 @ 7c40dd09
......@@ -28,6 +28,7 @@
#
BUILDDIR = ../..
MODULE = imageio
PACKAGE = javax.imageio
PRODUCT = jiio
include $(BUILDDIR)/common/Defs.gmk
......
jdk/make/javax/print/Makefile
浏览文件 @ 7c40dd09
......@@ -28,6 +28,7 @@
#
BUILDDIR = ../..
MODULE = print
PACKAGE = javax.print
PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk
......
jdk/make/javax/sound/Makefile
浏览文件 @ 7c40dd09
......@@ -26,6 +26,7 @@
# WARNING: Make sure the OPENJDK plugs are up-to-date, see make/common/internal/BinaryPlugs.gmk
BUILDDIR = ../..
MODULE = sound
PACKAGE = javax.sound
LIBRARY = jsound
PRODUCT = sun
......
jdk/make/javax/sound/jsoundalsa/Makefile
浏览文件 @ 7c40dd09
......@@ -24,6 +24,7 @@
#
BUILDDIR = ../../..
MODULE = sound
PACKAGE = javax.sound
LIBRARY = jsoundalsa
PRODUCT = sun
......
jdk/make/javax/sound/jsoundds/Makefile
浏览文件 @ 7c40dd09
......@@ -24,6 +24,7 @@
#
BUILDDIR = ../../..
MODULE = sound
PACKAGE = javax.sound
LIBRARY = jsoundds
PRODUCT = sun
......
jdk/make/javax/sql/Makefile
浏览文件 @ 7c40dd09
......@@ -28,6 +28,7 @@
#
BUILDDIR = ../..
MODULE = jdbc-enterprise
PACKAGE = javax.sql
PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk
......
jdk/make/javax/swing/Makefile
浏览文件 @ 7c40dd09
......@@ -24,6 +24,7 @@
#
BUILDDIR = ../..
MODULE = swing
PACKAGE = javax.swing
PRODUCT = com
SWING_SRC = $(SHARE_SRC)/classes/javax/swing
......
jdk/make/javax/swing/beaninfo/SwingBeans.gmk
浏览文件 @ 7c40dd09
......@@ -25,7 +25,7 @@
#
# Makefile to build the BeanInfo generation tool (ie, a doclet), and
# then the beaninfo itself. Swing versions prior to 1.2 is no longer
# then the beaninfo itself. Swing versions prior to 1.2 are no longer
# built.
#
# This makefile could be a lot simpler if we made it more regular.
......@@ -44,13 +44,12 @@ swing-1.2-beans-debug:
$(MAKE) DEBUG_FLAG=true make-swing-beans
LOCAL_JAVADOC = $(JAVADOC_CMD) $(JAVADOCFLAGS)
# get the absolute path to the jar command.
PREFIX = 1.2
JAVADOCFLAGS = $(NO_PROPRIETARY_API_WARNINGS) $(LANGUAGE_VERSION)
JAVADOCFLAGS += $(NO_PROPRIETARY_API_WARNINGS) $(LANGUAGE_VERSION)
SWINGPKG = javax/swing
LOCAL_JAVAC_FLAGS = $(OTHER_JAVACFLAGS)
# since LOCAL_JAVADOC runs on ALT_BOOTDIR, the doclet and all its classes must be compiled to match
# since JAVADOC_CMD runs on ALT_BOOTDIR, the doclet and all its classes must be compiled to match
DOCLET_JAVAC_FLAGS = -source 6 -target 6
include FILES.gmk
......@@ -114,7 +113,7 @@ mkbeaninfo: $(BEANSRCDIR) .delete.beanlist $(FILES_beans) .javadoc.beanlist
.javadoc.beanlist:
if [ -s $(TEMPDIR)/.beans.list ]; \
then $(LOCAL_JAVADOC) $(DOCLETFLAGS) -x $(DEBUG_FLAG) -d $(BEANSRCDIR) -t $(DOCLETSRC)/SwingBeanInfo.template -docletpath $(DOCLETDST) \
then $(JAVADOC_CMD) $(DOCLETFLAGS) -x $(DEBUG_FLAG) -d $(BEANSRCDIR) -t $(DOCLETSRC)/SwingBeanInfo.template -docletpath $(DOCLETDST) \
$(shell if [ -s $(TEMPDIR)/.beans.list ]; then $(CAT) $(TEMPDIR)/.beans.list; fi); \
fi
@$(java-vm-cleanup)
......
jdk/make/javax/swing/plaf/Makefile
浏览文件 @ 7c40dd09
......@@ -24,6 +24,7 @@
#
BUILDDIR = ../../..
MODULE = swing
PACKAGE = javax.swing.plaf
PRODUCT = com
SWING_SRC = $(SHARE_SRC)/classes/javax/swing
......
jdk/make/jpda/back/Makefile
浏览文件 @ 7c40dd09
......@@ -28,6 +28,7 @@
#
BUILDDIR = ../..
MODULE = debugging
LIBRARY = jdwp
PRODUCT = jpda
......
jdk/make/jpda/transport/Makefile
浏览文件 @ 7c40dd09
......@@ -28,6 +28,7 @@
#
BUILDDIR = ../..
MODULE = debugging
PRODUCT = jpda
include $(BUILDDIR)/common/Defs.gmk
......
jdk/make/jpda/transport/shmem/Makefile
浏览文件 @ 7c40dd09
......@@ -28,6 +28,7 @@
#
BUILDDIR = ../../..
MODULE = debugging
LIBRARY = dt_shmem
PRODUCT = jbug
......
jdk/make/jpda/transport/socket/Makefile
浏览文件 @ 7c40dd09
......@@ -28,6 +28,7 @@
#
BUILDDIR = ../../..
MODULE = debugging
LIBRARY = dt_socket
PRODUCT = jbug
......
jdk/make/jpda/tty/Makefile
浏览文件 @ 7c40dd09
......@@ -28,6 +28,7 @@
#
BUILDDIR = ../..
MODULE = jdb
PACKAGE = com.sun.tools.example.debug.tty
PRODUCT = jpda
PROGRAM = jdb
......
jdk/make/launchers/Makefile
浏览文件 @ 7c40dd09
......@@ -28,33 +28,23 @@
#
BUILDDIR = ..
MODULE = tools
PACKAGE = launchers
PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk
# Run MAKE $@ for a launcher:
# Run MAKE $@ for a launcher for the corba module:
# $(call make-launcher, name, mainclass, java-args, main-args)
define make-launcher
define make-corba-launcher
$(CD) $(BUILDDIR)/launchers && \
$(MAKE) -f Makefile.launcher \
PROGRAM=$(strip $1) \
MAIN_CLASS=$(strip $2) \
MAIN_JAVA_ARGS="$(strip $3)" \
MAIN_ARGS="$(strip $4)" $@
MODULE=corba \
PROGRAM=$(strip $1) \
MAIN_CLASS=$(strip $2) \
MAIN_JAVA_ARGS="$(strip $3)" \
MAIN_ARGS="$(strip $4)"
endef
# Run MAKE $@ for all launchers
ifeq ($(PLATFORM),windows)
# Run MAKE $@ for all platform specific launchers
define make-platform-specific-launchers
$(call make-launcher, kinit, sun.security.krb5.internal.tools.Kinit, , )
$(call make-launcher, klist, sun.security.krb5.internal.tools.Klist, , )
$(call make-launcher, ktab, sun.security.krb5.internal.tools.Ktab, , )
endef
else
# Run MAKE $@ for all platform specific launchers
define make-platform-specific-launchers
endef
endif
# Run MAKE $@ for all generic launchers
define make-all-launchers
$(call make-launcher, appletviewer, sun.applet.Main, , )
......@@ -85,36 +75,29 @@ $(call make-launcher, jstack, sun.tools.jstack.JStack, \
-J-Dsun.jvm.hotspot.debugger.useWindbgDebugger, )
$(call make-launcher, jstat, sun.tools.jstat.Jstat, , )
$(call make-launcher, jstatd, sun.tools.jstatd.Jstatd, , )
$(call make-launcher, keytool, sun.security.tools.KeyTool, , )
$(call make-launcher, native2ascii, sun.tools.native2ascii.Main, , )
$(call make-launcher, orbd, com.sun.corba.se.impl.activation.ORBD, \
-J-Dcom.sun.CORBA.activation.DbDir=./orb.db \
-J-Dcom.sun.CORBA.activation.Port=1049 \
-J-Dcom.sun.CORBA.POA.ORBServerId=1, )
$(call make-launcher, pack200, com.sun.java.util.jar.pack.Driver, , --pack)
$(call make-launcher, policytool, sun.security.tools.PolicyTool, , )
$(call make-launcher, rmic, sun.rmi.rmic.Main, , )
$(call make-launcher, rmid, sun.rmi.server.Activation, , )
$(call make-launcher, rmiregistry, sun.rmi.registry.RegistryImpl, , )
$(call make-launcher, schemagen, com.sun.tools.internal.jxc.SchemaGenerator, , )
$(call make-launcher, serialver, sun.tools.serialver.SerialVer, , )
$(call make-launcher, servertool, com.sun.corba.se.impl.activation.ServerTool, , )
$(call make-launcher, tnameserv, com.sun.corba.se.impl.naming.cosnaming.TransientNameServer, \
$(call make-launcher, xjc, com.sun.tools.internal.xjc.Driver, , )
$(call make-launcher, wsgen, com.sun.tools.internal.ws.WsGen, , )
$(call make-launcher, wsimport, com.sun.tools.internal.ws.WsImport, , )
$(call make-corba-launcher, orbd, com.sun.corba.se.impl.activation.ORBD, \
-J-Dcom.sun.CORBA.activation.DbDir=./orb.db \
-J-Dcom.sun.CORBA.activation.Port=1049 \
-J-Dcom.sun.CORBA.POA.ORBServerId=1, )
$(call make-corba-launcher, servertool, com.sun.corba.se.impl.activation.ServerTool, , )
$(call make-corba-launcher, tnameserv, com.sun.corba.se.impl.naming.cosnaming.TransientNameServer, \
-J-Dcom.sun.CORBA.activation.DbDir=./orb.db \
-J-Djava.util.logging.LoggingPermission=contol \
-J-Dcom.sun.CORBA.POA.ORBServerId=1, )
$(call make-launcher, wsgen, com.sun.tools.internal.ws.WsGen, , )
$(call make-launcher, wsimport, com.sun.tools.internal.ws.WsImport, , )
$(call make-launcher, xjc, com.sun.tools.internal.xjc.Driver, , )
endef
build:
$(make-all-launchers)
$(make-platform-specific-launchers)
clean clobber::
$(make-all-launchers)
$(make-platform-specific-launchers)
include $(BUILDDIR)/common/Rules.gmk
jdk/make/mkdemo/jvmti/Makefile
浏览文件 @ 7c40dd09
......@@ -28,6 +28,7 @@
#
BUILDDIR = ../..
MODULE = demos
PRODUCT = demos
include $(BUILDDIR)/common/Defs.gmk
......
jdk/make/mkdemo/management/Makefile
浏览文件 @ 7c40dd09
......@@ -28,6 +28,7 @@
#
BUILDDIR = ../..
MODULE = demos
PRODUCT = demos
include $(BUILDDIR)/common/Defs.gmk
......
jdk/make/mksample/dtrace/Makefile
浏览文件 @ 7c40dd09
......@@ -29,6 +29,7 @@
BUILDDIR = ../..
MODULE = samples
PRODUCT = java
include $(BUILDDIR)/common/Defs.gmk
......
jdk/make/mksample/jmx/jmx-scandir/Makefile
浏览文件 @ 7c40dd09
......@@ -29,6 +29,7 @@
BUILDDIR = ../../..
MODULE = samples
PRODUCT = java
include $(BUILDDIR)/common/Defs.gmk
......
jdk/make/mksample/nbproject/Makefile
浏览文件 @ 7c40dd09
......@@ -29,6 +29,7 @@
BUILDDIR = ../..
MODULE = samples
PRODUCT = java
include $(BUILDDIR)/common/Defs.gmk
......
jdk/make/mksample/nio/file/Makefile
浏览文件 @ 7c40dd09
......@@ -29,6 +29,7 @@
BUILDDIR = ../../..
MODULE = samples
PRODUCT = java
include $(BUILDDIR)/common/Defs.gmk
......
jdk/make/mksample/nio/multicast/Makefile
浏览文件 @ 7c40dd09
......@@ -29,6 +29,7 @@
BUILDDIR = ../../..
MODULE = samples
PRODUCT = java
include $(BUILDDIR)/common/Defs.gmk
......
jdk/make/mksample/nio/server/Makefile
浏览文件 @ 7c40dd09
......@@ -29,6 +29,7 @@
BUILDDIR = ../../..
MODULE = samples
PRODUCT = java
include $(BUILDDIR)/common/Defs.gmk
......
jdk/make/mksample/scripting/scriptpad/Makefile
浏览文件 @ 7c40dd09
......@@ -29,6 +29,7 @@
BUILDDIR = ../../..
MODULE = samples
PRODUCT = java
include $(BUILDDIR)/common/Defs.gmk
......
jdk/make/mksample/webservices/EbayClient/Makefile
浏览文件 @ 7c40dd09
......@@ -29,6 +29,7 @@
BUILDDIR = ../../..
MODULE = samples
PRODUCT = java
include $(BUILDDIR)/common/Defs.gmk
......
jdk/make/mksample/webservices/EbayServer/Makefile
浏览文件 @ 7c40dd09
......@@ -29,6 +29,7 @@
BUILDDIR = ../../..
MODULE = samples
PRODUCT = java
include $(BUILDDIR)/common/Defs.gmk
......
jdk/make/modules/Makefile
浏览文件 @ 7c40dd09
......@@ -23,115 +23,106 @@
# have any questions.
#
BUILDDIR = ..
include $(BUILDDIR)/common/Defs.gmk
#
# Modularizing the JDK
# - Post jdk build process until the source tree is restructured
# for modules build
# - <outputdir>/modules/<module> will be created for each module.
#
# Steps:
# 0. During jdk build before this makefile is invoked, classes,
# resource files, and other non-class files such as native libraries,
# properties file, images, etc are created.
#
# Non-class files are copied to <outputdir>/tmp/modules/<MODULE>
# directory in this step to prepare for the post-build modularization.
#
# The MODULE variable defined in other makefiles specifies
# the lowest-level module that the non-class files belong to.
# The name might or might not be the same as the name of the modules
# in the resulting <outputdir>/modules directory.
#
# 1. Unpack all jars in the <builddir>/lib directory to a temporary
# location (<outputdir>/tmp/modules/classes) to prepare for modules
# creation.
#
# 2. Run ClassAnalyzer tool to analyze all jdk classes and generate
# class list for all modules and also perform dependency analysis.
#
# Input configuration files :-
#
# modules.config : defines the low-level modules and specifies
# what classes and resource files each module includes.
# modules.group : defines the module groups and its members.
# jdk7.depconfig : lists the dynamic dependencies including
# use of reflection Class.forName and JNI FindClass and
# service provider.
# optional.depconfig : lists the optional dependencies
#
# 3. Create one directory for each module (<outputdir>/modules/<module>)
# based on the output files from (2).
#
# modules.list lists the modules to be created for the modules
# build and its members. For each module (m) in modules.list,
# a. create $m/lib/$m.jar with all classes and resource files
# listed in $m.classlist and $m.resources respectively.
# b. copy all non-class files from its members to
# <outputdir>/modules/$m.
BUILDDIR = ..
include $(BUILDDIR)/common/Defs.gmk
CLASSANALYZER_JAR=$(BUILDTOOLJARDIR)/classanalyzer.jar
JAVA_FLAGS=$(JAVA_TOOLS_FLAGS) -Xbootclasspath:$(CLASSBINDIR)
MODULE_LIB = $(ABS_OUTPUTDIR)/modules
MAINMANIFEST=$(JDK_TOPDIR)/make/tools/manifest.mf
MODULE_JAR_MANIFEST_FILE=$(ABS_TEMPDIR)/manifest.tmp
TMP=$(ABS_TEMPDIR)/modules
MODULE_CLASSLIST = $(TMP)/classlist
MODULE_CLASSES = $(TMP)/classes
MODULE_LIST = $(MODULE_CLASSLIST)/modules.list
# Modules in the modules/ext directory
EXT_MODULES = localedata security-sunec security-sunjce
# Build PKCS#11 on all platforms except 64-bit Windows.
# We exclude windows-amd64 because we don't have any
# 64-bit PKCS#11 implementations to test with on that platform.
PKCS11 = security-sunpkcs11
ifeq ($(ARCH_DATA_MODEL), 64)
ifeq ($(PLATFORM), windows)
PKCS11 =
endif
endif
EXT_MODULES += $(PKCS11)
# Build Microsoft CryptoAPI provider only on (non-64-bit) Windows platform.
ifeq ($(PLATFORM), windows)
ifneq ($(ARCH_DATA_MODEL), 64)
EXT_MODULES += security-sunmscapi
endif
endif
JDK_MODULES = tools
SUBDIRS = tools
all build clean clobber::
$(SUBDIRS-loop)
TMP = $(ABS_MODULES_TEMPDIR)
MODULE_CLASSLIST = $(ABS_MODULES_TEMPDIR)/classlist
MODULE_CLASSES = $(ABS_MODULES_TEMPDIR)/classes
MODULES_LIST = $(MODULE_CLASSLIST)/modules.list
all:: unpack-jars gen-classlist modularize
$(CLASSANALYZER_JAR):
$(CD) tools && $(MAKE) all
JAR_LIST := $(shell $(FIND) $(ABS_OUTPUTDIR)/lib -name \*.jar -depth)
JAR_LIST := $(shell $(FIND) $(ABS_OUTPUTDIR)/lib -name \*.jar -print)
unpack-jars:
@$(ECHO) ">>>Making "$@" @ `$(DATE)` ..."
$(RM) -rf $(MODULE_CLASSES)
$(MKDIR) -p $(MODULE_CLASSES)
$(CP) -rf $(CLASSBINDIR)/* $(MODULE_CLASSES)
for jf in $(JAR_LIST) ; do \
@for jf in $(JAR_LIST) ; do \
$(CD) $(MODULE_CLASSES) && $(BOOT_JAR_CMD) xf $$jf $(BOOT_JAR_JFLAGS);\
done
gen-classlist: $(CLASSANALYZER_JAR)
@$(ECHO) ">>>Making "$@" @ `$(DATE)` ..."
@$(RM) -rf $(MODULE_CLASSLIST)
@$(MKDIR) -p $(MODULE_CLASSLIST)
@# Use java in the default tool directory.
@# OUTPUTDIR for solaris 64-bit doesn't have the tools.
$(JAVA_TOOLS_DIR)/java $(JAVA_FLAGS) \
-Dclassanalyzer.debug \
-jar $(CLASSANALYZER_JAR) \
-jdkhome $(OUTPUTDIR) \
-config modules.config \
-config modules.group \
-depconfig jdk7.depconfig \
-depconfig optional.depconfig \
-showdynamic \
-output $(MODULE_CLASSLIST)
@$(ECHO) ">>>Finished making "$@" @ `$(DATE)` ..."
gen-classlist:
$(CD) tools && $(MAKE) all
modularize: $(MODULE_JAR_MANIFEST_FILE)
@$(ECHO) ">>>Making "$@" @ `$(DATE)` ..."
@$(RM) -rf $(MODULE_LIB)
@$(MKDIR) -p $(MODULE_LIB)/lib
@$(MKDIR) -p $(MODULE_LIB)/jre/lib/ext
@$(RM) -rf $(MODULES_DIR)
@# create modules
for m in `$(NAWK) '{print $$1}' $(MODULE_LIST)` ; do \
@# create jar file for modules and
@# copy other files from all members of this module
for m in `$(NAWK) '{print $$1}' $(MODULES_LIST)` ; do \
$(ECHO) "Creating module $$m" ; \
$(SED) -e 's%\\%\/%g' < $(MODULE_CLASSLIST)/$$m.classlist > $(TMP)/tmp.cf ; \
if [ -f $(MODULE_CLASSLIST)/$$m.resources ] ; then \
$(SED) -e 's%\\%\/%g' < $(MODULE_CLASSLIST)/$$m.resources >> $(TMP)/tmp.cf ; \
fi ; \
$(MKDIR) -p $(ABS_MODULES_DIR)/$$m/lib; \
$(CD) $(MODULE_CLASSES) && \
$(BOOT_JAR_CMD) c0mf $(MODULE_JAR_MANIFEST_FILE) \
$(MODULE_LIB)/$$m.jar \
@$(TMP)/tmp.cf \
$(BOOT_JAR_JFLAGS) ; \
done
$(ABS_MODULES_DIR)/$$m/lib/$$m.jar \
@$(TMP)/tmp.cf \
$(BOOT_JAR_JFLAGS); \
for s in `$(GREP) "^$$m" $(MODULES_LIST)` ; do \
if [ -d $(TMP)/$$s ] ; then \
$(CP) -rf $(TMP)/$$s/* $(ABS_MODULES_DIR)/$$m; \
$(RM) -rf $(ABS_MODULES_DIR)/$$m/classes; \
fi \
done \
done
@$(CD) $(MODULE_CLASSES) && $(java-vm-cleanup)
@# move modules to lib, jre/lib, or jre/lib/ext
for m in $(EXT_MODULES) ; do \
$(MV) $(MODULE_LIB)/$$m.jar $(MODULE_LIB)/jre/lib/ext ; \
done
for m in $(JDK_MODULES) ; do \
$(MV) $(MODULE_LIB)/$$m.jar $(MODULE_LIB)/lib ; \
done
$(MV) $(MODULE_LIB)/*.jar $(MODULE_LIB)/jre/lib
@$(ECHO) ">>>Finished making "$@" @ `$(DATE)` ..."
$(MODULE_JAR_MANIFEST_FILE):
......@@ -139,7 +130,5 @@ $(MODULE_JAR_MANIFEST_FILE):
clean clobber::
$(RM) -rf $(MODULE_CLASSLIST)
$(RM) -rf $(MODULE_LIB)
$(RM) -f $(MODULE_JAR_MANIFEST_FILE)
$(RM) -f $(CLASSANALYZER_JAR)
$(RM) -rf $(MODULES_DIR)
$(RM) $(MODULE_JAR_MANIFEST_FILE)
jdk/make/modules/modules.config
浏览文件 @ 7c40dd09
......@@ -372,15 +372,19 @@ module management {
/**************************************************************************/
module tracing {
// tracing
include com.sun.tracing.**, sun.tracing.**;
}
module instrument {
// java.lang.instrument
include java.lang.instrument.*, sun.instrument.*;
// tracing
include com.sun.tracing.**, sun.tracing.**;
// HPROF support
include com.sun.demo.jvmti.hprof.*;
include tracing;
}
/**************************************************************************/
......@@ -391,15 +395,17 @@ module rmi-activation {
sun.rmi.server.InactiveGroupException;
}
module rmic {
// rmic is included in tools
include sun.rmi.rmic.**;
}
module rmi {
include java.rmi.**, sun.rmi.**, com.sun.rmi.**;
// SSL factories are in rmi
include javax.rmi.ssl.**;
// rmic is in tools
exclude sun.rmi.rmic.**;
// supporting classes in sun.misc and dependencies
include sun.misc.GC;
}
......@@ -468,9 +474,14 @@ module security-smartcardio {
include javax.smartcardio.**, sun.security.smartcardio.**;
}
module security-auth {
include com.sun.security.auth.**, sun.security.util.AuthResources_*;
}
module security-misc {
include com.sun.security.auth.**, sun.security.util.AuthResources_*,
sun.security.pkcs.*,
include security-auth;
include sun.security.pkcs.*,
sun.security.pkcs12.*;
// this class is a candidate to be removed.
......@@ -500,9 +511,8 @@ module jndi-rmiregistry {
}
module jndi-dns {
include net-dns;
include com.sun.jndi.dns.**, com.sun.jndi.url.dns.**;
include sun.net.dns.**; // to access DNS config.
include sun.net.spi.nameservice.dns.**; // for DNS-only name service.
}
module jndi-cosnaming {
......@@ -677,31 +687,69 @@ module corba {
/**************************************************************************/
module client {
module applet {
include java.applet.**,
java.awt.**,
javax.accessibility.*,
javax.imageio.**,
javax.print.**,
javax.sound.**,
javax.swing.**,
sun.applet.**,
sun.audio.**,
sun.applet.**;
}
module awt {
include java.awt.**,
sun.awt.**,
sun.dc.**,
sun.font.**,
com.sun.awt.**;
}
module font {
include sun.font.**;
}
module imageio {
include javax.imageio.**,
com.sun.imageio.**;
}
module java2d {
include sun.dc.**,
sun.java2d.**,
sun.print.**,
com.sun.image.**;
}
module media {
include com.sun.media.**;
}
module print {
include javax.print.**,
sun.print.**;
}
module sound {
include javax.sound.**;
}
module swing {
include javax.swing.**,
sun.swing.**,
com.sun.accessibility.**,
com.sun.awt.**,
com.sun.image.**,
com.sun.imageio.**,
com.sun.java.swing.*, // sajdi also contains classes in a subpackage;
// so use '*' instead of '**'
// sajdi also contains classes in subpackages of com.sun.java.swing;
// so use '*' instead of '**'
com.sun.java.swing.*,
com.sun.java.swing.plaf.**,
com.sun.media.**,
com.sun.swing.**;
}
module client {
include applet,
awt,
font,
imageio,
java2d,
media,
print,
sound,
swing;
include javax.accessibility.*,
sun.audio.**,
com.sun.accessibility.**;
// Bidi class in client module for now
include java.text.Bidi, sun.text.bidi.*;
......@@ -723,7 +771,13 @@ module client {
/**************************************************************************/
module jkernel {
include sun.jkernel.*;
}
module deploy {
include jkernel;
// For now, all plugin and JNLP
include com.sun.java.browser.**,
netscape.**,
......@@ -732,8 +786,7 @@ module deploy {
com.sun.deploy.**,
com.sun.javaws.**,
javax.jnlp.*,
com.sun.jnlp.*,
sun.jkernel.*;
com.sun.jnlp.*;
// Hook for http authentication
include sun.net.www.protocol.http.AuthCacheBridge;
......@@ -741,6 +794,11 @@ module 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 {
// NTLM authentication support
include sun.net.www.protocol.http.ntlm.*;
......@@ -824,6 +882,7 @@ module tools {
debugging,
jaxws-tools,
jdb,
rmic,
sajdi;
// include gui-tools in tools module unless the tool binaries
......@@ -834,8 +893,7 @@ module tools {
com.sun.jarsigner.**,
com.sun.javac.**,
com.sun.javadoc.**, com.sun.source.**,
sun.jvmstat.**,
sun.rmi.rmic.**;
sun.jvmstat.**;
}
/**************************************************************************/
......@@ -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 {
include **;
}
jdk/make/modules/optional.depconfig
浏览文件 @ 7c40dd09
#
# Copyright 2009 Sun Microsystems, Inc. All Rights Reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License version 2 only, as
# published by the Free Software Foundation. Sun designates this
# particular file as subject to the "Classpath" exception as provided
# by Sun in the LICENSE file that accompanied this code.
#
# This code is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# version 2 for more details (a copy is included in the LICENSE file that
# accompanied this code).
#
# You should have received a copy of the GNU General Public License version
# 2 along with this work; if not, write to the Free Software Foundation,
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
#
# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
# CA 95054 USA or visit www.sun.com if you need additional information or
# have any questions.
#
# public final java.nio.channels.SocketChannel getChannel()
@Optional
sun.security.ssl.BaseSSLSocketImpl -> java.nio.channels.SocketChannel
......
jdk/make/modules/tools/Makefile
浏览文件 @ 7c40dd09
......@@ -28,58 +28,128 @@
#
BUILDDIR = ../..
PACKAGE = com.sun.classanalyzer
PRODUCT = tools
PROGRAM = classanalyzer
include $(BUILDDIR)/common/Defs.gmk
PKGDIR = com/sun/classanalyzer
BUILDTOOL_SOURCE_ROOT = src
BUILDTOOL_MAIN = $(PKGDIR)/ClassAnalyzer.java
BUILTTOOL_MAINCLASS = $(subst /,.,$(BUILDTOOL_MAIN:%.java=%))
BUILDTOOL_MAIN_SOURCE_FILE = $(BUILDTOOL_SOURCE_ROOT)/$(BUILDTOOL_MAIN)
BUILDTOOL_MANIFEST_FILE = $(BUILDTOOLCLASSDIR)/$(PROGRAM)_manifest.mf
BUILDTOOL_JAR_FILE = $(BUILDTOOLJARDIR)/$(PROGRAM).jar
BUILDTOOL_MANIFEST_FILE = $(BUILDTOOLCLASSDIR)/classanalyzer_manifest.mf
FILES_java := $(shell $(CD) $(BUILDTOOL_SOURCE_ROOT) \
&& $(FIND) $(PKGDIR) $(SCM_DIRS_prune) -o -type f -print)
&& $(FIND) $(PKGDIR) -type f -print)
FILES_class = $(FILES_java:%.java=$(BUILDTOOLCLASSDIR)/%.class)
all build: $(BUILDTOOL_JAR_FILE) tool_info
CLASSANALYZER_JAR_FILE = $(BUILDTOOLJARDIR)/classanalyzer.jar
#
# ClassAnalyzer depends on the com.sun.tools.classfile API.
# The tool is compiled with the latest version of the classfile
# library in the langtools repo to make sure that synchronized
# change is made if the classfile API is changed.
#
# If langtools repo exists, build its own copy of the
# classfile library and use it for compile time and runtime.
# If not exist (the top level repo is not a forest), use
# the built jdk tools that imports tools.jar from the latest
# promoted build.
#
# If the classfile API is changed but not yet in a promoted build,
# the build might fail and the tool would need the langtools repo
# to build in that case.
#
ifndef LANGTOOLS_TOPDIR
LANGTOOLS_TOPDIR=$(JDK_TOPDIR)/../langtools
endif
LANGTOOLS_TOPDIR_EXISTS := $(shell \
if [ -d $(LANGTOOLS_TOPDIR) ] ; then \
echo true; \
else \
echo false; \
fi)
CLASSFILE_SRC = $(LANGTOOLS_TOPDIR)/src/share/classes
CLASSFILE_PKGDIR = com/sun/tools/classfile
ifeq ($(LANGTOOLS_TOPDIR_EXISTS), true)
FILES_classfile_java := $(shell \
$(CD) $(CLASSFILE_SRC) && \
$(FIND) $(CLASSFILE_PKGDIR) -name '*.java' -print)
FILES_classfile_class = $(FILES_classfile_java:%.java=$(BUILDTOOLCLASSDIR)/%.class)
CLASSFILE_JAR_FILE = $(BUILDTOOLJARDIR)/classfile.jar
BUILDTOOL_JAVAC = $(BOOT_JAVAC_CMD) $(JAVAC_JVM_FLAGS) \
$(BOOT_JAVACFLAGS) -classpath $(CLASSFILE_JAR_FILE)
BUILDTOOL_JAVA = $(BOOT_JAVA_CMD) $(JAVA_TOOLS_FLAGS) \
-Xbootclasspath/p:$(CLASSFILE_JAR_FILE)
else
# if langtools doesn't exist, use tools from the built jdk
BUILDTOOL_JAVAC = $(BINDIR)/javac $(JAVAC_JVM_FLAGS) \
$(BOOT_JAVACFLAGS)
BUILDTOOL_JAVA = $(BINDIR)/java $(JAVA_TOOLS_FLAGS)
endif
# Location of the output modules.list, <module>.classlist
# and other output files generated by the class analyzer tool.
#
MODULE_CLASSLIST = $(MODULES_TEMPDIR)/classlist
all build: classanalyzer gen-classlist
classanalyzer: $(CLASSFILE_JAR_FILE) $(CLASSANALYZER_JAR_FILE)
gen-classlist:
@$(ECHO) ">>>Making "$@" @ `$(DATE)` ..."
@$(RM) -rf $(MODULE_CLASSLIST)
@$(MKDIR) -p $(MODULE_CLASSLIST)
$(BUILDTOOL_JAVA) \
-Dclassanalyzer.debug \
-jar $(CLASSANALYZER_JAR_FILE) \
-jdkhome $(OUTPUTDIR) \
-config ../modules.config \
-config ../modules.group \
-depconfig ../jdk7.depconfig \
-depconfig ../optional.depconfig \
-showdynamic \
-output $(MODULE_CLASSLIST)
@$(ECHO) ">>>Finished making "$@" @ `$(DATE)` ..."
$(BUILDTOOL_MANIFEST_FILE): $(BUILDTOOL_MAIN_SOURCE_FILE)
@$(prep-target)
$(ECHO) "Main-Class: $(BUILTTOOL_MAINCLASS)" > $@
$(BUILDTOOLCLASSDIR)/$(CLASSFILE_PKGDIR)/%.class : $(CLASSFILE_SRC)/$(CLASSFILE_PKGDIR)/%.java
@$(prep-target)
@$(BUILDTOOL_JAVAC) \
-sourcepath $(CLASSFILE_SRC) \
-d $(BUILDTOOLCLASSDIR) $<
$(BUILDTOOLCLASSDIR)/%.class : $(BUILDTOOL_SOURCE_ROOT)/%.java
@$(prep-target)
$(JAVAC_CMD) \
$(BUILDTOOL_JAVAC) \
-sourcepath $(BUILDTOOL_SOURCE_ROOT) \
-d $(BUILDTOOLCLASSDIR) $<
$(BUILDTOOL_JAR_FILE): $(BUILDTOOL_MANIFEST_FILE) $(FILES_class)
$(CLASSANALYZER_JAR_FILE): $(BUILDTOOL_MANIFEST_FILE) $(FILES_class)
@$(prep-target)
$(CD) $(BUILDTOOLCLASSDIR) && \
$(BOOT_JAR_CMD) cfm $@ $(BUILDTOOL_MANIFEST_FILE) \
$(PKGDIR) $(BOOT_JAR_JFLAGS) || $(RM) $@
@$(java-vm-cleanup)
$(BUILDTOOLJARDIR)/classfile.jar: $(FILES_classfile_class)
@$(prep-target)
$(BOOT_JAR_CMD) cfm $@ $(BUILDTOOL_MANIFEST_FILE) \
-C $(BUILDTOOLCLASSDIR) $(PKGDIR) \
$(BOOT_JAR_JFLAGS) || $(RM) $@
$(java-vm-cleanup)
# Printing out a build tool information line
define printBuildToolSetting
if [ "$2" != "" ] ; then $(PRINTF) "%-25s %s\n" "$1:" "$2"; fi
endef
# Print out the build tool information
tool_info:
@$(ECHO) "========================================================="
@$(call printBuildToolSetting,BUILDTOOL,$(PROGRAM))
@$(call printBuildToolSetting,PACKAGE,$(PACKAGE))
@$(call printBuildToolSetting,BUILDTOOL_SOURCE_ROOT,$(BUILDTOOL_SOURCE_ROOT))
@$(call printBuildToolSetting,BUILTTOOL_MAINCLASS,$(BUILTTOOL_MAINCLASS))
@$(call printBuildToolSetting,BUILDTOOL_JAR_FILE,$(BUILDTOOL_JAR_FILE))
@$(ECHO) "========================================================="
$(CD) $(BUILDTOOLCLASSDIR) && \
$(BOOT_JAR_CMD) cf $@ \
$(CLASSFILE_PKGDIR) $(BOOT_JAR_JFLAGS) || $(RM) $@
@$(java-vm-cleanup)
clean clobber::
@$(RM) -rf $(BUILDTOOLCLASSDIR)/$(PKGDIR)
@$(RM) -rf $(BUILDTOOLCLASSDIR)/$(CLASSFILE_PKGDIR)
@$(RM) $(BUILDTOOL_MANIFEST_FILE)
@$(RM) $(BUILDTOOL_JAR_FILE)
@$(RM) $(CLASSANALYZER_JAR_FILE)
@$(RM) $(CLASSFILE_JAR_FILE)
jdk/make/modules/tools/build.xml
浏览文件 @ 7c40dd09
<!--
Copyright 2009 Sun Microsystems, Inc. All Rights Reserved.
<?xml version="1.0" encoding="UTF-8"?>
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
<!--
Copyright 2009 Sun Microsystems, Inc. All Rights Reserved.
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
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.
- Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
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).
- Neither the name of Sun Microsystems nor the names of its
contributors may be used to endorse or promote products derived
from this software without specific prior written permission.
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.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
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.
-->
<project name="classanalyzer" default="build" basedir=".">
......
jdk/make/modules/tools/nbproject/project.properties
浏览文件 @ 7c40dd09
#
# Copyright 2009 Sun Microsystems, Inc. All Rights Reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
# 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.
#
# - Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# 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).
#
# - Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
# 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.
#
# - Neither the name of Sun Microsystems nor the names of its
# contributors may be used to endorse or promote products derived
# from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# 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.
#
application.title=classanalyzer
......
jdk/make/modules/tools/nbproject/project.xml
浏览文件 @ 7c40dd09
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2009 Sun Microsystems, Inc. All Rights Reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
- Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
- Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
- Neither the name of Sun Microsystems nor the names of its
contributors may be used to endorse or promote products derived
from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Copyright 2009 Sun Microsystems, Inc. All Rights Reserved.
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
This code is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License version 2 only, as
published by the Free Software Foundation. Sun designates this
particular file as subject to the "Classpath" exception as provided
by Sun in the LICENSE file that accompanied this code.
This code is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
version 2 for more details (a copy is included in the LICENSE file that
accompanied this code).
You should have received a copy of the GNU General Public License version
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
CA 95054 USA or visit www.sun.com if you need additional information or
have any questions.
-->
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.java.j2seproject</type>
<configuration>
......
jdk/make/modules/tools/src/com/sun/classanalyzer/Module.java
浏览文件 @ 7c40dd09
......@@ -444,8 +444,8 @@ public class Module implements Comparable<Module> {
}
void printClassListTo(String output) throws IOException {
// no file created if the module doesn't have any class
if (classes.isEmpty()) {
// no file created if the module doesn't have any class nor resource
if (isEmpty()) {
return;
}
......@@ -482,7 +482,7 @@ public class Module implements Comparable<Module> {
void printDependenciesTo(String output, boolean showDynamic) throws IOException {
// no file created if the module doesn't have any class
if (classes.isEmpty()) {
if (isEmpty()) {
return;
}
......
jdk/make/sun/applet/Makefile
浏览文件 @ 7c40dd09
......@@ -28,6 +28,7 @@
#
BUILDDIR = ../..
MODULE = applet
PACKAGE = sun.applet
PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk
......
jdk/make/sun/awt/Makefile
浏览文件 @ 7c40dd09
......@@ -24,6 +24,7 @@
#
BUILDDIR = ../..
MODULE = awt
PACKAGE = sun.awt
LIBRARY = awt
PRODUCT = sun
......@@ -312,15 +313,15 @@ dgalibs: $(DGALIBS)
$(LIBDIR)/$(LIBARCH)/libxinerama.so: $(CLOSED_SRC)/solaris/lib/$(ARCH)/libxinerama.so
$(install-file)
$(CHMOD) a+x $@
$(call chmod-file, a+x)
$(LIBDIR)/$(LIBARCH)/libjdgaSUNW%.so: $(CLOSED_SRC)/solaris/lib/$(ARCH)/libjdgaSUNW%.so
$(install-file)
$(CHMOD) a+x $@
$(call chmod-file, a+x)
$(LIBDIR)/$(LIBARCH)/libjdgaSUNWafb.so: $(LIBDIR)/$(LIBARCH)/libjdgaSUNWffb.so
$(prep-target)
$(LN) -s libjdgaSUNWffb.so $(LIBDIR)/$(LIBARCH)/libjdgaSUNWafb.so
$(call install-sym-link, libjdgaSUNWffb.so)
clean:: dgalib.clean
......@@ -404,7 +405,8 @@ $(LIBDIR)/%.bfc: $(FONTCONFIGS_SRC)/$(FONTCONFIGS_SRC_PREFIX)%.properties \
$(COMPILEFONTCONFIG_JARFILE)
$(prep-target)
$(BOOT_JAVA_CMD) -jar $(COMPILEFONTCONFIG_JARFILE) $< $@
$(CHMOD) 444 $(@)
$(install-module-file)
$(call chmod-file, 444)
@$(java-vm-cleanup)
fontconfigs.clean :
......
jdk/make/sun/cmm/Makefile
浏览文件 @ 7c40dd09
......@@ -24,6 +24,7 @@
#
BUILDDIR = ../..
MODULE = java2d
PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk
......@@ -45,34 +46,24 @@ iccprofiles: $(ICCPROFILE_DEST_DIR)/sRGB.pf $(ICCPROFILE_DEST_DIR)/GRAY.pf \
$(ICCPROFILE_DEST_DIR)/LINEAR_RGB.pf
$(ICCPROFILE_DEST_DIR)/sRGB.pf: $(ICCPROFILE_SRC_DIR)/sRGB.pf
$(RM) $(ICCPROFILE_DEST_DIR)/sRGB.pf
-$(MKDIR) -p $(ICCPROFILE_DEST_DIR)
$(CP) $(ICCPROFILE_SRC_DIR)/sRGB.pf $(ICCPROFILE_DEST_DIR)
$(CHMOD) 444 $(ICCPROFILE_DEST_DIR)/sRGB.pf
$(install-file)
$(call chmod-file, 444)
$(ICCPROFILE_DEST_DIR)/GRAY.pf: $(ICCPROFILE_SRC_DIR)/GRAY.pf
$(RM) $(ICCPROFILE_DEST_DIR)/GRAY.pf
-$(MKDIR) -p $(ICCPROFILE_DEST_DIR)
$(CP) $(ICCPROFILE_SRC_DIR)/GRAY.pf $(ICCPROFILE_DEST_DIR)
$(CHMOD) 444 $(ICCPROFILE_DEST_DIR)/GRAY.pf
$(install-file)
$(call chmod-file, 444)
$(ICCPROFILE_DEST_DIR)/CIEXYZ.pf: $(ICCPROFILE_SRC_DIR)/CIEXYZ.pf
$(RM) $(ICCPROFILE_DEST_DIR)/CIEXYZ.pf
-$(MKDIR) -p $(ICCPROFILE_DEST_DIR)
$(CP) $(ICCPROFILE_SRC_DIR)/CIEXYZ.pf $(ICCPROFILE_DEST_DIR)
$(CHMOD) 444 $(ICCPROFILE_DEST_DIR)/CIEXYZ.pf
$(install-file)
$(call chmod-file, 444)
$(ICCPROFILE_DEST_DIR)/PYCC.pf: $(ICCPROFILE_SRC_DIR)/PYCC.pf
$(RM) $(ICCPROFILE_DEST_DIR)/PYCC.pf
-$(MKDIR) -p $(ICCPROFILE_DEST_DIR)
$(CP) $(ICCPROFILE_SRC_DIR)/PYCC.pf $(ICCPROFILE_DEST_DIR)
$(CHMOD) 444 $(ICCPROFILE_DEST_DIR)/PYCC.pf
$(install-file)
$(call chmod-file, 444)
$(ICCPROFILE_DEST_DIR)/LINEAR_RGB.pf: $(ICCPROFILE_SRC_DIR)/LINEAR_RGB.pf
$(RM) $(ICCPROFILE_DEST_DIR)/LINEAR_RGB.pf
-$(MKDIR) -p $(ICCPROFILE_DEST_DIR)
$(CP) $(ICCPROFILE_SRC_DIR)/LINEAR_RGB.pf $(ICCPROFILE_DEST_DIR)
$(CHMOD) 444 $(ICCPROFILE_DEST_DIR)/LINEAR_RGB.pf
$(install-file)
$(call chmod-file, 444)
iccprofiles.clean:
$(RM) -r $(ICCPROFILE_DEST_DIR)
......
jdk/make/sun/cmm/kcms/Makefile
浏览文件 @ 7c40dd09
......@@ -24,6 +24,7 @@
#
BUILDDIR = ../../..
MODULE = java2d
PACKAGE = sun.java2d.cmm.kcms
LIBRARY = kcms
PRODUCT = sun
......
jdk/make/sun/cmm/lcms/Makefile
浏览文件 @ 7c40dd09
......@@ -24,6 +24,7 @@
#
BUILDDIR = ../../..
MODULE = java2d
PACKAGE = sun.java2d.cmm.lcms
LIBRARY = lcms
PRODUCT = sun
......
jdk/make/sun/dcpr/Makefile
浏览文件 @ 7c40dd09
......@@ -26,6 +26,7 @@
# WARNING: Make sure the OPENJDK plugs are up-to-date, see make/common/internal/BinaryPlugs.gmk
BUILDDIR = ../..
MODULE = java2d
PACKAGE = sun.dc
LIBRARY = dcpr
PRODUCT = sun
......
jdk/make/sun/font/Makefile
浏览文件 @ 7c40dd09
此差异已折叠。
jdk/make/sun/font/t2k/Makefile
浏览文件 @ 7c40dd09
此差异已折叠。
jdk/make/sun/headless/Makefile
浏览文件 @ 7c40dd09
此差异已折叠。
jdk/make/sun/image/generic/Makefile
浏览文件 @ 7c40dd09
此差异已折叠。
jdk/make/sun/image/vis/Makefile
浏览文件 @ 7c40dd09
此差异已折叠。
jdk/make/sun/jar/Makefile
浏览文件 @ 7c40dd09
此差异已折叠。
jdk/make/sun/javazic/Makefile
浏览文件 @ 7c40dd09
此差异已折叠。
jdk/make/sun/jawt/Makefile
浏览文件 @ 7c40dd09
此差异已折叠。
jdk/make/sun/jconsole/Makefile
浏览文件 @ 7c40dd09
此差异已折叠。
jdk/make/sun/jdbc/Makefile
浏览文件 @ 7c40dd09
此差异已折叠。
jdk/make/sun/jdga/Makefile
浏览文件 @ 7c40dd09
此差异已折叠。
jdk/make/sun/jkernel/Makefile
浏览文件 @ 7c40dd09
此差异已折叠。
jdk/make/sun/jpeg/Makefile
浏览文件 @ 7c40dd09
此差异已折叠。
jdk/make/sun/launcher/Makefile
浏览文件 @ 7c40dd09
此差异已折叠。
jdk/make/sun/management/Makefile
浏览文件 @ 7c40dd09
此差异已折叠。
jdk/make/sun/native2ascii/Makefile
浏览文件 @ 7c40dd09
此差异已折叠。
jdk/make/sun/net/others/Makefile
浏览文件 @ 7c40dd09
此差异已折叠。
jdk/make/sun/nio/Makefile
浏览文件 @ 7c40dd09
此差异已折叠。
jdk/make/sun/nio/cs/Makefile 0 → 100644
浏览文件 @ 7c40dd09
此差异已折叠。
jdk/make/sun/pisces/Makefile
浏览文件 @ 7c40dd09
此差异已折叠。
jdk/make/sun/rmi/cgi/Makefile
浏览文件 @ 7c40dd09
此差异已折叠。
jdk/make/sun/rmi/oldtools/Makefile
浏览文件 @ 7c40dd09
此差异已折叠。
jdk/make/sun/rmi/registry/Makefile
浏览文件 @ 7c40dd09
此差异已折叠。
jdk/make/sun/rmi/rmi/Makefile
浏览文件 @ 7c40dd09
此差异已折叠。
jdk/make/sun/rmi/rmic/Makefile
浏览文件 @ 7c40dd09
此差异已折叠。
jdk/make/sun/rmi/rmid/Makefile
浏览文件 @ 7c40dd09
此差异已折叠。
jdk/make/sun/security/ec/Makefile
浏览文件 @ 7c40dd09
此差异已折叠。
jdk/make/sun/security/krb5/Makefile
浏览文件 @ 7c40dd09
此差异已折叠。
jdk/make/sun/serialver/Makefile
浏览文件 @ 7c40dd09
此差异已折叠。
jdk/make/sun/splashscreen/Makefile
浏览文件 @ 7c40dd09
此差异已折叠。
jdk/make/sun/text/Makefile
浏览文件 @ 7c40dd09
此差异已折叠。
jdk/make/sun/tools/Makefile
浏览文件 @ 7c40dd09
此差异已折叠。
jdk/make/sun/xawt/Makefile
浏览文件 @ 7c40dd09
此差异已折叠。
jdk/test/java/io/File/Basic.java
浏览文件 @ 7c40dd09
此差异已折叠。
jdk/test/java/io/File/basic.sh
浏览文件 @ 7c40dd09
此差异已折叠。
jdk/test/java/nio/file/Path/PassThroughFileSystem.java 0 → 100644
浏览文件 @ 7c40dd09
此差异已折叠。
jdk/test/sun/security/krb5/ktab/KeyString.java 0 → 100644
浏览文件 @ 7c40dd09
此差异已折叠。
jdk/test/sun/tools/jps/jps-help.sh
浏览文件 @ 7c40dd09
此差异已折叠。
langtools/.hgtags
浏览文件 @ 7c40dd09
此差异已折叠。
langtools/make/Makefile
浏览文件 @ 7c40dd09
此差异已折叠。
langtools/make/build.xml
浏览文件 @ 7c40dd09
此差异已折叠。
langtools/test/tools/javac/T6326754.out 0 → 100644
浏览文件 @ 7c40dd09
此差异已折叠。
langtools/test/tools/javac/T6472751.java 0 → 100644
浏览文件 @ 7c40dd09
此差异已折叠。
langtools/test/tools/javac/T6567414.java 0 → 100644
浏览文件 @ 7c40dd09
此差异已折叠。
langtools/test/tools/javac/T6567414.out 0 → 100644
浏览文件 @ 7c40dd09
此差异已折叠。
langtools/test/tools/javac/T6665791.java 0 → 100644
浏览文件 @ 7c40dd09
此差异已折叠。
langtools/test/tools/javac/T6855236.java 0 → 100644
浏览文件 @ 7c40dd09
此差异已折叠。
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或