7197849: Update new build-infra makefiles
Reviewed-by: ihse, erikj, ohrstrom, tbell
This commit is contained in:
parent
6c1ac6f6bb
commit
c363db8ed0
jdk/makefiles
CompileDemos.gmkCompileJavaClasses.gmkCompileLaunchers.gmkCompileNativeLibraries.gmkCopyFiles.gmkCopyIntoClasses.gmkCopySamples.gmkCreateJars.gmkGendataBreakIterator.gmkGendataFontConfig.gmkGendataTimeZone.gmkGenerateClasses.gmkGenerateData.gmkGensrcBuffer.gmkGensrcCharsetCoder.gmkGensrcIcons.gmkGensrcJDWP.gmkGensrcJObjC.gmkGensrcMisc.gmkGensrcProperties.gmkGensrcX11Wrappers.gmkImages.gmkImport.gmkMakefileSetup.gmkTools.gmk
mapfiles
launchers
libawt_headless
libjava
libjli
libjpeg
libnio
libverify
libzip
@ -44,10 +44,11 @@ BUILD_DEMOS=
|
||||
|
||||
define SetupAppletDemo
|
||||
$$(eval $$(call SetupJavaCompilation,BUILD_DEMO_APPLET_$1,\
|
||||
SETUP:=GENERATE_USINGJDKBYTECODE$2,\
|
||||
SETUP:=GENERATE_USINGJDKBYTECODE,\
|
||||
SRC:=$(JDK_TOPDIR)/src/$3share/demo/applets/$1,\
|
||||
BIN:=$(JDK_OUTPUTDIR)/newdemo/applets/$1,\
|
||||
COPY:=.html .java .xyz .obj .au .gif))
|
||||
BIN:=$(JDK_OUTPUTDIR)/demo/applets/$1,\
|
||||
COPY:=.html .java .xyz .obj .au .gif,\
|
||||
DISABLE_SJAVAC:=$2))
|
||||
BUILD_DEMOS += $$(BUILD_DEMO_APPLET_$1)
|
||||
endef
|
||||
|
||||
@ -67,11 +68,11 @@ $(eval $(call SetupAppletDemo,SortDemo))
|
||||
$(eval $(call SetupAppletDemo,SpreadSheet))
|
||||
# Build WireFrame without a server since it
|
||||
# has a class Matrix3D that also exists in MoleculeViewer.
|
||||
$(eval $(call SetupAppletDemo,WireFrame,_NOSERV))
|
||||
$(eval $(call SetupAppletDemo,WireFrame,true))
|
||||
|
||||
ifndef OPENJDK
|
||||
$(eval $(call SetupAppletDemo,Animator,,closed/))
|
||||
$(eval $(call SetupAppletDemo,GraphLayout,_NOSERV,closed/))
|
||||
$(eval $(call SetupAppletDemo,GraphLayout,true,closed/))
|
||||
$(eval $(call SetupAppletDemo,JumpingBox,,closed/))
|
||||
$(eval $(call SetupAppletDemo,TicTacToe,,closed/))
|
||||
endif
|
||||
@ -111,29 +112,30 @@ define SetupDemo
|
||||
|
||||
ifneq ($$($1_JAVA_FILES_EXIST),)
|
||||
$$(eval $$(call SetupJavaCompilation,BUILD_DEMO_$1,\
|
||||
SETUP:=GENERATE_USINGJDKBYTECODE$(12),\
|
||||
SETUP:=GENERATE_USINGJDKBYTECODE,\
|
||||
ADD_JAVAC_FLAGS:=$3,\
|
||||
SRC:=$$($1_MAIN_SRC) $5,\
|
||||
BIN:=$(JDK_OUTPUTDIR)/newdemoclasses/$2/$1,\
|
||||
BIN:=$(JDK_OUTPUTDIR)/democlasses/$2/$1,\
|
||||
COPY:=$(PATTERNS_TO_COPY) $(10),\
|
||||
JAR:=$(JDK_OUTPUTDIR)/newdemo/$2/$1/$$($1_JARFILE),\
|
||||
JAR:=$(JDK_OUTPUTDIR)/demo/$2/$1/$$($1_JARFILE),\
|
||||
JARMAIN:=$4,\
|
||||
MANIFEST:=$(JDK_TOPDIR)/make/tools/manifest.mf,\
|
||||
EXTRA_MANIFEST_ATTR:=$(11),\
|
||||
SRCZIP:=$(JDK_OUTPUTDIR)/newdemo/$2/$1/src.zip,\
|
||||
EXCLUDE_FILES:=$9))
|
||||
SRCZIP:=$(JDK_OUTPUTDIR)/demo/$2/$1/src.zip,\
|
||||
EXCLUDE_FILES:=$9,\
|
||||
DISABLE_SJAVAC:=$(12)))
|
||||
|
||||
BUILD_DEMOS += $$(BUILD_DEMO_$1) \
|
||||
$(JDK_OUTPUTDIR)/newdemo/$2/$1/$$($1_JARFILE) \
|
||||
$(JDK_OUTPUTDIR)/newdemo/$2/$1/src.zip
|
||||
$(JDK_OUTPUTDIR)/demo/$2/$1/$$($1_JARFILE) \
|
||||
$(JDK_OUTPUTDIR)/demo/$2/$1/src.zip
|
||||
endif
|
||||
|
||||
# Copy files.
|
||||
$1_COPY_TARGETS := $$(patsubst $(JDK_TOPDIR)/src/$6share/demo/$2/$1/%,\
|
||||
$(JDK_OUTPUTDIR)/newdemo/$2/$1/%,\
|
||||
$(JDK_OUTPUTDIR)/demo/$2/$1/%,\
|
||||
$$(wildcard $$(addprefix $(JDK_TOPDIR)/src/$6share/demo/$2/$1/,$7)))
|
||||
ifneq ($7,)
|
||||
$(JDK_OUTPUTDIR)/newdemo/$2/$1/% : $(JDK_TOPDIR)/src/$6share/demo/$2/$1/%
|
||||
$(JDK_OUTPUTDIR)/demo/$2/$1/% : $(JDK_TOPDIR)/src/$6share/demo/$2/$1/%
|
||||
$(MKDIR) -p $$(@D)
|
||||
$(CP) $$< $$@
|
||||
$(CHMOD) -f ug+w $$@
|
||||
@ -144,20 +146,20 @@ define SetupDemo
|
||||
endef
|
||||
|
||||
$(eval $(call SetupDemo,CodePointIM,jfc,,CodePointIM,,,*.html))
|
||||
$(JDK_OUTPUTDIR)/newdemo/jfc/CodePointIM/_the.services : \
|
||||
$(JDK_OUTPUTDIR)/newdemo/jfc/CodePointIM/CodePointIM.jar \
|
||||
$(JDK_OUTPUTDIR)/demo/jfc/CodePointIM/_the.services : \
|
||||
$(JDK_OUTPUTDIR)/demo/jfc/CodePointIM/CodePointIM.jar \
|
||||
$(JDK_TOPDIR)/src/share/demo/jfc/CodePointIM/java.awt.im.spi.InputMethodDescriptor
|
||||
(cd $(JDK_OUTPUTDIR)/newdemo/jfc/CodePointIM && \
|
||||
(cd $(JDK_OUTPUTDIR)/demo/jfc/CodePointIM && \
|
||||
$(MKDIR) -p _the.tmp/META-INF/services && \
|
||||
$(CP) $(JDK_TOPDIR)/src/share/demo/jfc/CodePointIM/java.awt.im.spi.InputMethodDescriptor _the.tmp/META-INF/services && \
|
||||
cd _the.tmp && \
|
||||
$(JAR) uf $(JDK_OUTPUTDIR)/newdemo/jfc/CodePointIM/CodePointIM.jar META-INF/services/java.awt.im.spi.InputMethodDescriptor && \
|
||||
$(JAR) uf $(JDK_OUTPUTDIR)/demo/jfc/CodePointIM/CodePointIM.jar META-INF/services/java.awt.im.spi.InputMethodDescriptor && \
|
||||
cd META-INF/services && \
|
||||
$(JAR) uf $(JDK_OUTPUTDIR)/newdemo/jfc/CodePointIM/CodePointIM.jar java.awt.im.spi.InputMethodDescriptor)
|
||||
$(RM) -r $(JDK_OUTPUTDIR)/newdemo/jfc/CodePointIM/_the.tmp
|
||||
$(JAR) uf $(JDK_OUTPUTDIR)/demo/jfc/CodePointIM/CodePointIM.jar java.awt.im.spi.InputMethodDescriptor)
|
||||
$(RM) -r $(JDK_OUTPUTDIR)/demo/jfc/CodePointIM/_the.tmp
|
||||
$(TOUCH) $@
|
||||
|
||||
BUILD_DEMOS+=$(JDK_OUTPUTDIR)/newdemo/jfc/CodePointIM/_the.services
|
||||
BUILD_DEMOS+=$(JDK_OUTPUTDIR)/demo/jfc/CodePointIM/_the.services
|
||||
|
||||
$(eval $(call SetupDemo,FileChooserDemo,jfc,,FileChooserDemo,,,README*))
|
||||
$(eval $(call SetupDemo,Font2DTest,jfc,,Font2DTest,,,*.html *.txt))
|
||||
@ -182,12 +184,12 @@ ifndef OPENJDK
|
||||
$(eval $(call SetupDemo,Stylepad,jfc,,Stylepad,\
|
||||
$(JDK_TOPDIR)/src/share/demo/jfc/Notepad,closed/,*.txt,,$(JDK_TOPDIR)/src/share/demo/jfc/Notepad/README.txt))
|
||||
$(eval $(call SetupDemo,SwingSet2,jfc,,SwingSet2,,closed/,README* *.html,,,.java COPYRIGHT,\
|
||||
SplashScreen-Image: resources/images/splash.png,_NOSERV))
|
||||
SplashScreen-Image: resources/images/splash.png,true))
|
||||
|
||||
BUILD_DEMOS += $(patsubst $(JDK_TOPDIR)/src/closed/share/demo/nbproject/%,\
|
||||
$(JDK_OUTPUTDIR)/newdemo/nbproject/%,\
|
||||
$(JDK_OUTPUTDIR)/demo/nbproject/%,\
|
||||
$(shell $(FIND) $(JDK_TOPDIR)/src/closed/share/demo/nbproject/ -type f))
|
||||
$(JDK_OUTPUTDIR)/newdemo/nbproject/% : $(JDK_TOPDIR)/src/closed/share/demo/nbproject/%
|
||||
$(JDK_OUTPUTDIR)/demo/nbproject/% : $(JDK_TOPDIR)/src/closed/share/demo/nbproject/%
|
||||
$(MKDIR) -p $(@D)
|
||||
$(CP) $< $@
|
||||
$(CHMOD) -f ug+w $@
|
||||
@ -196,7 +198,7 @@ endif
|
||||
##################################################################################################
|
||||
|
||||
# Why do we install a demo jar into the main jre/lib/ext????????????????
|
||||
$(JDK_OUTPUTDIR)/lib/ext/zipfs.jar : $(JDK_OUTPUTDIR)/newdemo/nio/zipfs/zipfs.jar
|
||||
$(JDK_OUTPUTDIR)/lib/ext/zipfs.jar : $(JDK_OUTPUTDIR)/demo/nio/zipfs/zipfs.jar
|
||||
$(MKDIR) -p $(@D)
|
||||
$(CP) $< $@
|
||||
|
||||
@ -207,52 +209,74 @@ BUILD_DEMOS += $(JDK_OUTPUTDIR)/lib/ext/zipfs.jar
|
||||
# In the old makefiles, j2dbench was not compiled.
|
||||
#$(eval $(call SetupDemo,J2DBench,java2d,/src,,j2dbench/J2DBench))
|
||||
|
||||
# JVMTI demos are a bit strange and share some files, but be careful the
|
||||
# shared files are just the *.c and *.h files, not the README or sample
|
||||
# makefiles. So we always exclude the README.txt and sample.makefile.txt
|
||||
# from the extra sources.
|
||||
define SetupJVMTIDemo
|
||||
# Param 1 = Name of the demo
|
||||
# Param 2 = add these directories to the includes, default is agent_util
|
||||
# Param 3 = extra CFLAGS
|
||||
# Param 4 = C or C++ (defaults to C)
|
||||
# Param 5 = libs for posix
|
||||
# Param 6 = libs for winapi
|
||||
# Param 6 = libs for windows
|
||||
# Param 7 = libs for solaris
|
||||
BUILD_DEMO_JVMTI_$1_EXTRA_SRC:= $$(wildcard $(JDK_TOPDIR)/src/$(LEGACY_OPENJDK_TARGET_OS_API)/demo/jvmti/$1) \
|
||||
$$(wildcard $$(addprefix $(JDK_TOPDIR)/src/share/demo/jvmti/,$2))
|
||||
BUILD_DEMO_JVMTI_$1_EXTRA_SRC:= \
|
||||
$$(wildcard $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/demo/jvmti/$1) \
|
||||
$$(wildcard $$(addprefix $(JDK_TOPDIR)/src/share/demo/jvmti/,$2))
|
||||
BUILD_DEMO_JVMTI_$1_EXTRA_SRC_EXCLUDE:= \
|
||||
$$(wildcard $$(addprefix $(JDK_TOPDIR)/src/share/demo/jvmti/,$2)/README.txt) \
|
||||
$$(wildcard $$(addprefix $(JDK_TOPDIR)/src/share/demo/jvmti/,$2)/sample.makefile.txt)
|
||||
BUILD_DEMO_JVMTI_$1_EXTRA_INC:=$$(addprefix -I,$$(BUILD_DEMO_JVMTI_$1_EXTRA_SRC))
|
||||
BUILD_DEMO_JVMTI_$1_LANG:=C
|
||||
BUILD_DEMO_JVMTI_$1_O_FLAG:=$(C_O_FLAG_NORM)
|
||||
ifneq (,$4)
|
||||
BUILD_DEMO_JVMTI_$1_LANG:=$4
|
||||
endif
|
||||
ifeq (C++,$4)
|
||||
$1_EXTRA_CXX:=$(LIBCXX)
|
||||
BUILD_DEMO_JVMTI_$1_O_FLAG:=$(CXX_O_FLAG_NORM)
|
||||
$1_EXTRA_CXX:=$(LDFLAGS_CXX_JDK) $(LIBCXX)
|
||||
endif
|
||||
|
||||
$1_CXXFLAGS:=$(CXXFLAGS_JDKLIB) $$(BUILD_DEMO_JVMTI_$1_O_FLAG) -I$(JDK_TOPDIR)/src/share/demo/jvmti/$1 $$(BUILD_DEMO_JVMTI_$1_EXTRA_INC) $3
|
||||
$1_CXXFLAGS:=$(CXXFLAGS_JDKLIB) -I$(JDK_TOPDIR)/src/share/demo/jvmti/$1 \
|
||||
$$(BUILD_DEMO_JVMTI_$1_EXTRA_INC) $3 \
|
||||
$(CXXFLAGS_DEBUG_SYMBOLS)
|
||||
ifeq ($1-$(OPENJDK_TARGET_CPU_ARCH),waiters-sparc)
|
||||
$1_FILTER:=-xregs=no%appl
|
||||
$1_CXXFLAGS:=$$(filter-out $$($1_FILTER),$$($1_CXXFLAGS))
|
||||
$1_FILTER:=-xregs=no%appl
|
||||
$1_CXXFLAGS:=$$(filter-out $$($1_FILTER),$$($1_CXXFLAGS))
|
||||
endif
|
||||
|
||||
# Workaround for CFLAGS_JDKLIB containing ',' on solaris. If this is added as 'CFLAGS' to the
|
||||
# eval call below, the comma gets expanded too early.
|
||||
BUILD_DEMO_JVMTI_$1_CFLAGS:=$(CFLAGS_JDKLIB) $(CFLAGS_DEBUG_SYMBOLS) \
|
||||
-I$(JDK_TOPDIR)/src/share/demo/jvmti/$1 $$(BUILD_DEMO_JVMTI_$1_EXTRA_INC) $3
|
||||
|
||||
# Remove the -incremental:no setting to get .ilk-files like in the old build.
|
||||
$$(eval $$(call SetupNativeCompilation,BUILD_DEMO_JVMTI_$1,\
|
||||
SRC:=$(JDK_TOPDIR)/src/share/demo/jvmti/$1 $$(BUILD_DEMO_JVMTI_$1_EXTRA_SRC),\
|
||||
LANG:=$$(BUILD_DEMO_JVMTI_$1_LANG),\
|
||||
CFLAGS:=$(CFLAGS_JDKLIB) $$(BUILD_DEMO_JVMTI_$1_O_FLAG) -I$(JDK_TOPDIR)/src/share/demo/jvmti/$1 $$(BUILD_DEMO_JVMTI_$1_EXTRA_INC) $3,\
|
||||
OPTIMIZATION:=LOW,\
|
||||
CXXFLAGS:=$$($1_CXXFLAGS),\
|
||||
LDFLAGS:=$(LDFLAGS_JDKLIB),\
|
||||
LDFLAGS:=$(filter-out -incremental:no -opt:ref,$(LDFLAGS_JDKLIB)),\
|
||||
LDFLAGS_macosx:=$(call SET_EXECUTABLE_ORIGIN),\
|
||||
LDFLAGS_SUFFIX:=$$($1_EXTRA_CXX),\
|
||||
LDFLAGS_SUFFIX_posix:=$5,\
|
||||
LDFLAGS_SUFFIX_winapi:=$6,\
|
||||
LDFLAGS_SUFFIX_solaris:=-lc $7,\
|
||||
OBJECT_DIR:=$(JDK_OUTPUTDIR)/newdemoobjs/jvmti/$1,\
|
||||
OUTPUT_DIR:=$(JDK_OUTPUTDIR)/newdemo/jvmti/$1/lib,\
|
||||
LDFLAGS_SUFFIX_windows:=$6,\
|
||||
LDFLAGS_SUFFIX_solaris:=$7 -lc,\
|
||||
LDFLAGS_SUFFIX_linux:=$8,\
|
||||
VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
|
||||
RC_FLAGS:=$$(RC_FLAGS) \
|
||||
/D "JDK_FNAME=$1.dll" \
|
||||
/D "JDK_INTERNAL_NAME=$1" \
|
||||
/D "JDK_FTYPE=0x2L",\
|
||||
OBJECT_DIR:=$(JDK_OUTPUTDIR)/demoobjs/jvmti/$1,\
|
||||
OUTPUT_DIR:=$(JDK_OUTPUTDIR)/demo/jvmti/$1/lib,\
|
||||
LIBRARY:=$1))
|
||||
|
||||
$$(eval $$(call SetupZipArchive,BUILD_DEMO_JVMTI_SRC_$1,\
|
||||
SRC:=$(JDK_TOPDIR)/src/share/demo/jvmti/$1 $$(BUILD_DEMO_JVMTI_$1_EXTRA_SRC),\
|
||||
ZIP:=$(JDK_OUTPUTDIR)/newdemo/jvmti/$1/src.zip))
|
||||
EXCLUDE_FILES:=$$(BUILD_DEMO_JVMTI_$1_EXTRA_SRC_EXCLUDE), \
|
||||
ZIP:=$(JDK_OUTPUTDIR)/demo/jvmti/$1/src.zip))
|
||||
|
||||
$(JDK_OUTPUTDIR)/newdemo/jvmti/$1/README.txt : $(JDK_TOPDIR)/src/share/demo/jvmti/$1/README.txt
|
||||
$(JDK_OUTPUTDIR)/demo/jvmti/$1/README.txt : $(JDK_TOPDIR)/src/share/demo/jvmti/$1/README.txt
|
||||
$(MKDIR) -p $$(@D)
|
||||
$(CP) $$< $$@
|
||||
$(CHMOD) -f ug+w $$@
|
||||
@ -261,29 +285,40 @@ define SetupJVMTIDemo
|
||||
$$(eval $$(call SetupJavaCompilation,BUILD_DEMO_JVMTI_$1_JAVA,\
|
||||
SETUP:=GENERATE_USINGJDKBYTECODE,\
|
||||
SRC:=$(JDK_TOPDIR)/src/share/demo/jvmti/$1,\
|
||||
BIN:=$(JDK_OUTPUTDIR)/newdemoclasses/jvmti/$1,\
|
||||
BIN:=$(JDK_OUTPUTDIR)/democlasses/jvmti/$1,\
|
||||
COPY:=$(PATTERNS_TO_COPY),\
|
||||
JAR:=$(JDK_OUTPUTDIR)/newdemo/jvmti/$1/$1.jar,\
|
||||
JAR:=$(JDK_OUTPUTDIR)/demo/jvmti/$1/$1.jar,\
|
||||
EXTRA_MANIFEST_ATTR:=Main-Class: \n,\
|
||||
MANIFEST:=$(JDK_TOPDIR)/make/tools/manifest.mf))
|
||||
|
||||
BUILD_DEMOS += $(JDK_OUTPUTDIR)/newdemo/jvmti/$1/$1.jar
|
||||
BUILD_DEMOS += $(JDK_OUTPUTDIR)/demo/jvmti/$1/$1.jar
|
||||
endif
|
||||
|
||||
BUILD_DEMOS += $$(BUILD_DEMO_JVMTI_$1) \
|
||||
$(JDK_OUTPUTDIR)/newdemo/jvmti/$1/src.zip \
|
||||
$(JDK_OUTPUTDIR)/newdemo/jvmti/$1/README.txt
|
||||
$(JDK_OUTPUTDIR)/demo/jvmti/$1/src.zip \
|
||||
$(JDK_OUTPUTDIR)/demo/jvmti/$1/README.txt
|
||||
|
||||
ifeq ($(OPENJDK_TARGET_OS),windows)
|
||||
# These files normally end up in OBJECT_DIR but for demos they
|
||||
# are supposed to be included in the distro.
|
||||
$(JDK_OUTPUTDIR)/demo/jvmti/$1/lib/$1.lib: $$(BUILD_DEMO_JVMTI_$1)
|
||||
$(CP) $(JDK_OUTPUTDIR)/demoobjs/jvmti/$1/$1.lib $$@
|
||||
|
||||
$(JDK_OUTPUTDIR)/demo/jvmti/$1/lib/$1.exp: $$(BUILD_DEMO_JVMTI_$1)
|
||||
$(CP) $(JDK_OUTPUTDIR)/demoobjs/jvmti/$1/$1.exp $$@
|
||||
|
||||
BUILD_DEMOS += $(JDK_OUTPUTDIR)/demo/jvmti/$1/lib/$1.lib \
|
||||
$(JDK_OUTPUTDIR)/demo/jvmti/$1/lib/$1.exp
|
||||
endif
|
||||
endef
|
||||
|
||||
$(eval $(call SetupJVMTIDemo,compiledMethodLoad, agent_util))
|
||||
$(eval $(call SetupJVMTIDemo,gctest, agent_util))
|
||||
$(eval $(call SetupJVMTIDemo,heapTracker, agent_util java_crw_demo))
|
||||
$(eval $(call SetupJVMTIDemo,heapViewer, agent_util))
|
||||
# hprof contains error messages using __FILE__ macro. These expand to the absolute path
|
||||
# in the new build system and relative in the old, causing the binaries to differ.
|
||||
$(eval $(call SetupJVMTIDemo,hprof, java_crw_demo,\
|
||||
-I$(JDK_TOPDIR)/src/share/npt -I$(JDK_TOPDIR)/src/$(LEGACY_OPENJDK_TARGET_OS_API)/npt,C,\
|
||||
-ldl,ws2_32.lib winmm.lib,-lsocket -lnsl))
|
||||
-I$(JDK_TOPDIR)/src/share/npt -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/npt,C,\
|
||||
-ldl,ws2_32.lib winmm.lib,-lsocket -lnsl,-lpthread))
|
||||
|
||||
$(eval $(call SetupJVMTIDemo,minst, agent_util java_crw_demo))
|
||||
$(eval $(call SetupJVMTIDemo,mtrace, agent_util java_crw_demo))
|
||||
@ -298,11 +333,11 @@ JPDA_SOURCES:=$(shell $(FIND) $(JDK_TOPDIR)/src/share/classes/com/sun/tools/exam
|
||||
# The number of files are few enough so that we can use echo safely below to list them.
|
||||
JPDA_FILES:=$(subst $(JDK_TOPDIR)/src/share/classes/,,$(JPDA_SOURCES))
|
||||
|
||||
$(JDK_OUTPUTDIR)/newdemo/jpda/src.zip : $(JPDA_SOURCES)
|
||||
$(JDK_OUTPUTDIR)/demo/jpda/src.zip : $(JPDA_SOURCES)
|
||||
$(MKDIR) -p $(@D)
|
||||
(cd $(JDK_TOPDIR)/src/share/classes && $(ZIP) -qru $@ com -i "com/sun/tools/example/*")
|
||||
|
||||
$(JDK_OUTPUTDIR)/newdemo/jpda/examples.jar : $(JPDA_SOURCES)
|
||||
$(JDK_OUTPUTDIR)/demo/jpda/examples.jar : $(JPDA_SOURCES)
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) $(@D)/_the.sources
|
||||
$(call ListPathsSafely,JPDA_FILES,\n, >> $(@D)/_the.sources)
|
||||
@ -312,103 +347,104 @@ $(JDK_OUTPUTDIR)/newdemo/jpda/examples.jar : $(JPDA_SOURCES)
|
||||
(cd $(JDK_TOPDIR)/src/share/classes && $(JAR) cfm $@ $(@D)/_the.manifest @$(@D)/_the.sources)
|
||||
(cd $(JDK_TOPDIR)/src/share/classes/com/sun/tools/example && $(JAR) uf $@ README)
|
||||
|
||||
$(JDK_OUTPUTDIR)/newdemo/jpda/com/sun/tools/example/README : $(JDK_TOPDIR)/src/share/classes/com/sun/tools/example/README
|
||||
$(JDK_OUTPUTDIR)/demo/jpda/com/sun/tools/example/README : $(JDK_TOPDIR)/src/share/classes/com/sun/tools/example/README
|
||||
$(MKDIR) -p $(@D)
|
||||
$(CP) $< $@
|
||||
$(CHMOD) -f ug+w $@
|
||||
|
||||
BUILD_DEMOS += $(JDK_OUTPUTDIR)/newdemo/jpda/src.zip $(JDK_OUTPUTDIR)/newdemo/jpda/examples.jar \
|
||||
$(JDK_OUTPUTDIR)/newdemo/jpda/com/sun/tools/example/README
|
||||
BUILD_DEMOS += $(JDK_OUTPUTDIR)/demo/jpda/src.zip $(JDK_OUTPUTDIR)/demo/jpda/examples.jar \
|
||||
$(JDK_OUTPUTDIR)/demo/jpda/com/sun/tools/example/README
|
||||
|
||||
##################################################################################################
|
||||
|
||||
$(JDK_OUTPUTDIR)/newdemo/management/index.html : $(JDK_TOPDIR)/src/share/demo/management/index.html
|
||||
$(JDK_OUTPUTDIR)/demo/management/index.html : $(JDK_TOPDIR)/src/share/demo/management/index.html
|
||||
$(MKDIR) -p $(@D)
|
||||
$(CP) $< $@
|
||||
$(CHMOD) -f ug+w $@
|
||||
|
||||
$(JDK_OUTPUTDIR)/newdemo/jvmti/index.html : $(JDK_TOPDIR)/src/share/demo/jvmti/index.html
|
||||
$(JDK_OUTPUTDIR)/demo/jvmti/index.html : $(JDK_TOPDIR)/src/share/demo/jvmti/index.html
|
||||
$(MKDIR) -p $(@D)
|
||||
$(CP) $< $@
|
||||
$(CHMOD) -f ug+w $@
|
||||
|
||||
BUILD_DEMOS += $(JDK_OUTPUTDIR)/newdemo/management/index.html \
|
||||
$(JDK_OUTPUTDIR)/newdemo/jvmti/index.html
|
||||
BUILD_DEMOS += $(JDK_OUTPUTDIR)/demo/management/index.html \
|
||||
$(JDK_OUTPUTDIR)/demo/jvmti/index.html
|
||||
|
||||
##################################################################################################
|
||||
|
||||
# The netbeans project files are copied into the demo directory.
|
||||
BUILD_DEMOS += $(patsubst $(JDK_TOPDIR)/src/share/demo/nbproject/%,\
|
||||
$(JDK_OUTPUTDIR)/newdemo/nbproject/%,\
|
||||
$(JDK_OUTPUTDIR)/demo/nbproject/%,\
|
||||
$(shell $(FIND) $(JDK_TOPDIR)/src/share/demo/nbproject/ -type f))
|
||||
|
||||
$(JDK_OUTPUTDIR)/newdemo/nbproject/% : $(JDK_TOPDIR)/src/share/demo/nbproject/%
|
||||
$(JDK_OUTPUTDIR)/demo/nbproject/% : $(JDK_TOPDIR)/src/share/demo/nbproject/%
|
||||
$(MKDIR) -p $(@D)
|
||||
$(CP) $< $@
|
||||
$(CHMOD) -f ug+w $@
|
||||
|
||||
##################################################################################################
|
||||
|
||||
$(JDK_OUTPUTDIR)/newdemo/README: $(JDK_TOPDIR)/src/share/demo/README
|
||||
$(JDK_OUTPUTDIR)/demo/README: $(JDK_TOPDIR)/src/share/demo/README
|
||||
$(MKDIR) -p $(@D)
|
||||
$(CP) $< $@
|
||||
|
||||
BUILD_DEMOS += $(JDK_OUTPUTDIR)/newdemo/README
|
||||
BUILD_DEMOS += $(JDK_OUTPUTDIR)/demo/README
|
||||
|
||||
##################################################################################################
|
||||
|
||||
ifeq ($(OPENJDK_TARGET_OS), solaris)
|
||||
|
||||
$(JDK_OUTPUTDIR)/newdemoclasses/jni/Poller/% : $(JDK_TOPDIR)/src/solaris/demo/jni/Poller/%
|
||||
$(JDK_OUTPUTDIR)/democlasses/jni/Poller/% : $(JDK_TOPDIR)/src/solaris/demo/jni/Poller/%
|
||||
$(MKDIR) -p $(@D)
|
||||
$(CP) $< $@
|
||||
$(CHMOD) -f ug+w $@
|
||||
|
||||
$(JDK_OUTPUTDIR)/newdemo/jni/Poller/README.txt : $(JDK_TOPDIR)/src/solaris/demo/jni/Poller/README.txt
|
||||
$(JDK_OUTPUTDIR)/demo/jni/Poller/README.txt : $(JDK_TOPDIR)/src/solaris/demo/jni/Poller/README.txt
|
||||
$(MKDIR) -p $(@D)
|
||||
$(CP) $< $@
|
||||
$(CHMOD) -f ug+w $@
|
||||
|
||||
$(JDK_OUTPUTDIR)/newdemo/jni/Poller/Poller.jar : \
|
||||
$(JDK_OUTPUTDIR)/newdemoclasses/jni/Poller/README.txt $(JDK_OUTPUTDIR)/newdemoclasses/jni/Poller/Poller.c
|
||||
$(JDK_OUTPUTDIR)/demo/jni/Poller/Poller.jar : \
|
||||
$(JDK_OUTPUTDIR)/democlasses/jni/Poller/README.txt $(JDK_OUTPUTDIR)/democlasses/jni/Poller/Poller.c
|
||||
|
||||
$(eval $(call SetupJavaCompilation,BUILD_DEMO_POLLER_JAR,\
|
||||
SETUP:=GENERATE_USINGJDKBYTECODE, \
|
||||
SRC:=$(JDK_TOPDIR)/src/solaris/demo/jni/Poller, \
|
||||
BIN:=$(JDK_OUTPUTDIR)/newdemoclasses/jni/Poller, \
|
||||
HEADERS:=$(JDK_OUTPUTDIR)/newdemoclasses/jni/Poller, \
|
||||
JAR:=$(JDK_OUTPUTDIR)/newdemo/jni/Poller/Poller.jar, \
|
||||
BIN:=$(JDK_OUTPUTDIR)/democlasses/jni/Poller, \
|
||||
HEADERS:=$(JDK_OUTPUTDIR)/democlasses/jni/Poller, \
|
||||
JAR:=$(JDK_OUTPUTDIR)/demo/jni/Poller/Poller.jar, \
|
||||
MANIFEST:=$(JDK_TOPDIR)/make/tools/manifest.mf, \
|
||||
SRCZIP:=$(JDK_OUTPUTDIR)/newdemo/jni/Poller/src.zip, \
|
||||
COPY := README.txt Poller.c, \
|
||||
JARMAIN := Client))
|
||||
SRCZIP:=$(JDK_OUTPUTDIR)/demo/jni/Poller/src.zip, \
|
||||
COPY:=README.txt Poller.c, \
|
||||
JARMAIN:=Client))
|
||||
|
||||
|
||||
|
||||
BUILD_DEMOS += $(JDK_OUTPUTDIR)/newdemo/jni/Poller/Poller.jar $(JDK_OUTPUTDIR)/newdemo/jni/Poller/src.zip \
|
||||
$(JDK_OUTPUTDIR)/newdemo/jni/Poller/README.txt
|
||||
BUILD_DEMOS += $(JDK_OUTPUTDIR)/demo/jni/Poller/Poller.jar $(JDK_OUTPUTDIR)/demo/jni/Poller/src.zip \
|
||||
$(JDK_OUTPUTDIR)/demo/jni/Poller/README.txt
|
||||
|
||||
$(eval $(call SetupNativeCompilation,BUILD_LIBPOLLER,\
|
||||
SRC:=$(JDK_TOPDIR)/src/solaris/demo/jni/Poller, \
|
||||
LANG := C, \
|
||||
CFLAGS:=$(CFLAGS_JDKLIB) $(C_O_FLAG_NORM) $(SHARED_LIBRARY_FLAGS) \
|
||||
-I$(JDK_OUTPUTDIR)/newdemoclasses/jni/Poller, \
|
||||
LANG:=C,\
|
||||
OPTIMIZATION:=LOW,\
|
||||
CFLAGS:=$(CFLAGS_JDKLIB) $(SHARED_LIBRARY_FLAGS) \
|
||||
-I$(JDK_OUTPUTDIR)/democlasses/jni/Poller, \
|
||||
LDFLAGS:=$(LDFLAGS_JDKLIB), \
|
||||
OBJECT_DIR:=$(JDK_OUTPUTDIR)/newdemoobjs/jni/Poller,\
|
||||
OUTPUT_DIR:=$(JDK_OUTPUTDIR)/newdemoobjs, \
|
||||
OBJECT_DIR:=$(JDK_OUTPUTDIR)/demoobjs/jni/Poller,\
|
||||
OUTPUT_DIR:=$(JDK_OUTPUTDIR)/demoobjs, \
|
||||
LIBRARY:=Poller))
|
||||
|
||||
#
|
||||
# We can only compile native code after jar has been build (since we depend on generated .h files)
|
||||
#
|
||||
$(JDK_OUTPUTDIR)/newdemoobjs/jni/Poller/Poller.o : $(JDK_OUTPUTDIR)/newdemo/jni/Poller/Poller.jar
|
||||
$(JDK_OUTPUTDIR)/demoobjs/jni/Poller/Poller.o : $(JDK_OUTPUTDIR)/demo/jni/Poller/Poller.jar
|
||||
|
||||
$(JDK_OUTPUTDIR)/newdemo/jni/Poller/lib/$(LIBRARY_PREFIX)Poller$(SHARED_LIBRARY_SUFFIX) : \
|
||||
$(JDK_OUTPUTDIR)/newdemoobjs/$(LIBRARY_PREFIX)Poller$(SHARED_LIBRARY_SUFFIX)
|
||||
$(JDK_OUTPUTDIR)/demo/jni/Poller/lib/$(LIBRARY_PREFIX)Poller$(SHARED_LIBRARY_SUFFIX) : \
|
||||
$(JDK_OUTPUTDIR)/demoobjs/$(LIBRARY_PREFIX)Poller$(SHARED_LIBRARY_SUFFIX)
|
||||
$(MKDIR) -p $(@D)
|
||||
$(CP) $< $@
|
||||
|
||||
BUILD_DEMOS += $(JDK_OUTPUTDIR)/newdemo/jni/Poller/lib/$(LIBRARY_PREFIX)Poller$(SHARED_LIBRARY_SUFFIX)
|
||||
BUILD_DEMOS += $(JDK_OUTPUTDIR)/demo/jni/Poller/lib/$(LIBRARY_PREFIX)Poller$(SHARED_LIBRARY_SUFFIX)
|
||||
|
||||
endif
|
||||
|
||||
@ -417,20 +453,20 @@ endif
|
||||
ifndef OPENJDK
|
||||
DB_DEMO_ZIPFILE := $(shell $(FIND) $(JDK_TOPDIR)/src/closed/share/db -name "*demo*.zip")
|
||||
|
||||
$(JDK_OUTPUTDIR)/newdemo/_the.db.unzipped: $(DB_DEMO_ZIPFILE)
|
||||
$(JDK_OUTPUTDIR)/demo/_the.db.unzipped: $(DB_DEMO_ZIPFILE)
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) -rf $(JDK_OUTPUTDIR)/newdemo/db $(JDK_OUTPUTDIR)/newdemo/demo
|
||||
$(CD) $(JDK_OUTPUTDIR)/newdemo && $(UNZIP) -o $<
|
||||
$(MV) $(JDK_OUTPUTDIR)/newdemo/demo $(JDK_OUTPUTDIR)/newdemo/db
|
||||
$(RM) -r $(JDK_OUTPUTDIR)/demo/db $(JDK_OUTPUTDIR)/demo/demo
|
||||
$(CD) $(JDK_OUTPUTDIR)/demo && $(UNZIP) -o $<
|
||||
$(MV) $(JDK_OUTPUTDIR)/demo/demo $(JDK_OUTPUTDIR)/demo/db
|
||||
$(TOUCH) $@
|
||||
|
||||
# Copy this after the unzip above to avoid race with directory creation and mv command.
|
||||
$(JDK_OUTPUTDIR)/newdemo/db/README-JDK-DEMOS.html: \
|
||||
$(JDK_OUTPUTDIR)/demo/db/README-JDK-DEMOS.html: \
|
||||
$(JDK_TOPDIR)/src/closed/share/db/README-JDK-DEMOS.html \
|
||||
| $(JDK_OUTPUTDIR)/newdemo/_the.db.unzipped
|
||||
| $(JDK_OUTPUTDIR)/demo/_the.db.unzipped
|
||||
$(MKDIR) -p $(@D)
|
||||
$(CP) '$<' '$@'
|
||||
BUILD_DEMOS += $(JDK_OUTPUTDIR)/newdemo/_the.db.unzipped $(JDK_OUTPUTDIR)/newdemo/db/README-JDK-DEMOS.html
|
||||
BUILD_DEMOS += $(JDK_OUTPUTDIR)/demo/_the.db.unzipped $(JDK_OUTPUTDIR)/demo/db/README-JDK-DEMOS.html
|
||||
endif
|
||||
|
||||
##################################################################################################
|
||||
|
@ -45,10 +45,6 @@ EXCLUDES += com/sun/pept \
|
||||
com/sun/tools/example/debug/gui \
|
||||
com/oracle/security
|
||||
|
||||
ifeq ($(OPENJDK_TARGET_OS)-$(ARCH_DATA_MODEL),windows-64)
|
||||
EXCLUDES += sun/security/pkcs11
|
||||
endif
|
||||
|
||||
ifdef OPENJDK
|
||||
EXCLUDES+= sun/dc \
|
||||
com/sun/jmx/snmp \
|
||||
@ -59,6 +55,13 @@ endif
|
||||
ifndef OPENJDK
|
||||
# There exists two versions of this file...
|
||||
EXFILES := $(JDK_TOPDIR)/src/share/classes/javax/crypto/JarVerifier.java
|
||||
|
||||
ifeq ($(OPENJDK_TARGET_OS),windows)
|
||||
# This gets built on unix platforms implicitly in the old build even though
|
||||
# it's excluded in the closed build.
|
||||
EXCLUDES+=sun/java2d/pisces
|
||||
endif
|
||||
|
||||
endif
|
||||
|
||||
ifneq ($(OPENJDK_TARGET_OS),solaris)
|
||||
@ -90,12 +93,14 @@ ifneq ($(OPENJDK_TARGET_OS),windows)
|
||||
# Exclude Window security related files in src/share/classes
|
||||
EXFILES+=NTLoginModule.java \
|
||||
NTSystem.java
|
||||
|
||||
else
|
||||
EXFILES+=UnixLoginModule.java \
|
||||
UnixSystem.java
|
||||
endif
|
||||
|
||||
ifeq ($(OPENJDK_TARGET_OS),windows)
|
||||
# Don't build GTK L&F on Windows
|
||||
EXCLUDES+= com/sun/java/swing/plaf/gtk
|
||||
EXCLUDES+=com/sun/java/swing/plaf/gtk
|
||||
endif
|
||||
|
||||
ifneq ($(OPENJDK_TARGET_OS),linux)
|
||||
@ -115,6 +120,9 @@ ifneq ($(OPENJDK_TARGET_OS),macosx)
|
||||
sun/nio/fs/BsdFileSystem.java \
|
||||
sun/nio/fs/BsdFileSystemProvider.java \
|
||||
sun/nio/fs/BsdNativeDispatcher.java \
|
||||
sun/nio/fs/MacOSXFileSystemProvider.java \
|
||||
sun/nio/fs/MacOSXFileSystem.java \
|
||||
sun/nio/fs/MacOSXNativeDispatcher.java \
|
||||
sun/tools/attach/BsdAttachProvider.java \
|
||||
sun/tools/attach/BsdVirtualMachine.java
|
||||
endif
|
||||
@ -122,7 +130,7 @@ endif
|
||||
# Exclude BreakIterator classes that are just used in compile process to generate
|
||||
# data files and shouldn't go in the product
|
||||
EXFILES+=sun/text/resources/BreakIteratorRules.java \
|
||||
sun/text/resources/BreakIteratorRules_th.java
|
||||
sun/text/resources/BreakIteratorRules_th.java
|
||||
|
||||
# TODO: Add BUILD_HEADLESS_ONLY to configure?
|
||||
ifdef BUILD_HEADLESS_ONLY
|
||||
@ -245,7 +253,7 @@ include CopyIntoClasses.gmk
|
||||
|
||||
ifndef OPENJDK
|
||||
CLOSED_SRC_DIRS:=$(JDK_TOPDIR)/src/closed/share/classes \
|
||||
$(JDK_TOPDIR)/src/closed/$(LEGACY_OPENJDK_TARGET_OS_API)/classes
|
||||
$(JDK_TOPDIR)/src/closed/$(OPENJDK_TARGET_OS_API_DIR)/classes
|
||||
endif
|
||||
|
||||
MACOSX_SRC_DIRS :=
|
||||
@ -257,7 +265,8 @@ ifeq ($(OPENJDK_TARGET_OS),macosx)
|
||||
$(JDK_TOPDIR)/src/solaris/classes/sun/java2d/BackBufferCapsProvider.java \
|
||||
$(JDK_TOPDIR)/src/solaris/classes/java/net/DefaultInterface.java \
|
||||
$(JDK_TOPDIR)/src/solaris/classes/java/lang/ClassLoaderHelper.java \
|
||||
$(JDK_TOPDIR)/src/solaris/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java
|
||||
$(JDK_TOPDIR)/src/solaris/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java \
|
||||
$(JDK_TOPDIR)/src/solaris/classes/sun/nio/fs/GnomeFileTypeDetector.java
|
||||
|
||||
# JObjC.jar contains 1.5 byte-code...so skip it here :-(
|
||||
# MACOSX_SRC_DIRS += $(JDK_TOPDIR)/src/macosx/native/jobjc/src
|
||||
@ -273,14 +282,21 @@ $(JDK_OUTPUTDIR)/classes/javax/swing/beaninfo/images/%.gif: $(JDK_TOPDIR)/make/t
|
||||
$(MKDIR) -p $(@D)
|
||||
$(CP) $< $@
|
||||
|
||||
# The JDK_USER_DEFINED_FILTER is a poor man's incremental build: by specifying
|
||||
# JDK_FILTER at the make command line, only a subset of the JDK java files will
|
||||
# be recompiled. If multiple paths are separated by comma, convert that into a
|
||||
# space separated list.
|
||||
JDK_USER_DEFINED_FILTER:=$(strip $(subst $(COMMA),$(SPACE),$(JDK_FILTER)))
|
||||
|
||||
$(eval $(call SetupJavaCompilation,BUILD_JDK,\
|
||||
SETUP:=GENERATE_JDKBYTECODE,\
|
||||
SRC:=$(JDK_TOPDIR)/src/share/classes \
|
||||
$(JDK_TOPDIR)/src/$(LEGACY_OPENJDK_TARGET_OS_API)/classes \
|
||||
$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes \
|
||||
$(MACOSX_SRC_DIRS) \
|
||||
$(JDK_OUTPUTDIR)/gensrc \
|
||||
$(JDK_OUTPUTDIR)/gensrc_swing/javax/swing/beaninfo \
|
||||
$(CLOSED_SRC_DIRS),\
|
||||
INCLUDES:=$(JDK_USER_DEFINED_FILTER),\
|
||||
EXCLUDES:=$(EXCLUDES),\
|
||||
EXCLUDE_FILES:=$(EXFILES),\
|
||||
BIN:=$(JDK_OUTPUTDIR)/classes,\
|
||||
@ -360,13 +376,12 @@ ifeq ($(OPENJDK_TARGET_OS),macosx)
|
||||
$(eval $(call SetupJavaCompiler,GENERATE_15BYTECODE,\
|
||||
JAVAC:=$(JAVAC),\
|
||||
FLAGS:=-source 1.5 -target 1.5 -g -bootclasspath $(BOOT_RTJAR) -cp $(JDK_OUTPUTDIR)/../langtools/dist/lib/classes.jar $(DISABLE_WARNINGS),\
|
||||
SERVER_DIR:=$(JAVAC_SERVERS),\
|
||||
SERVER_JVM:=$(SERVER_JAVA),\
|
||||
MODE:=$(JAVAC_USE_MODE),\
|
||||
USE_DEPS:=$(JAVAC_USE_DEPS)))
|
||||
SERVER_DIR:=$(SJAVAC_SERVER_DIR),\
|
||||
SERVER_JVM:=$(SJAVAC_SERVER_JAVA)))
|
||||
|
||||
$(eval $(call SetupJavaCompilation,BUILD_JOBJC_JAR,\
|
||||
SETUP:=GENERATE_15BYTECODE,\
|
||||
DISABLE_SJAVAC:=true,\
|
||||
SRC:=$(JDK_TOPDIR)/src/macosx/native/jobjc/src/core/java \
|
||||
$(JDK_TOPDIR)/src/macosx/native/jobjc/src/runtime-additions/java \
|
||||
$(JDK_OUTPUTDIR)/gensrc, \
|
||||
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -47,12 +47,12 @@ H_TARGET_FILES =$(INCLUDEDIR)/jdwpTransport.h \
|
||||
|
||||
$(INCLUDEDIR)/%.h: $(JDK_TOPDIR)/src/share/javavm/export/%.h
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) -f $@
|
||||
$(RM) $@
|
||||
$(CP) $< $@
|
||||
|
||||
$(OPENJDK_TARGET_OS_INCLUDE)/%.h: $(JDK_TOPDIR)/src/$(LEGACY_OPENJDK_TARGET_OS_API)/javavm/export/%.h
|
||||
$(OPENJDK_TARGET_OS_INCLUDE)/%.h: $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/javavm/export/%.h
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) -f $@
|
||||
$(RM) $@
|
||||
$(CP) $< $@
|
||||
|
||||
COPY_FILES = $(H_TARGET_FILES)
|
||||
@ -64,7 +64,7 @@ SERVICETAG_LIBDIR = $(LIBDIR)/servicetag
|
||||
|
||||
$(SERVICETAG_LIBDIR)/jdk_header.png: $(JDK_TOPDIR)/src/share/classes/com/sun/servicetag/resources/jdk_header.png
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) -f $@
|
||||
$(RM) $@
|
||||
$(CP) $< $@
|
||||
$(CHMOD) 444 $@
|
||||
|
||||
@ -79,20 +79,20 @@ MGMT_TARGET_FILES = $(subst $(MGMT_LIB_SRC),$(MGMT_LIBDIR),$(MGMT_SRC_FILES))
|
||||
|
||||
$(MGMT_LIBDIR)/management.properties: $(MGMT_LIB_SRC)/management.properties
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) -f $@
|
||||
$(RM) $@
|
||||
$(CP) $< $@
|
||||
$(CHMOD) 644 $@
|
||||
|
||||
# this file has different permissions...don't know why...
|
||||
$(MGMT_LIBDIR)/jmxremote.access: $(MGMT_LIB_SRC)/jmxremote.access
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) -f $@
|
||||
$(RM) $@
|
||||
$(CP) $< $@
|
||||
$(CHMOD) 644 $@
|
||||
|
||||
$(MGMT_LIBDIR)/%: $(MGMT_LIB_SRC)/%
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) -f $@
|
||||
$(RM) $@
|
||||
$(CP) $< $@
|
||||
$(CHMOD) 444 $@
|
||||
|
||||
@ -104,7 +104,7 @@ LOGGING_LIB_SRC = $(JDK_TOPDIR)/src/share/lib
|
||||
|
||||
$(LIBDIR)/logging.properties: $(LOGGING_LIB_SRC)/logging.properties
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) -f $@
|
||||
$(RM) $@
|
||||
$(CP) $< $@
|
||||
|
||||
COPY_FILES += $(LIBDIR)/logging.properties
|
||||
@ -119,7 +119,7 @@ PSFONTPROPFILE_TARGET_FILES = $(subst $(PSFONTPROPFILE_SRC_DIR),$(LIBDIR),$(PSFO
|
||||
|
||||
$(LIBDIR)/%: $(PSFONTPROPFILE_SRC_DIR)/%
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) -f $@
|
||||
$(RM) $@
|
||||
$(CP) $< $@
|
||||
|
||||
COPY_FILES += $(PSFONTPROPFILE_TARGET_FILES)
|
||||
@ -129,24 +129,24 @@ COPY_FILES += $(PSFONTPROPFILE_TARGET_FILES)
|
||||
# Copy flavormap.properties, cursor.properties and cursors gif files to LIBDIR
|
||||
#
|
||||
ifneq ($(OPENJDK_TARGET_OS), macosx)
|
||||
OPENJDK_TARGET_OS_LIB_SRC = $(JDK_TOPDIR)/src/$(LEGACY_OPENJDK_TARGET_OS_API)/lib
|
||||
OPENJDK_TARGET_OS_LIB_SRC = $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/lib
|
||||
else
|
||||
OPENJDK_TARGET_OS_LIB_SRC = $(JDK_TOPDIR)/src/macosx/lib
|
||||
endif
|
||||
|
||||
$(LIBDIR)/flavormap.properties: $(OPENJDK_TARGET_OS_LIB_SRC)/flavormap.properties
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) -f $@
|
||||
$(RM) $@
|
||||
$(CP) $< $@
|
||||
|
||||
COPY_FILES += $(LIBDIR)/flavormap.properties
|
||||
|
||||
CURSORS_DEST_DIR = $(LIBDIR)/images/cursors
|
||||
CURSORS_OPENJDK_TARGET_OS_LIB_SRC = $(JDK_TOPDIR)/src/$(LEGACY_OPENJDK_TARGET_OS_API)/lib/images/cursors
|
||||
CURSORS_OPENJDK_TARGET_OS_LIB_SRC = $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/lib/images/cursors
|
||||
|
||||
$(CURSORS_DEST_DIR)/cursors.properties: $(CURSORS_OPENJDK_TARGET_OS_LIB_SRC)/cursors.properties
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) -f $@
|
||||
$(RM) $@
|
||||
$(CP) $< $@
|
||||
|
||||
COPY_FILES += $(CURSORS_DEST_DIR)/cursors.properties
|
||||
@ -161,18 +161,18 @@ CURSORS_TARGET_FILES = $(subst $(CURSORS_LIB_SRC),$(CURSORS_DEST_DIR),$(CURSORS
|
||||
|
||||
$(CURSORS_DEST_DIR)/%: $(CURSORS_LIB_SRC)/%
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) -f $@
|
||||
$(RM) $@
|
||||
$(CP) $< $@
|
||||
|
||||
COPY_FILES += $(CURSORS_TARGET_FILES)
|
||||
|
||||
##########################################################################################
|
||||
|
||||
CONTENT_TYPES_SRC=$(JDK_TOPDIR)/src/$(LEGACY_OPENJDK_TARGET_OS_API)/lib
|
||||
CONTENT_TYPES_SRC=$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/lib
|
||||
|
||||
$(LIBDIR)/content-types.properties: $(CONTENT_TYPES_SRC)/content-types.properties
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) -f $@
|
||||
$(RM) $@
|
||||
$(CP) $< $@
|
||||
|
||||
COPY_FILES += $(LIBDIR)/content-types.properties
|
||||
@ -183,7 +183,7 @@ CALENDARS_SRC := $(JDK_TOPDIR)/src/share/lib
|
||||
|
||||
$(LIBDIR)/calendars.properties: $(CALENDARS_SRC)/calendars.properties
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) -f $@
|
||||
$(RM) $@
|
||||
$(CP) $< $@
|
||||
|
||||
COPY_FILES += $(LIBDIR)/calendars.properties
|
||||
@ -192,11 +192,11 @@ COPY_FILES += $(LIBDIR)/calendars.properties
|
||||
|
||||
ifeq ($(OPENJDK_TARGET_OS),windows)
|
||||
|
||||
TZMAPPINGS_SRC := $(JDK_TOPDIR)/src/$(LEGACY_OPENJDK_TARGET_OS_API)/lib
|
||||
TZMAPPINGS_SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/lib
|
||||
|
||||
$(LIBDIR)/tzmappings: $(TZMAPPINGS_SRC)/tzmappings
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) -f $@
|
||||
$(RM) $@
|
||||
$(CP) $< $@
|
||||
|
||||
COPY_FILES += $(LIBDIR)/tzmappings
|
||||
@ -218,7 +218,7 @@ ICCPROFILE_TARGET_FILES:=$(subst $(ICCPROFILE_SRC_DIR),$(ICCPROFILE_DEST_DIR),$(
|
||||
|
||||
$(ICCPROFILE_DEST_DIR)%.pf: $(ICCPROFILE_SRC_DIR)%.pf
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) -f $@
|
||||
$(RM) $@
|
||||
$(CP) $< $@
|
||||
$(CHMOD) 444 $@
|
||||
|
||||
@ -248,7 +248,7 @@ ifdef OPENJDK
|
||||
FREETYPE_LIB = $(JDK_OUTPUTDIR)/bin/$(call SHARED_LIBRARY,freetype)
|
||||
else
|
||||
ifeq ($(USING_SYSTEM_FT_LIB), false)
|
||||
FREETYPE_LIB = $(JDK_OUTPUTDIR)/lib/$(LIBARCH)/$(call SHARED_LIBRARY,freetype).6
|
||||
FREETYPE_LIB = $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/$(call SHARED_LIBRARY,freetype).6
|
||||
endif
|
||||
endif
|
||||
|
||||
@ -269,7 +269,7 @@ ifeq ($(OPENJDK_TARGET_OS),windows)
|
||||
MSVCRNN_TARGET := $(JDK_OUTPUTDIR)/bin/$(notdir $(MSVCRNN_DLL))
|
||||
$(MSVCRNN_TARGET): $(MSVCRNN_DLL)
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) -f $@
|
||||
$(RM) $@
|
||||
$(CP) $< $@
|
||||
|
||||
COPY_FILES += $(MSVCRNN_TARGET)
|
||||
@ -281,7 +281,7 @@ HPROF_SRC=$(JDK_TOPDIR)/src/share/demo/jvmti/hprof/jvm.hprof.txt
|
||||
|
||||
$(LIBDIR)/jvm.hprof.txt : $(HPROF_SRC)
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) -f $@
|
||||
$(RM) $@
|
||||
$(CP) $< $@
|
||||
|
||||
COPY_FILES += $(LIBDIR)/jvm.hprof.txt
|
||||
@ -292,26 +292,21 @@ COPY_FILES += $(LIBDIR)/jvm.hprof.txt
|
||||
# How to install jvm.cfg.
|
||||
#
|
||||
ifeq ($(JVM_VARIANT_ZERO), true)
|
||||
JVMCFG_ARCH := zero
|
||||
JVMCFG_ARCH := zero
|
||||
else
|
||||
JVMCFG_ARCH := $(ARCH)
|
||||
JVMCFG_ARCH := $(OPENJDK_TARGET_CPU_LEGACY)
|
||||
endif
|
||||
|
||||
ifeq ($(OPENJDK_TARGET_OS),macosx)
|
||||
ifeq ($(JVMCFG_ARCH),amd64)
|
||||
JVMCFG_ARCH := x86_64
|
||||
endif
|
||||
JVMCFG_SRC := $(JDK_TOPDIR)/src/macosx/bin/$(JVMCFG_ARCH)/jvm.cfg
|
||||
JVMCFG_DIR := $(JDK_OUTPUTDIR)/lib
|
||||
else
|
||||
JVMCFG_SRC := $(JDK_TOPDIR)/src/$(LEGACY_OPENJDK_TARGET_OS_API)/bin/$(JVMCFG_ARCH)/jvm.cfg
|
||||
JVMCFG_DIR := $(JDK_OUTPUTDIR)/lib/$(LIBARCH)
|
||||
JVMCFG_SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/bin/$(JVMCFG_ARCH)/jvm.cfg
|
||||
endif
|
||||
|
||||
JVMCFG_DIR := $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)
|
||||
JVMCFG := $(JVMCFG_DIR)/jvm.cfg
|
||||
|
||||
|
||||
ifeq ($(ARCH_DATA_MODEL),32)
|
||||
ifeq ($(OPENJDK_TARGET_CPU_BITS),32)
|
||||
# On 32 bit machines, we can have client and/or server libjvms installed.
|
||||
# Since the currently committed jvm.cfg expects clientANDserver, we need
|
||||
# to patch the jvm.cfg when we have built only a client or only a server.
|
||||
@ -320,7 +315,7 @@ ifeq ($(ARCH_DATA_MODEL),32)
|
||||
# Create a patched jvm.cfg to use -client by default and alias -server to -client.
|
||||
$(JVMCFG):
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) -f $(JVMCFG)
|
||||
$(RM) $(JVMCFG)
|
||||
$(PRINTF) "-client KNOWN\n">$(JVMCFG)
|
||||
$(PRINTF) "-server IGNORE\n">>$(JVMCFG)
|
||||
$(PRINTF) "-hotspot ALIASED_TO -client\n">>$(JVMCFG)
|
||||
@ -334,7 +329,7 @@ ifeq ($(ARCH_DATA_MODEL),32)
|
||||
|
||||
$(JVMCFG):
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) -f $(JVMCFG)
|
||||
$(RM) $(JVMCFG)
|
||||
$(PRINTF) "-server KNOWN\n">$(JVMCFG)
|
||||
$(PRINTF) "-client IGNORE\n">>$(JVMCFG)
|
||||
$(PRINTF) "-hotspot IGNORE\n">>$(JVMCFG)
|
||||
@ -345,7 +340,7 @@ ifeq ($(ARCH_DATA_MODEL),32)
|
||||
# Use the default jvm.cfg for this 32 bit setup.
|
||||
$(JVMCFG): $(JVMCFG_SRC)
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) -f $@
|
||||
$(RM) $@
|
||||
$(CP) $< $@
|
||||
endif
|
||||
endif
|
||||
@ -353,7 +348,7 @@ else
|
||||
# Use the default jvm.cfg for this 64 bit setup.
|
||||
$(JVMCFG): $(JVMCFG_SRC)
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) -f $@
|
||||
$(RM) $@
|
||||
$(CP) $< $@
|
||||
endif
|
||||
|
||||
@ -378,7 +373,7 @@ endif
|
||||
|
||||
$(PROPS_DST): $(PROPS_SRC)
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) -f $@
|
||||
$(RM) $@
|
||||
$(CP) $< $@
|
||||
|
||||
COPY_FILES += $(PROPS_DST)
|
||||
@ -390,7 +385,7 @@ POLICY_DST := $(JDK_OUTPUTDIR)/lib/security/java.policy
|
||||
|
||||
$(POLICY_DST): $(POLICY_SRC)
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) -f $@
|
||||
$(RM) $@
|
||||
$(CP) $< $@
|
||||
|
||||
COPY_FILES += $(POLICY_DST)
|
||||
@ -402,7 +397,7 @@ CACERTS_DST := $(JDK_OUTPUTDIR)/lib/security/cacerts
|
||||
|
||||
$(CACERTS_DST): $(CACERTS_SRC)
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) -f $@
|
||||
$(RM) $@
|
||||
$(CP) $< $@
|
||||
|
||||
COPY_FILES += $(CACERTS_DST)
|
||||
@ -419,14 +414,14 @@ TRUSTEDLIBS_DST := $(JDK_OUTPUTDIR)/lib/security/trusted.libraries
|
||||
|
||||
$(BLACKLIST_DST): $(BLACKLIST_SRC)
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) -f $@
|
||||
$(RM) $@
|
||||
$(CP) $< $@
|
||||
|
||||
COPY_FILES += $(BLACKLIST_DST)
|
||||
|
||||
$(TRUSTEDLIBS_DST): $(TRUSTEDLIBS_SRC)
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) -f $@
|
||||
$(RM) $@
|
||||
$(CP) $< $@
|
||||
|
||||
COPY_FILES += $(TRUSTEDLIBS_DST)
|
||||
@ -462,7 +457,11 @@ $(SHARED_FONTS_DST_DIR)/fonts.dir : $(JDK_TOPDIR)/src/solaris/classes/sun/awt/mo
|
||||
$(RM) $@
|
||||
$(CP) $< $@
|
||||
|
||||
COPY_FILES += $(SHARED_FONTS_DST) $(SHARED_FONTS_DST_DIR)/fonts.dir
|
||||
COPY_FILES += $(SHARED_FONTS_DST)
|
||||
|
||||
ifneq ($(OPENJDK_TARGET_OS), windows)
|
||||
COPY_FILES += $(SHARED_FONTS_DST_DIR)/fonts.dir
|
||||
endif
|
||||
|
||||
ifeq ($(OPENJDK_TARGET_OS), linux)
|
||||
|
||||
@ -537,21 +536,21 @@ _DGALIBS_i586 = # no i586 library yet
|
||||
|
||||
_DGALIBS_amd64 = # no amd64 library yet
|
||||
|
||||
DGALIBS = $(_DGALIBS_$(ARCH):%=$(JDK_OUTPUTDIR)/lib/$(LIBARCH)/%)
|
||||
DGALIBS = $(_DGALIBS_$(OPENJDK_TARGET_CPU_LEGACY):%=$(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/%)
|
||||
|
||||
$(JDK_OUTPUTDIR)/lib/$(LIBARCH)/libxinerama.so: $(JDK_TOPDIR)/src/closed/solaris/lib/$(ARCH)/libxinerama.so
|
||||
$(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libxinerama.so: $(JDK_TOPDIR)/src/closed/solaris/lib/$(OPENJDK_TARGET_CPU_LEGACY)/libxinerama.so
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) $@
|
||||
$(CP) $< $@
|
||||
$(CHMOD) 755 $@
|
||||
|
||||
$(JDK_OUTPUTDIR)/lib/$(LIBARCH)/libjdgaSUNW%.so: $(JDK_TOPDIR)/src/closed/solaris/lib/$(ARCH)/libjdgaSUNW%.so
|
||||
$(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libjdgaSUNW%.so: $(JDK_TOPDIR)/src/closed/solaris/lib/$(OPENJDK_TARGET_CPU_LEGACY)/libjdgaSUNW%.so
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) $@
|
||||
$(CP) $< $@
|
||||
$(CHMOD) 755 $@
|
||||
|
||||
$(JDK_OUTPUTDIR)/lib/$(LIBARCH)/libjdgaSUNWafb.so: $(JDK_OUTPUTDIR)/lib/$(LIBARCH)/libjdgaSUNWffb.so
|
||||
$(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libjdgaSUNWafb.so: $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libjdgaSUNWffb.so
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) $@
|
||||
$(LN) -s $< $@
|
||||
|
@ -174,11 +174,11 @@ COPY_FILES += \
|
||||
$(shell $(MKDIR) -p $(JDK_OUTPUTDIR)/classes/META-INF/services)
|
||||
# Find all META-INF/services/* files
|
||||
ALL_META-INF_DIRS_share:=$(shell $(FIND) $(JDK_TOPDIR)/src/share/classes -type d -a -name META-INF)
|
||||
ALL_META-INF_DIRS_targetapi:=$(shell $(FIND) $(JDK_TOPDIR)/src/$(LEGACY_OPENJDK_TARGET_OS_API)/classes -type d -a -name META-INF)
|
||||
ALL_META-INF_DIRS_targetapi:=$(shell $(FIND) $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes -type d -a -name META-INF)
|
||||
# Platform specific overrides shared
|
||||
ifneq ($(ALL_META-INF_DIRS_targetapi),)
|
||||
ALL_META-INF_DIRS:=$(ALL_META-INF_DIRS_targetapi) \
|
||||
$(filter-out %$(patsubst $(JDK_TOPDIR)/src/$(LEGACY_OPENJDK_TARGET_OS_API)/classes%,%,$(ALL_META-INF_DIRS_targetapi)),\
|
||||
$(filter-out %$(patsubst $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes%,%,$(ALL_META-INF_DIRS_targetapi)),\
|
||||
$(ALL_META-INF_DIRS_share))
|
||||
else
|
||||
ALL_META-INF_DIRS:=$(ALL_META-INF_DIRS_share)
|
||||
@ -216,9 +216,9 @@ OUT_SERVICES_FILES:=$(addprefix $(JDK_OUTPUTDIR)/classes/META-INF/services/,\
|
||||
$(shell $(PRINTF) "$(SRC_SERVICES_FILES)\n" | $(SED) -e 's|/[^ ]*/META-INF/services/||g'))
|
||||
OUT_SERVICES_FILES_COLON:=$(addsuffix :,$(OUT_SERVICES_FILES))
|
||||
# Exception handling for print services with no META-INF directory
|
||||
SRC_SERVICES_FILES_PRINT = $(wildcard $(JDK_TOPDIR)/src/$(LEGACY_OPENJDK_TARGET_OS_API)/classes/sun/print/services/*)
|
||||
SRC_SERVICES_FILES_PRINT = $(wildcard $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes/sun/print/services/*)
|
||||
OUT_SERVICES_FILES_PRINT = $(addprefix $(JDK_OUTPUTDIR)/classes/META-INF/services/,\
|
||||
$(patsubst $(JDK_TOPDIR)/src/$(LEGACY_OPENJDK_TARGET_OS_API)/classes/sun/print/services/%,%,\
|
||||
$(patsubst $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes/sun/print/services/%,%,\
|
||||
$(SRC_SERVICES_FILES_PRINT)))
|
||||
OUT_SERVICES_FILES_PRINT_COLON = $(addsuffix :,$(OUT_SERVICES_FILES_PRINT))
|
||||
RULES_SERVICES_PRINT = $(join $(OUT_SERVICES_FILES_PRINT_COLON),$(SRC_SERVICES_FILES_PRINT))
|
||||
@ -257,23 +257,10 @@ JAVAX_SOUND_SRC_FILES := \
|
||||
javax.sound.midi.spi.SoundbankReader \
|
||||
javax.sound.sampled.spi.AudioFileReader \
|
||||
javax.sound.sampled.spi.AudioFileWriter \
|
||||
javax.sound.sampled.spi.FormatConversionProvider
|
||||
javax.sound.sampled.spi.FormatConversionProvider \
|
||||
javax.sound.sampled.spi.MixerProvider
|
||||
|
||||
COPY_EXTRA += $(foreach F,$(notdir $(JAVAX_SOUND_SRC_FILES)),$(JDK_OUTPUTDIR)/classes/META-INF/services/${F})
|
||||
|
||||
ifeq ($(OPENJDK_TARGET_OS)-$(ARCH),windows-ia64)
|
||||
JAVAX_SOUND_SRC_FILES += windows-ia64/javax.sound.sampled.spi.MixerProvider
|
||||
COPY_EXTRA += $(JDK_OUTPUTDIR)/classes/META-INF/services/javax.sound.sampled.spi.MixerProvider
|
||||
else ifeq ($(OPENJDK_TARGET_OS),windows)
|
||||
JAVAX_SOUND_SRC_FILES += windows-i586/javax.sound.sampled.spi.MixerProvider
|
||||
COPY_EXTRA += $(JDK_OUTPUTDIR)/classes/META-INF/services/javax.sound.sampled.spi.MixerProvider
|
||||
else ifeq ($(OPENJDK_TARGET_OS)-$(ARCH),linux-i586)
|
||||
JAVAX_SOUND_SRC_FILES += linux-i586/javax.sound.sampled.spi.MixerProvider
|
||||
COPY_EXTRA += $(JDK_OUTPUTDIR)/classes/META-INF/services/javax.sound.sampled.spi.MixerProvider
|
||||
else
|
||||
JAVAX_SOUND_SRC_FILES += javax.sound.sampled.spi.MixerProvider
|
||||
COPY_EXTRA += $(JDK_OUTPUTDIR)/classes/META-INF/services/javax.sound.sampled.spi.MixerProvider
|
||||
endif
|
||||
COPY_EXTRA += $(addprefix $(JDK_OUTPUTDIR)/classes/META-INF/services/,$(JAVAX_SOUND_SRC_FILES))
|
||||
|
||||
JAVAX_SOUND_RULES := $(foreach F,$(JAVAX_SOUND_SRC_FILES),$(JDK_OUTPUTDIR)/classes/META-INF/services/$(notdir $F):$(JAVAX_SOUND_SRC)/$F)
|
||||
|
||||
|
@ -54,17 +54,17 @@ endif
|
||||
|
||||
$(SAMPLE_TARGET_DIR)/dtrace/%: $(SAMPLE_SOLARIS_SOURCE_DIR)/dtrace/%
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) -f $@
|
||||
$(RM) $@
|
||||
$(CP) $< $@
|
||||
|
||||
$(SAMPLE_TARGET_DIR)/webservices/%: $(SAMPLE_CLOSED_SOURCE_DIR)/webservices/%
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) -f $@
|
||||
$(RM) $@
|
||||
$(CP) $< $@
|
||||
|
||||
$(SAMPLE_TARGET_DIR)/%: $(SAMPLE_SOURCE_DIR)/%
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) -f $@
|
||||
$(RM) $@
|
||||
$(CP) $< $@
|
||||
|
||||
COPY_FILES += $(SAMPLE_TARGET)
|
||||
|
@ -151,10 +151,12 @@ RT_JAR_EXCLUDES := \
|
||||
sun/security/ec/ECDSASignature\$$$$SHA384.class \
|
||||
sun/security/ec/ECDSASignature\$$$$SHA512.class \
|
||||
sun/security/ec/ECDSASignature.class \
|
||||
sun/security/ec/ECKeyFactory.class \
|
||||
sun/security/ec/ECKeyPairGenerator.class \
|
||||
sun/security/ec/SunEC\$$$$1.class \
|
||||
sun/security/ec/SunEC.class \
|
||||
sun/security/ec/SunECEntries.class \
|
||||
sun/security/mscapi \
|
||||
sun/security/pkcs11 \
|
||||
com/sun/net/ssl/internal/ssl \
|
||||
javax/crypto \
|
||||
@ -260,50 +262,64 @@ endif
|
||||
|
||||
# Find all files in the classes dir to use as dependencies. This could be more fine granular.
|
||||
ALL_FILES_IN_CLASSES := $(shell $(FIND) $(JDK_OUTPUTDIR)/classes -type f \
|
||||
| $(GREP) -v -e '/_the\.*' -e '^_the\.*')
|
||||
| $(GREP) -v -e '/_the\.*' -e '^_the\.*' -e 'javac_state')
|
||||
|
||||
RT_JAR_MANIFEST_FILE := $(JDK_OUTPUTDIR)/lib/_the.rt.jar_manifest
|
||||
RESOURCE_JAR_MANIFEST_FILE := $(JDK_OUTPUTDIR)/lib/_the.resources.jar_manifest
|
||||
|
||||
$(RT_JAR_MANIFEST_FILE): $(MAINMANIFEST) $(BEANMANIFEST)
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) $@ $@.tmp
|
||||
$(SED) -e "s#@@RELEASE@@#$(RELEASE)#" \
|
||||
-e "s#@@COMPANY_NAME@@#$(COMPANY_NAME)#" \
|
||||
$(MAINMANIFEST) >> $@
|
||||
$(ECHO) >> $@
|
||||
$(CAT) $(BEANMANIFEST) >> $@
|
||||
$(MAINMANIFEST) >> $@.tmp
|
||||
$(ECHO) >> $@.tmp
|
||||
$(CAT) $(BEANMANIFEST) >> $@.tmp
|
||||
$(MV) $@.tmp $@
|
||||
|
||||
$(RESOURCE_JAR_MANIFEST_FILE): $(MAINMANIFEST)
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) $@ $@.tmp
|
||||
$(SED) -e "s#@@RELEASE@@#$(RELEASE)#" \
|
||||
-e "s#@@COMPANY_NAME@@#$(COMPANY_NAME)#" \
|
||||
$(MAINMANIFEST) >> $@
|
||||
$(MAINMANIFEST) >> $@.tmp
|
||||
$(MV) $@.tmp $@
|
||||
|
||||
$(JDK_OUTPUTDIR)/lib/_the.jars.exclude: $(MAKEFILE)
|
||||
$(MKDIR) -p $(@D)
|
||||
$(call ListPathsSafely,RT_JAR_EXCLUDES,\n, >> $@)
|
||||
$(RM) $@ $@.tmp
|
||||
$(call ListPathsSafely,RT_JAR_EXCLUDES,\n, >> $@.tmp)
|
||||
$(MV) $@.tmp $@
|
||||
|
||||
$(JDK_OUTPUTDIR)/lib/classlist : $(JDK_TOPDIR)/make/tools/sharing/classlist.$(OPENJDK_TARGET_OS) \
|
||||
$(MAKEFILE)
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) -f $@.temp
|
||||
$(TOOL_ADDJSUM) $< $@.temp
|
||||
$(MV) $@.temp $@
|
||||
$(RM) $@ $@.tmp
|
||||
$(TOOL_ADDJSUM) $< $@.tmp
|
||||
$(MV) $@.tmp $@
|
||||
|
||||
$(JDK_OUTPUTDIR)/lib/_the.jars.contents: $(BUILD_TOOLS) $(JDK_OUTPUTDIR)/lib/_the.jars.exclude \
|
||||
$(ALL_FILES_IN_CLASSES) $(JDK_OUTPUTDIR)/lib/classlist
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) $@.temp
|
||||
$(RM) $@ $@.tmp
|
||||
($(CD) $(JDK_OUTPUTDIR)/classes && \
|
||||
$(TOOL_JARREORDER) \
|
||||
-o $@.temp $(JDK_OUTPUTDIR)/lib/classlist $(JDK_OUTPUTDIR)/lib/_the.jars.exclude . )
|
||||
$(MV) $@.temp $@
|
||||
-o $@.tmp $(JDK_OUTPUTDIR)/lib/classlist $(JDK_OUTPUTDIR)/lib/_the.jars.exclude . )
|
||||
$(MV) $@.tmp $@
|
||||
|
||||
$(JDK_OUTPUTDIR)/lib/_the.rt.jar.contents: $(JDK_OUTPUTDIR)/lib/_the.jars.contents
|
||||
$(GREP) -e '\.class$$' $(JDK_OUTPUTDIR)/lib/_the.jars.contents > $@
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) $@ $@.tmp
|
||||
$(GREP) -e '\.class$$' $(JDK_OUTPUTDIR)/lib/_the.jars.contents > $@.tmp
|
||||
$(MV) $@.tmp $@
|
||||
|
||||
$(JDK_OUTPUTDIR)/lib/_the.resources.jar.contents: $(JDK_OUTPUTDIR)/lib/_the.jars.contents
|
||||
$(GREP) -v -e '\.class$$' -e '/_the\.*' -e '^_the\.*' $(JDK_OUTPUTDIR)/lib/_the.jars.contents > $@
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) $@ $@.tmp
|
||||
$(GREP) -v -e '\.class$$' \
|
||||
-e '/_the\.*' -e '^_the\.*' -e '\\_the\.*' -e 'javac_state' \
|
||||
$(JDK_OUTPUTDIR)/lib/_the.jars.contents > $@.tmp
|
||||
$(MV) $@.tmp $@
|
||||
|
||||
RT_JAR_CREATE_OPTIONS := c0fm
|
||||
ifeq ($(COMPRESS_JARS), true)
|
||||
@ -312,16 +328,22 @@ endif
|
||||
|
||||
$(JDK_OUTPUTDIR)/lib/rt.jar: $(JDK_OUTPUTDIR)/lib/_the.rt.jar.contents $(RT_JAR_MANIFEST_FILE)
|
||||
$(ECHO) Creating rt.jar
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) $@ $@.tmp
|
||||
$(CD) $(JDK_OUTPUTDIR)/classes && \
|
||||
$(JAR) $(RT_JAR_CREATE_OPTIONS) $@ $(RT_JAR_MANIFEST_FILE) \
|
||||
$(JAR) $(RT_JAR_CREATE_OPTIONS) $@.tmp $(RT_JAR_MANIFEST_FILE) \
|
||||
@$(JDK_OUTPUTDIR)/lib/_the.rt.jar.contents
|
||||
$(MV) $@.tmp $@
|
||||
|
||||
$(JDK_OUTPUTDIR)/lib/resources.jar: $(JDK_OUTPUTDIR)/lib/_the.resources.jar.contents \
|
||||
$(RESOURCE_JAR_MANIFEST_FILE)
|
||||
$(ECHO) Creating resources.jar
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) $@ $@.tmp
|
||||
$(CD) $(JDK_OUTPUTDIR)/classes && \
|
||||
$(JAR) $(RT_JAR_CREATE_OPTIONS) $@ $(RESOURCE_JAR_MANIFEST_FILE) \
|
||||
$(JAR) $(RT_JAR_CREATE_OPTIONS) $@.tmp $(RESOURCE_JAR_MANIFEST_FILE) \
|
||||
@$(JDK_OUTPUTDIR)/lib/_the.resources.jar.contents
|
||||
$(MV) $@.tmp $@
|
||||
|
||||
JARS+=$(JDK_OUTPUTDIR)/lib/rt.jar $(JDK_OUTPUTDIR)/lib/resources.jar
|
||||
|
||||
@ -385,32 +407,31 @@ JARS+=$(JDK_OUTPUTDIR)/lib/jsse.jar
|
||||
|
||||
##########################################################################################
|
||||
|
||||
ifneq ($(OPENJDK_TARGET_OS)-$(ARCH_DATA_MODEL),windows-64)
|
||||
SUNPKCS11_JAR_DST := $(JDK_OUTPUTDIR)/lib/ext/sunpkcs11.jar
|
||||
SUNPKCS11_JAR_DST := $(JDK_OUTPUTDIR)/lib/ext/sunpkcs11.jar
|
||||
|
||||
ifndef OPENJDK
|
||||
ifndef OPENJDK
|
||||
|
||||
SUNPKCS11_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/pkcs11/sunpkcs11.jar
|
||||
SUNPKCS11_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/pkcs11/sunpkcs11.jar
|
||||
|
||||
$(SUNPKCS11_JAR_DST) : $(SUNPKCS11_JAR_SRC)
|
||||
@$(ECHO) "\n>>>Installing prebuilt SunPKCS11 provider..."
|
||||
$(RM) $@
|
||||
$(CP) $< $@
|
||||
$(SUNPKCS11_JAR_DST) : $(SUNPKCS11_JAR_SRC)
|
||||
@$(ECHO) "\n>>>Installing prebuilt SunPKCS11 provider..."
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) $@
|
||||
$(CP) $< $@
|
||||
|
||||
else
|
||||
else
|
||||
|
||||
$(eval $(call SetupArchive,BUILD_SUNPKCS11_JAR,$(SUNPKCS11_JAR_DEPS),\
|
||||
SRCS:=$(JDK_OUTPUTDIR)/classes, \
|
||||
SUFFIXES:=.class,\
|
||||
INCLUDES:=sun/security/pkcs11,\
|
||||
JAR:=$(SUNPKCS11_JAR_DST), \
|
||||
SKIP_METAINF := true))
|
||||
$(eval $(call SetupArchive,BUILD_SUNPKCS11_JAR,$(SUNPKCS11_JAR_DEPS),\
|
||||
SRCS:=$(JDK_OUTPUTDIR)/classes, \
|
||||
SUFFIXES:=.class,\
|
||||
INCLUDES:=sun/security/pkcs11,\
|
||||
JAR:=$(SUNPKCS11_JAR_DST), \
|
||||
SKIP_METAINF := true))
|
||||
|
||||
endif
|
||||
|
||||
JARS += $(SUNPKCS11_JAR_DST)
|
||||
endif
|
||||
|
||||
JARS += $(SUNPKCS11_JAR_DST)
|
||||
|
||||
##########################################################################################
|
||||
|
||||
SUNEC_JAR_DST := $(JDK_OUTPUTDIR)/lib/ext/sunec.jar
|
||||
@ -421,6 +442,7 @@ SUNEC_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/ec/sunec.jar
|
||||
|
||||
$(SUNEC_JAR_DST) : $(SUNEC_JAR_SRC)
|
||||
@$(ECHO) "\n>>>Installing prebuilt SunEC provider..."
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) $@
|
||||
$(CP) $< $@
|
||||
|
||||
@ -430,12 +452,6 @@ $(eval $(call SetupArchive,BUILD_SUNEC_JAR,,\
|
||||
SRCS:=$(JDK_OUTPUTDIR)/classes, \
|
||||
SUFFIXES:=.class,\
|
||||
INCLUDES:=sun/security/ec,\
|
||||
EXCLUDE_FILES := sun/security/ec/ECKeyFactory.class \
|
||||
sun/security/ec/ECParameters.class \
|
||||
sun/security/ec/ECPrivateKeyImpl.class \
|
||||
sun/security/ec/ECPublicKeyImpl.class \
|
||||
sun/security/ec/NamedCurve.class \
|
||||
sun/security/ec/ECKeyFactory*,\
|
||||
JAR:=$(SUNEC_JAR_DST), \
|
||||
SKIP_METAINF := true))
|
||||
|
||||
@ -465,6 +481,7 @@ ifndef OPENJDK
|
||||
|
||||
$(SUNJCE_PROVIDER_JAR_DST) : $(SUNJCE_PROVIDER_JAR_SRC)
|
||||
@$(ECHO) "\n>>>Installing prebuilt SunJCE provider..."
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) $@
|
||||
$(CP) $< $@
|
||||
else
|
||||
@ -489,6 +506,7 @@ JCE_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/jce/jce.jar
|
||||
|
||||
$(JCE_JAR_DST) : $(JCE_JAR_SRC)
|
||||
@$(ECHO) "\n>>>Installing prebuilt jce.jar..."
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) $@
|
||||
$(CP) $< $@
|
||||
|
||||
@ -520,6 +538,7 @@ US_EXPORT_POLICY_JAR_TMP := $(JDK_OUTPUTDIR)/US_export_policy_jar.tmp
|
||||
|
||||
$(US_EXPORT_POLICY_JAR_TMP)/% : $(US_EXPORT_POLICY_JAR_SRC_DIR)/%
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) $@
|
||||
$(CP) $< $@
|
||||
|
||||
US_EXPORT_POLICY_JAR_DEPS := $(US_EXPORT_POLICY_JAR_TMP)/default_US_export.policy
|
||||
@ -552,6 +571,7 @@ LOCAL_POLICY_JAR_DEPS := $(LOCAL_POLICY_JAR_TMP)/exempt_local.policy $(LOCAL_POL
|
||||
|
||||
$(LOCAL_POLICY_JAR_TMP)/% : $(LOCAL_POLICY_JAR_SRC_DIR)/%
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) $@
|
||||
$(CP) $< $@
|
||||
|
||||
$(eval $(call SetupArchive,BUILD_LOCAL_POLICY_JAR,$(LOCAL_POLICY_JAR_DEPS),\
|
||||
@ -576,6 +596,7 @@ SUNMSCAPI_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/mscapi/sunmscapi.jar
|
||||
|
||||
$(SUNMSCAPI_JAR_DST) : $(SUNMSCAPI_JAR_SRC)
|
||||
@$(ECHO) "\n>>>Installing prebuilt SunMSCAPI provider..."
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) $@
|
||||
$(CP) $< $@
|
||||
|
||||
@ -586,9 +607,9 @@ $(eval $(call SetupArchive,BUILD_SUNMSCAPI_JAR,$(SUNMSCAPI_JAR_DEPS),\
|
||||
SUFFIXES:=.class,\
|
||||
INCLUDES:= sun/security/mscapi,\
|
||||
JAR:=$(SUNMSCAPI_JAR_DST), \
|
||||
MANIFEST := $(JDK_TOPDIR)/make/tools/manifest.mf, \
|
||||
EXTRA_MANIFEST_ATTR := Extension-Name: javax.crypto\nImplementation-Vendor-Id: com.sun, \
|
||||
SKIP_METAINF := true))
|
||||
MANIFEST:=$(JDK_TOPDIR)/make/tools/manifest.mf, \
|
||||
EXTRA_MANIFEST_ATTR:=Extension-Name: javax.crypto\nImplementation-Vendor-Id: com.sun, \
|
||||
SKIP_METAINF:=true))
|
||||
endif
|
||||
|
||||
JARS += $(SUNMSCAPI_JAR_DST)
|
||||
@ -605,6 +626,7 @@ UCRYPTO_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/ucrypto/ucrypto.jar
|
||||
|
||||
$(UCRYPTO_JAR_DST) : $(UCRYPTO_JAR_SRC)
|
||||
@$(ECHO) "\n>>>Installing prebuilt OracleUcrypto provider..."
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) $@
|
||||
$(CP) $< $@
|
||||
|
||||
@ -711,8 +733,8 @@ JARS+=$(JDK_OUTPUTDIR)/lib/tools.jar
|
||||
|
||||
##########################################################################################
|
||||
|
||||
include $(JDK_TOPDIR)/makefiles/docs/CORE_PKGS.gmk
|
||||
include $(JDK_TOPDIR)/makefiles/docs/NON_CORE_PKGS.gmk
|
||||
include javadoc/CORE_PKGS.gmk
|
||||
include javadoc/NON_CORE_PKGS.gmk
|
||||
|
||||
# The compiler should not issue a "Proprietary" warning when compiling
|
||||
# classes in the com.sun.java.swing.plaf packages, since we've always
|
||||
@ -740,7 +762,7 @@ EXPORTED_PRIVATE_PKGS = com.sun.servicetag \
|
||||
com.oracle.nio
|
||||
|
||||
$(IMAGES_OUTPUTDIR)/symbols/_the.symbols: $(JDK_OUTPUTDIR)/lib/rt.jar
|
||||
$(RM) -rf $(IMAGES_OUTPUTDIR)/symbols/META-INF/sym
|
||||
$(RM) -r $(IMAGES_OUTPUTDIR)/symbols/META-INF/sym
|
||||
$(MKDIR) -p $(IMAGES_OUTPUTDIR)/symbols/META-INF/sym
|
||||
$(JAVA) \
|
||||
-Xbootclasspath/a:$(JDK_OUTPUTDIR)/classes \
|
||||
@ -808,9 +830,10 @@ SRC_ZIP_INCLUDES = \
|
||||
org/ietf \
|
||||
org/omg \
|
||||
org/w3c/dom \
|
||||
org/xml/sax
|
||||
org/xml/sax \
|
||||
sunw
|
||||
|
||||
SRC_ZIP_SRCS = $(JDK_TOPDIR)/src/share/classes $(JDK_TOPDIR)/src/$(LEGACY_OPENJDK_TARGET_OS_API)/classes
|
||||
SRC_ZIP_SRCS = $(JDK_TOPDIR)/src/share/classes $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes
|
||||
SRC_ZIP_SRCS += $(JDK_OUTPUTDIR)/gensrc
|
||||
SRC_ZIP_SRCS += $(JDK_OUTPUTDIR)/impsrc
|
||||
SRC_ZIP_SRCS += $(JDK_OUTPUTDIR)/gendocsrc_rmic
|
||||
@ -821,17 +844,19 @@ endif
|
||||
# Need to copy launcher src files into desired directory structure
|
||||
# before zipping the sources.
|
||||
LAUNCHER_SRC_FILES := $(wildcard $(JDK_TOPDIR)/src/share/bin/*) \
|
||||
$(wildcard $(JDK_TOPDIR)/src/$(LEGACY_OPENJDK_TARGET_OS_API)/bin/java_md*)
|
||||
$(wildcard $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/bin/java_md*)
|
||||
LAUNCHER_ZIP_SRC := $(patsubst $(JDK_TOPDIR)/src/share/bin/%,$(IMAGES_OUTPUTDIR)/src/launcher/%,\
|
||||
$(patsubst $(JDK_TOPDIR)/src/$(LEGACY_OPENJDK_TARGET_OS_API)/bin/%,$(IMAGES_OUTPUTDIR)/src/launcher/%,\
|
||||
$(patsubst $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/bin/%,$(IMAGES_OUTPUTDIR)/src/launcher/%,\
|
||||
$(LAUNCHER_SRC_FILES)))
|
||||
|
||||
$(IMAGES_OUTPUTDIR)/src/launcher/%: $(JDK_TOPDIR)/src/share/bin/%
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) $@
|
||||
$(CP) $< $@
|
||||
|
||||
$(IMAGES_OUTPUTDIR)/src/launcher/%: $(JDK_TOPDIR)/src/$(LEGACY_OPENJDK_TARGET_OS_API)/bin/%
|
||||
$(IMAGES_OUTPUTDIR)/src/launcher/%: $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/bin/%
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) $@
|
||||
$(CP) $< $@
|
||||
|
||||
$(IMAGES_OUTPUTDIR)/src.zip: $(LAUNCHER_ZIP_SRC)
|
||||
@ -849,6 +874,10 @@ JARS+=$(IMAGES_OUTPUTDIR)/src.zip
|
||||
|
||||
##########################################################################################
|
||||
|
||||
-include $(CUSTOM_MAKE_DIR)/CreateJars.gmk
|
||||
|
||||
##########################################################################################
|
||||
|
||||
all: $(JARS)
|
||||
|
||||
.PHONY: default all
|
||||
|
@ -48,10 +48,12 @@ BREAK_ITERATOR_CLASSES = $(BREAK_ITERATOR_DIR)/classes
|
||||
# two files in that directory and not get anything implicit from
|
||||
# surrounding directories which aren't jdk 6 compatible.
|
||||
# Because we are targeting jdk 6, but the surrounding source code is jdk 7. Ugh.
|
||||
# These two files should be moved out to a build tool!
|
||||
# These two files should be moved out to a build tool! We have to disable
|
||||
# sjavac here as well.
|
||||
$(eval $(call SetupJavaCompilation,BUILD_BREAKITERATOR,\
|
||||
SETUP:=GENERATE_OLDBYTECODE,\
|
||||
SRC:=$(TEXT_SRCDIR),\
|
||||
DISABLE_SJAVAC:=true,\
|
||||
JAVAC_SOURCE_PATH_UGLY_OVERRIDE:=$(TEXT_SRCDIR)/$(TEXT_PKG),\
|
||||
INCLUDES:=$(TEXT_PKG),\
|
||||
INCLUDE_FILES:=$(TEXT_SOURCES),\
|
||||
@ -70,23 +72,23 @@ BIFILES = $(DATA_PKG_DIR)/CharacterBreakIteratorData \
|
||||
BIFILES_TH = $(DATA_PKG_DIR)/th/WordBreakIteratorData_th \
|
||||
$(DATA_PKG_DIR)/th/LineBreakIteratorData_th
|
||||
|
||||
$(BIFILES): $(BREAK_ITERATOR_DIR)/_the.bifiles
|
||||
$(BREAK_ITERATOR_DIR)/_the.bifiles: JAVA_FLAGS += -Xbootclasspath/p:$(BREAK_ITERATOR_CLASSES)
|
||||
$(BREAK_ITERATOR_DIR)/_the.bifiles: $(BUILD_TOOLS) $(UNICODEDATA) $(BUILD_BREAKITERATOR)
|
||||
$(BIFILES): $(DATA_PKG_DIR)/_the.bifiles
|
||||
$(DATA_PKG_DIR)/_the.bifiles: JAVA_FLAGS += -Xbootclasspath/p:$(BREAK_ITERATOR_CLASSES)
|
||||
$(DATA_PKG_DIR)/_the.bifiles: $(BUILD_TOOLS) $(UNICODEDATA) $(BUILD_BREAKITERATOR)
|
||||
$(ECHO) "Generating BreakIteratorData"
|
||||
$(MKDIR) -p $(DATA_PKG_DIR)
|
||||
$(RM) -f $(BIFILES)
|
||||
$(RM) $(BIFILES)
|
||||
$(TOOL_GENERATEBREAKITERATORDATA) \
|
||||
-o $(DATA_PKG_DIR) \
|
||||
-spec $(UNICODEDATA)
|
||||
$(TOUCH) $@
|
||||
|
||||
$(BIFILES_TH): $(BREAK_ITERATOR_DIR)/_the.bifiles_th
|
||||
$(BREAK_ITERATOR_DIR)/_the.bifiles_th: JAVA_FLAGS += -Xbootclasspath/p:$(BREAK_ITERATOR_CLASSES)
|
||||
$(BREAK_ITERATOR_DIR)/_the.bifiles_th: $(BUILD_TOOLS) $(UNICODEDATA) $(BUILD_BREAKITERATOR)
|
||||
$(BIFILES_TH): $(DATA_PKG_DIR)/_the.bifiles_th
|
||||
$(DATA_PKG_DIR)/_the.bifiles_th: JAVA_FLAGS += -Xbootclasspath/p:$(BREAK_ITERATOR_CLASSES)
|
||||
$(DATA_PKG_DIR)/_the.bifiles_th: $(BUILD_TOOLS) $(UNICODEDATA) $(BUILD_BREAKITERATOR)
|
||||
$(ECHO) "Generating BreakIteratorData_th"
|
||||
$(MKDIR) -p $(DATA_PKG_DIR)/th
|
||||
$(RM) -f $(BIFILES_TH)
|
||||
$(RM) $(BIFILES_TH)
|
||||
$(TOOL_GENERATEBREAKITERATORDATA) \
|
||||
-o $(DATA_PKG_DIR) \
|
||||
-spec $(UNICODEDATA) \
|
||||
|
@ -26,53 +26,61 @@
|
||||
GENDATA_FONT_CONFIG_DST := $(JDK_OUTPUTDIR)/lib
|
||||
|
||||
ifeq ($(OPENJDK_TARGET_OS), windows)
|
||||
GENDATA_FONT_CONFIG_SRC_DIR := $(JDK_TOPDIR)/src/windows/classes/sun/awt/windows
|
||||
GENDATA_FONT_CONFIG_SRC_FILES := fontconfig.properties
|
||||
GENDATA_FONT_CONFIG_SRC_PREFIX :=
|
||||
GENDATA_FONT_CONFIG_SRC_DIR := $(JDK_TOPDIR)/src/windows/classes/sun/awt/windows
|
||||
GENDATA_FONT_CONFIG_SRC_FILES := fontconfig.properties
|
||||
GENDATA_FONT_CONFIG_SRC_PREFIX :=
|
||||
endif
|
||||
|
||||
ifeq ($(OPENJDK_TARGET_OS), linux)
|
||||
GENDATA_FONT_CONFIG_SRC_PREFIX := linux.
|
||||
ifdef OPENJDK
|
||||
GENDATA_FONT_CONFIG_SRC_DIR := $(JDK_TOPDIR)/src/solaris/classes/sun/awt/fontconfigs
|
||||
GENDATA_FONT_CONFIG_SRC_FILES := \
|
||||
GENDATA_FONT_CONFIG_SRC_PREFIX := linux.
|
||||
ifdef OPENJDK
|
||||
GENDATA_FONT_CONFIG_SRC_DIR := \
|
||||
$(JDK_TOPDIR)/src/solaris/classes/sun/awt/fontconfigs
|
||||
GENDATA_FONT_CONFIG_SRC_FILES := \
|
||||
fontconfig.properties \
|
||||
fontconfig.SuSE.properties \
|
||||
fontconfig.Ubuntu.properties \
|
||||
fontconfig.Fedora.properties
|
||||
else
|
||||
GENDATA_FONT_CONFIG_SRC_DIR := $(JDK_TOPDIR)/src/closed/solaris/classes/sun/awt/fontconfigs
|
||||
GENDATA_FONT_CONFIG_SRC_FILES := \
|
||||
else
|
||||
GENDATA_FONT_CONFIG_SRC_DIR := \
|
||||
$(JDK_TOPDIR)/src/closed/solaris/classes/sun/awt/fontconfigs
|
||||
GENDATA_FONT_CONFIG_SRC_FILES := \
|
||||
fontconfig.properties \
|
||||
fontconfig.RedHat.5.properties \
|
||||
fontconfig.RedHat.6.properties \
|
||||
fontconfig.Turbo.properties \
|
||||
fontconfig.SuSE.10.properties \
|
||||
fontconfig.SuSE.11.properties
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(OPENJDK_TARGET_OS), solaris)
|
||||
GENDATA_FONT_CONFIG_SRC_DIR := $(JDK_TOPDIR)/src/solaris/classes/sun/awt/fontconfigs
|
||||
GENDATA_FONT_CONFIG_SRC_FILES := fontconfig.properties
|
||||
GENDATA_FONT_CONFIG_SRC_PREFIX := solaris.
|
||||
GENDATA_FONT_CONFIG_SRC_DIR := \
|
||||
$(JDK_TOPDIR)/src/solaris/classes/sun/awt/fontconfigs
|
||||
GENDATA_FONT_CONFIG_SRC_FILES := fontconfig.properties
|
||||
GENDATA_FONT_CONFIG_SRC_PREFIX := solaris.
|
||||
endif
|
||||
|
||||
ifeq ($(OPENJDK_TARGET_OS), macosx)
|
||||
GENDATA_FONT_CONFIG_SRC_DIR := $(JDK_TOPDIR)/src/macosx/classes/sun/awt/fontconfigs
|
||||
GENDATA_FONT_CONFIG_SRC_FILES := fontconfig.properties
|
||||
GENDATA_FONT_CONFIG_SRC_PREFIX := macosx.
|
||||
endif # OPENJDK_TARGET_OS
|
||||
GENDATA_FONT_CONFIG_SRC_DIR := \
|
||||
$(JDK_TOPDIR)/src/macosx/classes/sun/awt/fontconfigs
|
||||
GENDATA_FONT_CONFIG_SRC_FILES := fontconfig.properties
|
||||
GENDATA_FONT_CONFIG_SRC_PREFIX := macosx.
|
||||
endif
|
||||
|
||||
###
|
||||
|
||||
$(GENDATA_FONT_CONFIG_DST)/%.src : $(GENDATA_FONT_CONFIG_SRC_DIR)/$(GENDATA_FONT_CONFIG_SRC_PREFIX)%
|
||||
$(GENDATA_FONT_CONFIG_DST)/%.src : \
|
||||
$(GENDATA_FONT_CONFIG_SRC_DIR)/$(GENDATA_FONT_CONFIG_SRC_PREFIX)%
|
||||
$(RM) $@
|
||||
$(MKDIR) -p $(@D)
|
||||
$(CP) $< $@
|
||||
$(CHMOD) 644 $@
|
||||
|
||||
$(GENDATA_FONT_CONFIG_DST)/%.bfc : $(GENDATA_FONT_CONFIG_SRC_DIR)/$(GENDATA_FONT_CONFIG_SRC_PREFIX)%.properties
|
||||
$(GENDATA_FONT_CONFIG_DST)/%.bfc : \
|
||||
$(GENDATA_FONT_CONFIG_SRC_DIR)/$(GENDATA_FONT_CONFIG_SRC_PREFIX)%.properties
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) $@
|
||||
$(TOOL_COMPILEFONTCONFIG) $< $@
|
||||
$(CHMOD) 444 $@
|
||||
|
||||
@ -84,3 +92,4 @@ GENDATA_BFONT_CONFIGS := $(GENDATA_FONT_CONFIG_SRC_FILES:%.properties=$(GENDATA_
|
||||
GENDATA_FONT_CONFIG := $(GENDATA_FONT_CONFIGS) $(GENDATA_BFONT_CONFIGS)
|
||||
|
||||
###
|
||||
|
||||
|
@ -46,9 +46,9 @@ TZFILES := \
|
||||
GENDATA_TIMEZONE_MAPFILE:=ZoneInfoMappings
|
||||
|
||||
$(GENDATA_TIMEZONE_DST)/$(GENDATA_TIMEZONE_MAPFILE) : $(TZFILES)
|
||||
$(RM) -rf $(GENDATA_TIMEZONE_TMP)
|
||||
$(RM) -r $(GENDATA_TIMEZONE_TMP)
|
||||
$(MKDIR) -p $(GENDATA_TIMEZONE_TMP)
|
||||
$(RM) -rf $(GENDATA_TIMEZONE_DST)
|
||||
$(RM) -r $(GENDATA_TIMEZONE_DST)
|
||||
$(MKDIR) -p $(GENDATA_TIMEZONE_DST)
|
||||
$(TOOL_JAVAZIC) -V "$(GENDATA_TIMEZONE_VERSION)" -d $(GENDATA_TIMEZONE_TMP) $(TZFILES)
|
||||
$(CP) -r $(GENDATA_TIMEZONE_TMP)/* $(GENDATA_TIMEZONE_DST)/
|
||||
|
@ -31,7 +31,7 @@ include RMICompilation.gmk
|
||||
|
||||
# To ensure the latest stub generator files are picked up from corba repo
|
||||
# when available, we need to run with latest rmic version available.
|
||||
ifeq ($(CROSS_COMPILE_ARCH),)
|
||||
ifneq ($(COMPILE_TYPE),cross)
|
||||
RMIC := $(UNCYGDRIVE) $(JDK_OUTPUTDIR)/bin/rmic
|
||||
endif
|
||||
|
||||
|
@ -67,8 +67,8 @@ GENDATA_CURDATA := $(JDK_OUTPUTDIR)/lib/currency.data
|
||||
$(GENDATA_CURDATA): $(JDK_TOPDIR)/src/share/classes/java/util/CurrencyData.properties $(BUILD_TOOLS)
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) $@
|
||||
$(TOOL_GENERATECURRENCYDATA) -o $@.temp < $<
|
||||
$(MV) $@.temp $@
|
||||
$(TOOL_GENERATECURRENCYDATA) -o $@.tmp < $<
|
||||
$(MV) $@.tmp $@
|
||||
$(CHMOD) 444 $@
|
||||
|
||||
GENDATA += $(GENDATA_CURDATA)
|
||||
@ -77,6 +77,9 @@ GENDATA += $(GENDATA_CURDATA)
|
||||
|
||||
$(GENDATA) : $(BUILD_TOOLS)
|
||||
|
||||
all: $(GENDATA)
|
||||
$(JDK_OUTPUTDIR)/classes/_the.gendata : $(GENDATA)
|
||||
$(TOUCH) $@
|
||||
|
||||
all: $(JDK_OUTPUTDIR)/classes/_the.gendata
|
||||
|
||||
.PHONY: all
|
||||
|
@ -226,7 +226,7 @@ define SetupGenBuffer
|
||||
endif
|
||||
|
||||
$$($1_DST) : $$($1_DEP) $(GENSRC_BUFFER_DST)/_the.dir
|
||||
$(TOOL_SPP) < $$($1_SRC) > $$($1_OUT).temp \
|
||||
$(TOOL_SPP) < $$($1_SRC) > $$($1_OUT).tmp \
|
||||
-K$$($1_type) \
|
||||
-K$$($1_category) \
|
||||
-Dtype=$$($1_type) \
|
||||
@ -248,19 +248,19 @@ $$($1_DST) : $$($1_DEP) $(GENSRC_BUFFER_DST)/_the.dir
|
||||
-Da=$$($1_a) \
|
||||
-DA=$$($1_A) \
|
||||
-Kbo$$($1_BO)
|
||||
$(MV) $$($1_OUT).temp $$($1_OUT)
|
||||
$(MV) $$($1_OUT).tmp $$($1_OUT)
|
||||
# Do the extra bin thing
|
||||
ifeq ($$($1_BIN),1)
|
||||
$(SED) -e '/#BIN/,$$$$d' < $$($1_OUT) > $$($1_DST).temp
|
||||
$(SED) -e '/#BIN/,$$$$d' < $$($1_OUT) > $$($1_DST).tmp
|
||||
$(RM) $$($1_OUT)
|
||||
$$($1_char_CMD) < $$($1_SRC_BIN) >> $$($1_DST).temp
|
||||
$$($1_short_CMD) < $$($1_SRC_BIN) >> $$($1_DST).temp
|
||||
$$($1_int_CMD) < $$($1_SRC_BIN) >> $$($1_DST).temp
|
||||
$$($1_long_CMD) < $$($1_SRC_BIN) >> $$($1_DST).temp
|
||||
$$($1_float_CMD) < $$($1_SRC_BIN) >> $$($1_DST).temp
|
||||
$$($1_double_CMD) < $$($1_SRC_BIN) >> $$($1_DST).temp
|
||||
$(PRINTF) "}\n" >> $$($1_DST).temp
|
||||
mv $$($1_DST).temp $$($1_DST)
|
||||
$$($1_char_CMD) < $$($1_SRC_BIN) >> $$($1_DST).tmp
|
||||
$$($1_short_CMD) < $$($1_SRC_BIN) >> $$($1_DST).tmp
|
||||
$$($1_int_CMD) < $$($1_SRC_BIN) >> $$($1_DST).tmp
|
||||
$$($1_long_CMD) < $$($1_SRC_BIN) >> $$($1_DST).tmp
|
||||
$$($1_float_CMD) < $$($1_SRC_BIN) >> $$($1_DST).tmp
|
||||
$$($1_double_CMD) < $$($1_SRC_BIN) >> $$($1_DST).tmp
|
||||
$(PRINTF) "}\n" >> $$($1_DST).tmp
|
||||
mv $$($1_DST).tmp $$($1_DST)
|
||||
endif
|
||||
|
||||
GENSRC_BUFFER += $$($1_DST)
|
||||
|
@ -36,8 +36,8 @@ GENSRC_CHARSETCODER_TEMPLATE := $(GENSRC_CHARSETCODER_SRC)/charset/Charset-X-Cod
|
||||
|
||||
$(GENSRC_CHARSETCODER_DST)/CharsetDecoder.java : $(GENSRC_CHARSETCODER_TEMPLATE)
|
||||
$(MKDIR) -p $(@D)
|
||||
-$(RM) $@.temp
|
||||
$(TOOL_SPP) < $< >$@.temp \
|
||||
-$(RM) $@.tmp
|
||||
$(TOOL_SPP) < $< >$@.tmp \
|
||||
-Kdecoder \
|
||||
-DA='A' \
|
||||
-Da='a' \
|
||||
@ -63,7 +63,7 @@ $(GENSRC_CHARSETCODER_DST)/CharsetDecoder.java : $(GENSRC_CHARSETCODER_TEMPLATE)
|
||||
-DnotLegal='not legal for this charset' \
|
||||
-Dotypes-per-itype='chars-per-byte' \
|
||||
-DoutSequence='Unicode character'
|
||||
$(MV) $@.temp $@
|
||||
$(MV) $@.tmp $@
|
||||
|
||||
GENSRC_CHARSETCODER += $(GENSRC_CHARSETCODER_DST)/CharsetDecoder.java
|
||||
|
||||
@ -71,8 +71,8 @@ GENSRC_CHARSETCODER += $(GENSRC_CHARSETCODER_DST)/CharsetDecoder.java
|
||||
|
||||
$(GENSRC_CHARSETCODER_DST)/CharsetEncoder.java : $(GENSRC_CHARSETCODER_TEMPLATE)
|
||||
$(MKDIR) -p $(@D)
|
||||
-$(RM) $@.temp
|
||||
$(TOOL_SPP) < $< >$@.temp \
|
||||
-$(RM) $@.tmp
|
||||
$(TOOL_SPP) < $< >$@.tmp \
|
||||
-Kencoder \
|
||||
-DA='An' \
|
||||
-Da='an' \
|
||||
@ -98,7 +98,7 @@ $(GENSRC_CHARSETCODER_DST)/CharsetEncoder.java : $(GENSRC_CHARSETCODER_TEMPLATE)
|
||||
-DnotLegal='not a legal sixteen-bit Unicode sequence' \
|
||||
-Dotypes-per-itype='bytes-per-char' \
|
||||
-DoutSequence='byte sequence in the given charset'
|
||||
$(MV) $@.temp $@
|
||||
$(MV) $@.tmp $@
|
||||
|
||||
GENSRC_CHARSETCODER += $(GENSRC_CHARSETCODER_DST)/CharsetEncoder.java
|
||||
|
||||
|
@ -29,7 +29,7 @@ GENSRC_ICONS_TMP := $(JDK_OUTPUTDIR)/gensrc_icons
|
||||
GENSRC_ICONS_DST := $(GENSRC_ICONS_TMP)/sun/awt/X11
|
||||
|
||||
ifdef OPENJDK
|
||||
ICONS_PATH_PREFIX := $(JDK_TOPDIR)/src/$(LEGACY_OPENJDK_TARGET_OS_API)
|
||||
ICONS_PATH_PREFIX := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)
|
||||
else
|
||||
ICONS_PATH_PREFIX := $(JDK_TOPDIR)/src/closed/solaris
|
||||
endif
|
||||
@ -41,7 +41,7 @@ GENSRC_ICONS_SRC += \
|
||||
$(ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon48.png
|
||||
|
||||
|
||||
ICONPATH := $(JDK_TOPDIR)/src/$(LEGACY_OPENJDK_TARGET_OS_API)/classes/sun/awt/X11
|
||||
ICONPATH := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes/sun/awt/X11
|
||||
|
||||
GENSRC_ICONS_SRC += \
|
||||
$(ICONPATH)/security-icon-bw16.png \
|
||||
@ -85,10 +85,7 @@ $$($1_TARGET32) : $2/$1 $(GENSRC_ICONS_TMP)/_the.dir
|
||||
$(ECHO) "package sun.awt.X11;" > $$@.tmp
|
||||
$(ECHO) "public class $$($1_NAME32) {" >> $$@.tmp
|
||||
$(ECHO) "public static int[] $$($1_SHORTNAME) = { " >> $$@.tmp
|
||||
# TODO FIX FIX FIX
|
||||
ifneq ($(OPENJDK_TARGET_OS),macosx)
|
||||
$(CAT) $$< | $(TOOL_TOBIN) >> $$@.tmp
|
||||
endif
|
||||
$(ECHO) "}; }" >> $$@.tmp
|
||||
$(MV) $$@.tmp $$@
|
||||
|
||||
@ -99,10 +96,7 @@ $$($1_TARGET64) : $2/$1 $(GENSRC_ICONS_TMP)/_the.dir
|
||||
$(ECHO) "package sun.awt.X11;" > $$@.tmp
|
||||
$(ECHO) "public class $$($1_NAME64) {" >> $$@.tmp
|
||||
$(ECHO) "public static long[] $$($1_SHORTNAME) = { " >> $$@.tmp
|
||||
# TODO FIX FIX FIX
|
||||
ifneq ($(OPENJDK_TARGET_OS),macosx)
|
||||
$(CAT) $$< | $(TOOL_TOBIN) >> $$@.tmp
|
||||
endif
|
||||
$(ECHO) "}; }" >> $$@.tmp
|
||||
$(MV) $$@.tmp $$@
|
||||
|
||||
|
@ -31,8 +31,17 @@ $(JDK_OUTPUTDIR)/gensrc_jdwp_headers/JDWPCommands.h : $(JDK_TOPDIR)/makefiles/jp
|
||||
$(JDK_OUTPUTDIR)/gensrc_jdwp/com/sun/tools/jdi/JDWP.java : $(JDK_TOPDIR)/makefiles/jpda/jdwp/jdwp.spec
|
||||
$(MKDIR) -p $(@D)
|
||||
$(MKDIR) -p $(JDK_OUTPUTDIR)/gensrc_jdwp_headers
|
||||
$(RM) $@ $(JDK_OUTPUTDIR)/gensrc_jdwp_headers/JDWPCommands.h
|
||||
$(ECHO) Creating JDWP.java and JDWPCommands.h from jdwp.spec
|
||||
$(TOOL_JDWPGEN) $< -jdi $@ -include $(JDK_OUTPUTDIR)/gensrc_jdwp_headers/JDWPCommands.h
|
||||
|
||||
$(JDK_OUTPUTDIR)/gensrc_jdwp_doc/jdwp-protocol.html : $(JDK_TOPDIR)/makefiles/jpda/jdwp/jdwp.spec
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) $@
|
||||
$(ECHO) Creating $(@F) from jdwp.spec
|
||||
$(TOOL_JDWPGEN) $< -doc $@
|
||||
|
||||
GENSRC_JDWP:= $(JDK_OUTPUTDIR)/gensrc_jdwp/com/sun/tools/jdi/JDWP.java \
|
||||
$(JDK_OUTPUTDIR)/gensrc_jdwp_headers/JDWPCommands.h
|
||||
$(JDK_OUTPUTDIR)/gensrc_jdwp_headers/JDWPCommands.h \
|
||||
$(JDK_OUTPUTDIR)/gensrc_jdwp_doc/jdwp-protocol.html
|
||||
|
||||
|
@ -38,43 +38,71 @@ JOBJC_DST := $(JDK_OUTPUTDIR)/gensrc_jobjc/src
|
||||
#
|
||||
$(eval $(call SetupJavaCompilation,BUILD_JOBJC_PRIMITIVE_CODER,\
|
||||
SETUP:=GENERATE_OLDBYTECODE,\
|
||||
DISABLE_SJAVAC:=true,\
|
||||
INCLUDES:=core/java \
|
||||
com/apple,\
|
||||
HEADERS :=$(JOBJC_DST)/jni_headers/core ,\
|
||||
HEADERS:=$(JOBJC_DST)/jni_headers/core ,\
|
||||
SRC:=$(JOBJC_SRC)/src \
|
||||
$(JOBJC_SRC)/src/generator/java, \
|
||||
BIN:=$(JOBJC_TMP)/bin))
|
||||
|
||||
GENSRC_JOBJC += $(JOBJC_TMP)/bin/_the.batch
|
||||
GENSRC_JOBJC += $(BUILD_JOBJC_PRIMITIVE_CODER)
|
||||
|
||||
#
|
||||
# Generate bridge support
|
||||
# Generate bridge support for select frameworks
|
||||
#
|
||||
BRIDGESUPPORT := $(addprefix $(JOBJC_TMP)/bridge/,$(addsuffix Full.bridgesupport,$(JOBJC_FRAMEWORKS)))
|
||||
|
||||
$(JOBJC_TMP)/bridge/%Full.bridgesupport : $(FRAMEWORKS_DIR)/%.framework/Headers/*.h
|
||||
$(MKDIR) -p $(@D)
|
||||
if [ -f $(FRAMEWORKS_DIR)/$*.framework/Resources/BridgeSupport/$(@F) ]; then \
|
||||
cp $(FRAMEWORKS_DIR)/$*.framework/Resources/BridgeSupport/$(@F) $@ ;\
|
||||
else \
|
||||
$(GBM) -F complete --framework $* -o $@ ; \
|
||||
fi
|
||||
#
|
||||
# Define macro for rules to create bridge support
|
||||
# Not sure why, but if the system has this framework bridge support,
|
||||
# we appear to copy that, otherwise we run GBM which can be very slow.
|
||||
#
|
||||
define CreateBridgeSupport # Framework
|
||||
$(RM) $@ $@.tmp
|
||||
$(MKDIR) -p $(@D)
|
||||
if [ -f $(FRAMEWORKS_DIR)/$1.framework/Resources/BridgeSupport/$(@F) ]; then \
|
||||
$(CP) $(FRAMEWORKS_DIR)/$1.framework/Resources/BridgeSupport/$(@F) $@.tmp ;\
|
||||
else \
|
||||
$(GBM) -F complete --framework $1 -o $@.tmp ; \
|
||||
fi
|
||||
$(MV) $@.tmp $@
|
||||
endef
|
||||
|
||||
#
|
||||
# Find Xbootclasspath
|
||||
# Currently 3 frameworks, avoid pattern rule due to the names being conflicting
|
||||
#
|
||||
$(JOBJC_TMP)/_the.generator_bootclasspath : $(JOBJC_TMP)/bin/_the.batch
|
||||
$(JOBJC_TMP)/bridge/FoundationFull.bridgesupport : \
|
||||
$(wildcard $(FRAMEWORKS_DIR)/Foundation.framework/Headers/*.h)
|
||||
$(call CreateBridgeSupport,Foundation)
|
||||
$(JOBJC_TMP)/bridge/CoreFoundationFull.bridgesupport : \
|
||||
$(wildcard $(FRAMEWORKS_DIR)/CoreFoundation.framework/Headers/*.h)
|
||||
$(call CreateBridgeSupport,CoreFoundation)
|
||||
$(JOBJC_TMP)/bridge/AppKitFull.bridgesupport : \
|
||||
$(wildcard $(FRAMEWORKS_DIR)/AppKit.framework/Headers/*.h)
|
||||
$(call CreateBridgeSupport,AppKit)
|
||||
|
||||
#
|
||||
# Find Xbootclasspath, for some reason, this involves firing up Java just
|
||||
# so we can get the boot classpath, so we can remove anything in that
|
||||
# classpath that ends with "JObjC.jar", and emit the new bootclasspath.
|
||||
#
|
||||
$(JOBJC_TMP)/_the.generator_bootclasspath : $(BUILD_JOBJC_PRIMITIVE_CODER)
|
||||
$(RM) $@
|
||||
$(JAVA) -cp $(JOBJC_TMP)/bin com.apple.internal.jobjc.generator.BootClassPathMinus JObjC.jar > $@.tmp
|
||||
$(MV) $@.tmp $@
|
||||
|
||||
|
||||
#
|
||||
# Run generator
|
||||
# Now we use bootclasspath to run java again, with the bridge support to
|
||||
# generate more source.
|
||||
# Note the use of the | (order-only) on the BRIDGESUPPORT, should serialize
|
||||
# them just in case GBM run in parallel has issues.
|
||||
#
|
||||
TOOL_JOBJC := $(JAVA) -cp $(JOBJC_TMP)/bin -ea com.apple.internal.jobjc.generator.Generator
|
||||
|
||||
$(JOBJC_TMP)/_the.generator : $(JOBJC_TMP)/bin/_the.batch $(JOBJC_TMP)/_the.generator_bootclasspath $(BRIDGESUPPORT)
|
||||
$(JOBJC_TMP)/_the.generator : $(JOBJC_TMP)/_the.generator_bootclasspath | $(BRIDGESUPPORT)
|
||||
$(RM) $@
|
||||
$(JAVA) -d64 -Xbootclasspath:`$(CAT) $(JOBJC_TMP)/_the.generator_bootclasspath` -cp $(JOBJC_TMP)/bin -ea com.apple.internal.jobjc.generator.Generator dst=$(JOBJC_DST) frameworks=$(JOBJC_TMP)/bridge
|
||||
$(TOUCH) $@
|
||||
|
||||
GENSRC_JOBJC += $(JOBJC_TMP)/_the.generator
|
||||
|
||||
|
@ -31,12 +31,14 @@
|
||||
$(JDK_OUTPUTDIR)/gensrc_misc/sun/misc/Version.java: \
|
||||
$(JDK_TOPDIR)/src/share/classes/sun/misc/Version.java.template
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) $@ $@.tmp
|
||||
$(ECHO) Generating sun/misc/Version.java
|
||||
$(SED) -e 's/@@launcher_name@@/$(LAUNCHER_NAME)/g' \
|
||||
-e 's/@@java_version@@/$(RELEASE)/g' \
|
||||
-e 's/@@java_runtime_version@@/$(FULL_VERSION)/g' \
|
||||
-e 's/@@java_runtime_name@@/$(RUNTIME_NAME)/g' \
|
||||
$< > $@
|
||||
$< > $@.tmp
|
||||
$(MV) $@.tmp $@
|
||||
|
||||
GENSRC_MISC += $(JDK_OUTPUTDIR)/gensrc_misc/sun/misc/Version.java
|
||||
|
||||
@ -46,8 +48,10 @@ GENSRC_MISC += $(JDK_OUTPUTDIR)/gensrc_misc/sun/misc/Version.java
|
||||
$(JDK_OUTPUTDIR)/gensrc_misc/sun/tools/jconsole/Version.java: \
|
||||
$(JDK_TOPDIR)/src/share/classes/sun/tools/jconsole/Version.java.template
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) $@ $@.tmp
|
||||
$(ECHO) Generating sun/tools/jconsole/Version.java
|
||||
$(SED) -e 's/@@jconsole_version@@/$(FULL_VERSION)/g' $< > $@
|
||||
$(SED) -e 's/@@jconsole_version@@/$(FULL_VERSION)/g' $< > $@.tmp
|
||||
$(MV) $@.tmp $@
|
||||
|
||||
GENSRC_MISC += $(JDK_OUTPUTDIR)/gensrc_misc/sun/tools/jconsole/Version.java
|
||||
|
||||
@ -80,12 +84,14 @@ ifneq ($(OPENJDK_TARGET_OS), macosx)
|
||||
|
||||
$(JDK_OUTPUTDIR)/gensrc_c/libjdbcodbc/dummyodbc1.c :
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) $@
|
||||
$(ECHO) Creating $@
|
||||
$(PRINTF) "void dummyOdbc(void){}\n" > $@
|
||||
$(ECHO) Created $@
|
||||
|
||||
$(JDK_OUTPUTDIR)/gensrc_c/libjdbcodbc/dummyodbc2.c :
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) $@
|
||||
$(ECHO) Creating $@
|
||||
$(PRINTF) "void dummyOdbc(void){}\n" > $@
|
||||
$(ECHO) Created $@
|
||||
@ -110,21 +116,27 @@ $(eval $(call SetupNativeCompilation,BUILD_GENSRC_SOR_EXE,\
|
||||
SRC:=$(GENSRC_SOR_SRC),\
|
||||
INCLUDE_FILES:=$(GENSRC_SOR_SRC_FILE),\
|
||||
LANG:=C,\
|
||||
CC:=$(HOST_CC),\
|
||||
LDEXE:=$(HOST_LD),\
|
||||
CC:=$(BUILD_CC),\
|
||||
LDEXE:=$(BUILD_LD),\
|
||||
OBJECT_DIR:=$(GENSRC_SOR_BIN),\
|
||||
OUTPUT_DIR:=$(GENSRC_SOR_BIN),\
|
||||
PROGRAM:=genSocketOptionRegistry))
|
||||
|
||||
ifneq ($(JAVASE_EMBEDDED), true)
|
||||
ifneq ($(wildcard $(JDK_TOPDIR)/src/closed/solaris/classes/sun/nio/ch/SocketOptionRegistry-$(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH).java),)
|
||||
HAS_SOCKET_OPTION_REGISTRY:=true
|
||||
endif
|
||||
|
||||
ifneq ($(HAS_SOCKET_OTION_REGISTRY),true)
|
||||
$(JDK_OUTPUTDIR)/gensrc_misc/sun/nio/ch/SocketOptionRegistry.java : $(BUILD_GENSRC_SOR_EXE)
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) $@ $@.tmp
|
||||
NAWK="$(NAWK)" SH="$(SH)" $(SH) -e $(JDK_TOPDIR)/makefiles/scripts/addNotices.sh "$(SOR_COPYRIGHT_YEARS)" > $@.tmp
|
||||
$(BUILD_GENSRC_SOR_EXE) >> $@.tmp
|
||||
$(MV) $@.tmp $@
|
||||
else
|
||||
$(JDK_OUTPUTDIR)/gensrc_misc/sun/nio/ch/SocketOptionRegistry.java : $(JDK_TOPDIR)/src/closed/solaris/classes/sun/nio/ch/SocketOptionRegistry-$(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH).java
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) $@
|
||||
$(CP) $< $@
|
||||
endif
|
||||
|
||||
@ -134,7 +146,7 @@ ifneq ($(OPENJDK_TARGET_OS),windows)
|
||||
|
||||
GENSRC_MISC += $(JDK_OUTPUTDIR)/gensrc_misc/sun/nio/fs/UnixConstants.java
|
||||
|
||||
GENSRC_UC_SRC := $(JDK_TOPDIR)/src/$(LEGACY_OPENJDK_TARGET_OS_API)/native/sun/nio/fs
|
||||
GENSRC_UC_SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/nio/fs
|
||||
GENSRC_UC_SRC_FILE := genUnixConstants.c
|
||||
GENSRC_UC_BIN := $(JDK_OUTPUTDIR)/gensrc_misc/genUnixConstants
|
||||
|
||||
@ -145,21 +157,27 @@ $(eval $(call SetupNativeCompilation,BUILD_GENSRC_UC_EXE,\
|
||||
SRC:=$(GENSRC_UC_SRC),\
|
||||
INCLUDE_FILES:=$(GENSRC_UC_SRC_FILE),\
|
||||
LANG:=C,\
|
||||
CC:=$(HOST_CC),\
|
||||
LDEXE:=$(HOST_CC),\
|
||||
CC:=$(BUILD_CC),\
|
||||
LDEXE:=$(BUILD_CC),\
|
||||
OBJECT_DIR:=$(GENSRC_UC_BIN),\
|
||||
OUTPUT_DIR:=$(GENSRC_UC_BIN),\
|
||||
PROGRAM:=genUnixConstants))
|
||||
|
||||
ifneq ($(JAVASE_EMBEDDED), true)
|
||||
ifneq ($(wildcard $(JDK_TOPDIR)/src/closed/solaris/classes/sun/nio/fs/UnixConstants-$(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH).java),)
|
||||
HAS_UNIX_CONSTANTS:=true
|
||||
endif
|
||||
|
||||
ifneq ($(HAS_UNIX_CONSTANTS),true)
|
||||
$(JDK_OUTPUTDIR)/gensrc_misc/sun/nio/fs/UnixConstants.java : $(BUILD_GENSRC_UC_EXE)
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) $@ $@.tmp
|
||||
NAWK="$(NAWK)" SH="$(SH)" $(SH) -e $(JDK_TOPDIR)/makefiles/scripts/addNotices.sh "$(UC_COPYRIGHT_YEARS)" > $@.tmp
|
||||
$(BUILD_GENSRC_UC_EXE) >> $@.tmp
|
||||
$(MV) $@.tmp $@
|
||||
else
|
||||
$(JDK_OUTPUTDIR)/gensrc_misc/sun/nio/fs/UnixConstants.java : $(JDK_TOPDIR)/src/closed/solaris/classes/sun/nio/fs/UnixConstants-$(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH).java
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) $@
|
||||
$(CP) $< $@
|
||||
endif
|
||||
|
||||
@ -171,7 +189,7 @@ ifeq ($(OPENJDK_TARGET_OS),solaris)
|
||||
|
||||
GENSRC_MISC += $(JDK_OUTPUTDIR)/gensrc_misc/sun/nio/fs/SolarisConstants.java
|
||||
|
||||
GENSRC_SOL_SRC := $(JDK_TOPDIR)/src/$(LEGACY_OPENJDK_TARGET_OS_API)/native/sun/nio/fs
|
||||
GENSRC_SOL_SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/nio/fs
|
||||
GENSRC_SOL_SRC_FILE := genSolarisConstants.c
|
||||
GENSRC_SOL_BIN := $(JDK_OUTPUTDIR)/gensrc_misc/genSolarisConstants
|
||||
|
||||
@ -182,14 +200,15 @@ $(eval $(call SetupNativeCompilation,BUILD_GENSRC_SOL_EXE,\
|
||||
SRC:=$(GENSRC_SOL_SRC),\
|
||||
INCLUDE_FILES:=$(GENSRC_SOL_SRC_FILE),\
|
||||
LANG:=C,\
|
||||
CC:=$(HOST_CC),\
|
||||
LDEXE:=$(HOST_CC),\
|
||||
CC:=$(BUILD_CC),\
|
||||
LDEXE:=$(BUILD_CC),\
|
||||
OBJECT_DIR:=$(GENSRC_SOL_BIN),\
|
||||
OUTPUT_DIR:=$(GENSRC_SOL_BIN),\
|
||||
PROGRAM:=genSolarisConstants))
|
||||
|
||||
$(JDK_OUTPUTDIR)/gensrc_misc/sun/nio/fs/SolarisConstants.java : $(BUILD_GENSRC_SOL_EXE)
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) $@ $@.tmp
|
||||
NAWK="$(NAWK)" SH="$(SH)" $(SH) -e $(JDK_TOPDIR)/makefiles/scripts/addNotices.sh "$(SOL_COPYRIGHT_YEARS)" > $@.tmp
|
||||
$(BUILD_GENSRC_SOL_EXE) >> $@.tmp
|
||||
$(MV) $@.tmp $@
|
||||
|
@ -46,8 +46,9 @@ define add_properties_to_compile
|
||||
|
||||
# Strip away prefix and suffix,
|
||||
# leaving for example: sun/util/resources/CurrencyNames_sv
|
||||
$1_PROPPATHS:=$$(patsubst $(JDK_TOPDIR)/src/$(LEGACY_OPENJDK_TARGET_OS_API)/classes/%.properties,%,\
|
||||
$$(patsubst $(JDK_TOPDIR)/src/share/classes/%.properties,%,$2))
|
||||
$1_PROPPATHS:=$$(patsubst $(JDK_TOPDIR)/src/windows/classes/%.properties,%,\
|
||||
$$(patsubst $(JDK_TOPDIR)/src/macosx/classes/%.properties,%,\
|
||||
$$(patsubst $(JDK_TOPDIR)/src/share/classes/%.properties,%,$2)))
|
||||
|
||||
# Apply optional name transformation, example: hz_TW -> hz_HK
|
||||
$(if $4,$1_PROPPATHS:=$$(patsubst $4,$5,$$($1_PROPPATHS)))
|
||||
@ -75,7 +76,7 @@ define add_properties_to_clean
|
||||
|
||||
# Strip away prefix and suffix,
|
||||
# leaving for example: sun/util/resources/CurrencyNames_sv
|
||||
$1_PROPPATHS:=$$(patsubst $(JDK_TOPDIR)/src/$(LEGACY_OPENJDK_TARGET_OS_API)/classes/%.properties,%,\
|
||||
$1_PROPPATHS:=$$(patsubst $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes/%.properties,%,\
|
||||
$$(patsubst $(JDK_TOPDIR)/src/share/classes/%.properties,%,$2))
|
||||
|
||||
# Apply optional name transformation, example: hz_TW -> hz_HK
|
||||
@ -113,6 +114,13 @@ endef
|
||||
|
||||
# Some packages have properties that need to be converted to java source files.
|
||||
|
||||
#com/apple/laf/resources
|
||||
ifeq ($(OPENJDK_TARGET_OS),macosx)
|
||||
$(eval $(call add_properties_to_compile,COM_APPLE_LAF,\
|
||||
$(shell find $(JDK_TOPDIR)/src/macosx/classes/com/apple/laf/resources -name "*.properties"),\
|
||||
ListResourceBundle))
|
||||
endif
|
||||
|
||||
#com/sun/accessibility/internal/resources
|
||||
$(eval $(call add_properties_to_compile,COM_SUN_ACCESSIBILITY,\
|
||||
$(shell find $(JDK_TOPDIR)/src/share/classes/com/sun/accessibility/internal/resources -name "*.properties"),\
|
||||
@ -210,6 +218,16 @@ $(eval $(call add_properties_to_compile,SUN_AWT,\
|
||||
$(eval $(call add_properties_to_compile,SUN_AWT_HK,\
|
||||
$(shell find $(JDK_TOPDIR)/src/share/classes/sun/awt/resources -name "*.properties"),\
|
||||
ListResourceBundle,%zh_TW,%zh_HK))
|
||||
#sun/awt/windows/
|
||||
ifeq ($(OPENJDK_TARGET_OS),windows)
|
||||
$(eval $(call add_properties_to_compile,SUN_AWT,\
|
||||
$(shell find $(JDK_TOPDIR)/src/windows/classes/sun/awt/windows -name "awtLocalization*.properties"),\
|
||||
ListResourceBundle))
|
||||
$(eval $(call add_properties_to_compile,SUN_AWT_HK,\
|
||||
$(shell find $(JDK_TOPDIR)/src/windows/classes/sun/awt/windows -name "awtLocalization*.properties"),\
|
||||
ListResourceBundle,%zh_TW,%zh_HK))
|
||||
endif
|
||||
|
||||
#sun/launcher/resources
|
||||
$(eval $(call add_properties_to_compile,SUN_LAUNCHER,\
|
||||
$(shell find $(JDK_TOPDIR)/src/share/classes/sun/launcher/resources -name "*.properties"),\
|
||||
@ -286,7 +304,7 @@ $(eval $(call add_properties_to_compile,SUN_UTIL,\
|
||||
|
||||
# Now setup the rule for the generation of the resource bundles.
|
||||
$(JDK_OUTPUTDIR)/gensrc_properties/_the.compiled_properties : $(ALL_COMPILED_PROPSOURCES) $(BUILD_TOOLS)
|
||||
$(RM) -rf $(JDK_OUTPUTDIR)/gensrc_properties/*
|
||||
$(RM) -r $(JDK_OUTPUTDIR)/gensrc_properties/*
|
||||
# Generate all output directories in advance since the build tool does not do that...
|
||||
$(MKDIR) -p $(sort $(dir $(ALL_COMPILED_PROPJAVAS)))
|
||||
$(ECHO) Compiling $(words $(ALL_COMPILED_PROPSOURCES)) properties into resource bundles
|
||||
@ -297,7 +315,7 @@ $(JDK_OUTPUTDIR)/gensrc_properties/_the.compiled_properties : $(ALL_COMPILED_PRO
|
||||
# Now setup the rule for the generation of the cleaned properties.
|
||||
# FIXME: We currently don't handle removed properties incrementally.
|
||||
$(JDK_OUTPUTDIR)/classes/_the.cleaned_properties : $(ALL_CLEANED_PROPSOURCES) $(BUILD_TOOLS)
|
||||
$(RM) -f $(JDK_OUTPUTDIR)/classes/_the.cleaned_properties.cmdline
|
||||
$(RM) $(JDK_OUTPUTDIR)/classes/_the.cleaned_properties.cmdline
|
||||
# Generate all output directories in advance since the build tool does not do that...
|
||||
$(MKDIR) -p $(sort $(dir $(ALL_CLEANED_PROPOUTPUT)))
|
||||
$(ECHO) Copying and cleaning $(words $(ALL_CLEANED_PROPSOURCES)) properties
|
||||
|
@ -23,36 +23,33 @@
|
||||
# questions.
|
||||
#
|
||||
|
||||
|
||||
# This file is responsible for extracting the x11 native struct offsets to
|
||||
# the xawt Java library. This is done by compiling and running a native
|
||||
# binary, which dumps output to a text file. The offsets differ on 32 and 64
|
||||
# bit systems, so care must be taken here.
|
||||
|
||||
# Note: Some of the more complex logic here is most likely not needed anymore.
|
||||
|
||||
GENSRC_X11WRAPPERS :=
|
||||
GENSRC_X11WRAPPERS_TMP := $(JDK_OUTPUTDIR)/gensrc_x11wrappers
|
||||
|
||||
GENSRC_SIZER_SRC := $(JDK_TOPDIR)/src/solaris/classes/sun/awt/X11/generator
|
||||
|
||||
GENSRC_SIZES :=
|
||||
# Normal case is to generate version according to target bits
|
||||
GENSRC_SIZES := sizes.$(OPENJDK_TARGET_CPU_BITS)
|
||||
|
||||
ifeq ($(OPENJDK_TARGET_OS)-$(LIBARCH), solaris-i386)
|
||||
GENSRC_SIZES := sizes.32 sizes.64
|
||||
else ifeq ($(OPENJDK_TARGET_OS), solaris)
|
||||
isalist:=$(shell isainfo)
|
||||
ifneq (,$(findstring sparcv9, $(isalist)))
|
||||
# On sparcv9 we generate both 32 and 64-bit sizers in spite of ARCH_DATA_MODEL.
|
||||
ifeq ($(OPENJDK_TARGET_CPU_BITS), 64)
|
||||
ifneq ($(OPENJDK_TARGET_OS), linux)
|
||||
# On all 64-bit systems except Linux, generate both 32 and 64 bit versions
|
||||
GENSRC_SIZES := sizes.32 sizes.64
|
||||
endif
|
||||
else
|
||||
ifneq (,$(findstring amd64, $(isalist)))
|
||||
# On amd64 we generate both 32 and 64-bit sizers in spite of ARCH_DATA_MODEL.
|
||||
ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU), solaris-x86)
|
||||
# As a special case, solaris on x86 (32-bit) also generates the 64-bit version
|
||||
GENSRC_SIZES := sizes.32 sizes.64
|
||||
else # !sparcv9 : includes (32-bit) sparc, i586
|
||||
GENSRC_SIZES := sizes.32
|
||||
endif # amd64
|
||||
endif # sparcv9
|
||||
else # !solaris
|
||||
ifeq ($(OPENJDK_TARGET_OS), macosx)
|
||||
GENSRC_SIZES := sizes.32 sizes.64
|
||||
else # !macosx
|
||||
GENSRC_SIZES := sizes.$(ARCH_DATA_MODEL)
|
||||
endif # !macosx
|
||||
endif # solaris
|
||||
|
||||
endif
|
||||
endif
|
||||
|
||||
##########################################################################################
|
||||
|
||||
@ -62,40 +59,44 @@ $(GENSRC_X11WRAPPERS_TMP)/sizer/sizer.%.c : $(GENSRC_SIZER_SRC)/xlibtypes.txt
|
||||
$(TOOL_WRAPPERGENERATOR) $(@D) $< "sizer" $*
|
||||
|
||||
$(GENSRC_X11WRAPPERS_TMP)/sizer/sizer.%.exe : $(GENSRC_X11WRAPPERS_TMP)/sizer/sizer.%.c
|
||||
(cd $(@D) && $(HOST_CC) -m$* -o $@ $< \
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) $@ $@.tmp
|
||||
(cd $(@D) && $(BUILD_CC) -m$* -o $@.tmp $< \
|
||||
-I$(JDK_OUTPUTDIR)/include \
|
||||
-I$(JDK_TOPDIR)/src/share/javavm/export \
|
||||
-I$(JDK_TOPDIR)/src/$(LEGACY_OPENJDK_TARGET_OS_API)/javavm/export \
|
||||
-I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/javavm/export \
|
||||
-I$(JDK_TOPDIR)//src/share/native/common \
|
||||
-I$(JDK_TOPDIR)/src/$(LEGACY_OPENJDK_TARGET_OS_API)/native/common \
|
||||
-I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/common \
|
||||
-I$(JDK_TOPDIR)/src/solaris/native/sun/awt \
|
||||
-I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \
|
||||
-I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils -lc)
|
||||
|
||||
ifeq ($(OPENJDK_TARGET_OS)-$(LIBARCH), solaris-i386)
|
||||
|
||||
$(GENSRC_X11WRAPPERS_TMP)/sizer/sizes.32 : $(GENSRC_X11WRAPPERS_TMP)/sizer/sizer.32.exe
|
||||
$< > $@.tmp
|
||||
$(MV) $@.tmp $@
|
||||
|
||||
$(GENSRC_X11WRAPPERS_TMP)/sizer/sizes.64 : $(JDK_TOPDIR)/src/$(LEGACY_OPENJDK_TARGET_OS_API)/classes/sun/awt/X11/generator/sizes.64-$(OPENJDK_TARGET_OS)-$(LIBARCH)
|
||||
$(MKDIR) -p $(@D)
|
||||
$(CP) $< $@
|
||||
else
|
||||
|
||||
# Run the generated sizer binary to create the sizes text file
|
||||
$(GENSRC_X11WRAPPERS_TMP)/sizer/sizes.% : $(GENSRC_X11WRAPPERS_TMP)/sizer/sizer.%.exe
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) $@ $@.tmp
|
||||
$< > $@.tmp
|
||||
$(MV) $@.tmp $@
|
||||
|
||||
ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU), solaris-x86)
|
||||
# On solaris-x86 we also need to create the 64-bit version, but we can't run a 64-bit binary
|
||||
# As a workaround, copy this from a pre-generated file.
|
||||
$(GENSRC_X11WRAPPERS_TMP)/sizer/sizes.64 : $(JDK_TOPDIR)/src/solaris/classes/sun/awt/X11/generator/sizes.64-solaris-i386
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) $@
|
||||
$(CP) $< $@
|
||||
endif
|
||||
|
||||
$(GENSRC_X11WRAPPERS_TMP)/classes/_the.classes : $(foreach S,$(GENSRC_SIZES),$(GENSRC_X11WRAPPERS_TMP)/sizer/$(S))
|
||||
$(RM) $@
|
||||
$(MKDIR) -p $(@D)/sun/awt/X11
|
||||
$(RM) $(@D)/sun/awt/X11/*
|
||||
$(TOOL_WRAPPERGENERATOR) $(@D)/sun/awt/X11 $(GENSRC_SIZER_SRC)/xlibtypes.txt "gen" $(GENSRC_X11WRAPPERS_TMP)/sizer/sizes
|
||||
ifeq ($(OPENJDK_TARGET_OS)-$(LIBARCH), solaris-amd64)
|
||||
$(ECHO) COMPARING $(GENSRC_X11WRAPPERS_TMP)/sizer/sizes.64 and $(GENSRC_SIZER_SRC)/sizes.64-$(OPENJDK_TARGET_OS)-i386
|
||||
$(DIFF) $(GENSRC_X11WRAPPERS_TMP)/sizer/sizes.64 $(GENSRC_SIZER_SRC)/sizes.64-$(OPENJDK_TARGET_OS)-i386
|
||||
ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU), solaris-x86_64)
|
||||
# On solaris-x86_64, as a safety measure, compare the generated file with the checked-in version
|
||||
$(ECHO) COMPARING $(GENSRC_X11WRAPPERS_TMP)/sizer/sizes.64 and $(GENSRC_SIZER_SRC)/sizes.64-solaris-i386
|
||||
$(DIFF) $(GENSRC_X11WRAPPERS_TMP)/sizer/sizes.64 $(GENSRC_SIZER_SRC)/sizes.64-solaris-i386
|
||||
endif
|
||||
$(TOUCH) $@
|
||||
|
||||
|
@ -32,11 +32,21 @@ default: images
|
||||
|
||||
include Tools.gmk
|
||||
|
||||
images: jre-image jdk-image
|
||||
# Note: This double-colon rule is intentional, to support
|
||||
# custom make file integration.
|
||||
images:: jre-image jdk-image
|
||||
|
||||
overlay-images: jre-overlay-image jdk-overlay-image
|
||||
|
||||
|
||||
-include $(CUSTOM_MAKE_DIR)/Images.gmk
|
||||
|
||||
|
||||
ifeq ($(OPENJDK_TARGET_OS),solaris)
|
||||
# On Solaris, if the target is a symlink and exists, cp won't overwrite.
|
||||
define install-file
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) '$@'
|
||||
$(CP) -f -r -P '$<' '$(@D)'
|
||||
endef
|
||||
else ifeq ($(OPENJDK_TARGET_OS),macosx)
|
||||
@ -51,11 +61,34 @@ define install-file
|
||||
endef
|
||||
endif
|
||||
|
||||
# Processing license files from source area to image area
|
||||
# These will be modified to have the platform specific EOL chars.
|
||||
define process-doc-file
|
||||
$(ECHO) Processing $(patsubst $(OUTPUT_ROOT)/%,%,$@)
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) $@
|
||||
$(SED) 's/$$//g' $< > $@
|
||||
$(CHMOD) 444 $@
|
||||
endef
|
||||
|
||||
|
||||
JDK_IMAGE_DIR:=$(IMAGES_OUTPUTDIR)/j2sdk-image
|
||||
JRE_IMAGE_DIR:=$(IMAGES_OUTPUTDIR)/j2re-image
|
||||
|
||||
JDK_OVERLAY_IMAGE_DIR:=$(IMAGES_OUTPUTDIR)/j2sdk-overlay-image
|
||||
JRE_OVERLAY_IMAGE_DIR:=$(IMAGES_OUTPUTDIR)/j2re-overlay-image
|
||||
|
||||
################################################################################
|
||||
#
|
||||
# JRE and JDK build rules
|
||||
#
|
||||
################################################################################
|
||||
#
|
||||
# Variable prefixes explained:
|
||||
# JRE_ refers to files in the j2re-image.
|
||||
# JDK_ refers to files in the j2sdk-image outside of the jre subdir.
|
||||
# JDKJRE_ refers to files in the j2sdk-image inside the jre subdir.
|
||||
#
|
||||
|
||||
################################################################################
|
||||
# /bin dir
|
||||
@ -72,6 +105,19 @@ $(JDK_IMAGE_DIR)/jre/bin/%: $(JDK_OUTPUTDIR)/bin/%
|
||||
$(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
|
||||
$(install-file)
|
||||
|
||||
# Overaly image targets
|
||||
$(JRE_OVERLAY_IMAGE_DIR)/bin/%: $(JDK_OUTPUTDIR)/bin/%
|
||||
$(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
|
||||
$(install-file)
|
||||
|
||||
$(JDK_OVERLAY_IMAGE_DIR)/bin/%: $(JDK_OUTPUTDIR)/bin/%
|
||||
$(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
|
||||
$(install-file)
|
||||
|
||||
$(JDK_OVERLAY_IMAGE_DIR)/jre/bin/%: $(JDK_OUTPUTDIR)/bin/%
|
||||
$(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
|
||||
$(install-file)
|
||||
|
||||
NOT_JRE_BIN_FILES := \
|
||||
appletviewer$(EXE_SUFFIX) \
|
||||
extcheck$(EXE_SUFFIX) \
|
||||
@ -107,26 +153,54 @@ NOT_JRE_BIN_FILES := \
|
||||
|
||||
WINDOWS_JDK_BIN_FILES = \
|
||||
$(EXE_SUFFIX) \
|
||||
$(LIB_PREFIX)jli$(SHARED_LIBRARY_SUFFIX) \
|
||||
$(MSVCRNN_DLL)
|
||||
$(LIBRARY_PREFIX)jli$(SHARED_LIBRARY_SUFFIX) \
|
||||
$(notdir $(MSVCRNN_DLL))
|
||||
|
||||
WINDOWS_JDKJRE_BIN_FILES := \
|
||||
$(LIBRARY_PREFIX)attach$(SHARED_LIBRARY_SUFFIX) \
|
||||
$(SALIB_NAME)
|
||||
|
||||
# Find all files in bin dir
|
||||
ALL_BIN_LIST := $(shell $(FIND) $(JDK_OUTPUTDIR)/bin -type f)
|
||||
|
||||
# For unknown reason the debuginfo files for binaries are not put into images
|
||||
# For unknown reason the debuginfo files for executables are not put into images
|
||||
# e.g filter them out
|
||||
ALL_BIN_LIST := $(filter-out %.debuginfo %.diz, $(ALL_BIN_LIST))
|
||||
ifneq ($(OPENJDK_TARGET_OS),windows)
|
||||
ALL_BIN_LIST := $(filter-out %.debuginfo %.diz, $(ALL_BIN_LIST))
|
||||
else
|
||||
# On windows, the libraries are in the bin dir, only filter out debuginfo files
|
||||
# for executables. "java" is both a library and executable.
|
||||
ALL_BIN_EXEC_FILES := $(filter-out java.exe,$(notdir $(shell $(FIND) $(JDK_OUTPUTDIR)/bin -type f -name "*.exe")))
|
||||
ALL_BIN_DEBUG_FILTER := $(addprefix %,$(patsubst %.exe,%.debuginfo,$(ALL_BIN_EXEC_FILES)) \
|
||||
$(patsubst %.exe,%.diz,$(ALL_BIN_EXEC_FILES))) %.pdb
|
||||
ALL_BIN_LIST := $(filter-out $(ALL_BIN_DEBUG_FILTER),$(ALL_BIN_LIST))
|
||||
endif
|
||||
|
||||
ifeq ($(OPENJDK_TARGET_OS),windows)
|
||||
JDK_BIN_LIST := $(filter $(addprefix %,$(WINDOWS_JDK_BIN_FILES)), $(ALL_BIN_LIST))
|
||||
else
|
||||
JDK_BIN_LIST := $(ALL_BIN_LIST)
|
||||
endif
|
||||
JRE_BIN_LIST := $(filter-out $(addprefix %,$(NOT_JRE_BIN_FILES)), $(ALL_BIN_LIST))
|
||||
JDKJRE_BIN_LIST := $(filter-out $(addprefix %,$(NOT_JRE_BIN_FILES)), $(ALL_BIN_LIST))
|
||||
JRE_BIN_LIST := $(filter-out $(addprefix %,$(WINDOWS_JDKJRE_BIN_FILES)), $(JDKJRE_BIN_LIST))
|
||||
|
||||
JRE_BIN_TARGETS := $(patsubst $(JDK_OUTPUTDIR)/%,$(JRE_IMAGE_DIR)/%, $(JRE_BIN_LIST))
|
||||
JDK_BIN_TARGETS := $(patsubst $(JDK_OUTPUTDIR)/%,$(JDK_IMAGE_DIR)/%, $(JDK_BIN_LIST))
|
||||
JDKJRE_BIN_TARGETS := $(patsubst $(JDK_OUTPUTDIR)/%,$(JDK_IMAGE_DIR)/jre/%, $(JRE_BIN_LIST))
|
||||
ifneq ($(OPENJDK_TARGET_CPU_ISADIR),)
|
||||
OVERLAY_FILTER := $(JDK_OUTPUTDIR)/bin$(OPENJDK_TARGET_CPU_ISADIR)%
|
||||
endif
|
||||
|
||||
JRE_BIN_TARGETS := $(patsubst $(JDK_OUTPUTDIR)/%,$(JRE_IMAGE_DIR)/%, \
|
||||
$(filter-out $(OVERLAY_FILTER),$(JRE_BIN_LIST)))
|
||||
JDK_BIN_TARGETS := $(patsubst $(JDK_OUTPUTDIR)/%,$(JDK_IMAGE_DIR)/%, \
|
||||
$(filter-out $(OVERLAY_FILTER),$(JDK_BIN_LIST)))
|
||||
JDKJRE_BIN_TARGETS := $(patsubst $(JDK_OUTPUTDIR)/%,$(JDK_IMAGE_DIR)/jre/%, \
|
||||
$(filter-out $(OVERLAY_FILTER),$(JDKJRE_BIN_LIST)))
|
||||
|
||||
JRE_OVERLAY_BIN_TARGETS := $(patsubst $(JDK_OUTPUTDIR)/%,$(JRE_OVERLAY_IMAGE_DIR)/%, \
|
||||
$(filter $(OVERLAY_FILTER),$(JRE_BIN_LIST)))
|
||||
JDK_OVERLAY_BIN_TARGETS := $(patsubst $(JDK_OUTPUTDIR)/%,$(JDK_OVERLAY_IMAGE_DIR)/%, \
|
||||
$(filter $(OVERLAY_FILTER),$(JDK_BIN_LIST)))
|
||||
JDKJRE_OVERLAY_BIN_TARGETS := $(patsubst $(JDK_OUTPUTDIR)/%,$(JDK_OVERLAY_IMAGE_DIR)/jre/%, \
|
||||
$(filter $(OVERLAY_FILTER),$(JDKJRE_BIN_LIST)))
|
||||
|
||||
################################################################################
|
||||
# /lib dir
|
||||
@ -143,9 +217,24 @@ $(JDK_IMAGE_DIR)/jre/lib/%: $(JDK_OUTPUTDIR)/lib/%
|
||||
$(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
|
||||
$(install-file)
|
||||
|
||||
JDKJRE_LIB_FILES := \
|
||||
$(LIB_PREFIX)attach$(SHARED_LIBRARY_SUFFIX) \
|
||||
# Overlay image targets
|
||||
$(JRE_OVERLAY_IMAGE_DIR)/lib/%: $(JDK_OUTPUTDIR)/lib/%
|
||||
$(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
|
||||
$(install-file)
|
||||
|
||||
$(JDK_OVERLAY_IMAGE_DIR)/lib/%: $(JDK_OUTPUTDIR)/lib/%
|
||||
$(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
|
||||
$(install-file)
|
||||
|
||||
$(JDK_OVERLAY_IMAGE_DIR)/jre/lib/%: $(JDK_OUTPUTDIR)/lib/%
|
||||
$(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
|
||||
$(install-file)
|
||||
|
||||
ifneq ($(OPENJDK_TARGET_OS), macosx)
|
||||
JDKJRE_LIB_FILES := \
|
||||
$(LIBRARY_PREFIX)attach$(SHARED_LIBRARY_SUFFIX) \
|
||||
$(SALIB_NAME)
|
||||
endif
|
||||
|
||||
NOT_JRE_LIB_FILES := \
|
||||
tools.jar \
|
||||
@ -156,12 +245,16 @@ NOT_JRE_LIB_FILES := \
|
||||
ir.idl \
|
||||
ct.sym
|
||||
|
||||
ifeq ($(OPENJDK_TARGET_OS), windows)
|
||||
NOT_JRE_LIB_FILES += jawt.lib jvm.lib
|
||||
endif
|
||||
|
||||
JDK_LIB_FILES := $(NOT_JRE_LIB_FILES)
|
||||
ifeq ($(OPENJDK_TARGET_OS), linux)
|
||||
JDK_LIB_FILES += jexec
|
||||
endif
|
||||
|
||||
ALL_LIB_LIST := $(shell $(FIND) $(JDK_OUTPUTDIR)/lib \( -type f -o -type l \) ! -name "_the*")
|
||||
ALL_LIB_LIST := $(shell $(FIND) $(JDK_OUTPUTDIR)/lib \( -type f -o -type l \) -a ! \( -name "_the*" -o -name "javac_state " \) )
|
||||
JRE_LIB_LIST := $(filter-out $(addprefix %,$(NOT_JRE_LIB_FILES) $(JDKJRE_LIB_FILES)),$(ALL_LIB_LIST))
|
||||
JDKJRE_LIB_LIST := $(filter-out $(addprefix %,$(NOT_JRE_LIB_FILES)),$(ALL_LIB_LIST))
|
||||
JDK_LIB_LIST := $(filter $(addprefix %,$(JDK_LIB_FILES)),$(ALL_LIB_LIST))
|
||||
@ -170,6 +263,13 @@ JRE_LIB_TARGETS := $(patsubst $(JDK_OUTPUTDIR)/%,$(JRE_IMAGE_DIR)/%,$(JRE_LIB_LI
|
||||
JDK_LIB_TARGETS := $(patsubst $(JDK_OUTPUTDIR)/%,$(JDK_IMAGE_DIR)/%,$(JDK_LIB_LIST))
|
||||
JDKJRE_LIB_TARGETS := $(patsubst $(JDK_OUTPUTDIR)/%,$(JDK_IMAGE_DIR)/jre/%,$(JDKJRE_LIB_LIST))
|
||||
|
||||
JRE_OVERLAY_LIB_TARGETS := $(subst $(JRE_IMAGE_DIR),$(JRE_OVERLAY_IMAGE_DIR),\
|
||||
$(filter $(JRE_IMAGE_DIR)/lib$(OPENJDK_TARGET_CPU_ISADIR)/%,$(JRE_LIB_TARGETS)))
|
||||
JDK_OVERLAY_LIB_TARGETS := $(subst $(JDK_IMAGE_DIR),$(JDK_OVERLAY_IMAGE_DIR),\
|
||||
$(filter $(JDK_IMAGE_DIR)/lib$(OPENJDK_TARGET_CPU_ISADIR)/%,$(JDK_LIB_TARGETS)))
|
||||
JDKJRE_OVERLAY_LIB_TARGETS := $(subst $(JDK_IMAGE_DIR),$(JDK_OVERLAY_IMAGE_DIR),\
|
||||
$(filter $(JDK_IMAGE_DIR)/jre/lib$(OPENJDK_TARGET_CPU_ISADIR)/%,$(JDKJRE_LIB_TARGETS)))
|
||||
|
||||
# CTE plugin security change require new empty directory lib/applet
|
||||
$(JRE_IMAGE_DIR)/lib/applet:
|
||||
$(ECHO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
|
||||
@ -179,19 +279,20 @@ $(JDK_IMAGE_DIR)/jre/lib/applet:
|
||||
$(ECHO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
|
||||
$(MKDIR) -p $@
|
||||
|
||||
# In the old build, JObjC.jar is not part of the meta-index
|
||||
$(JRE_IMAGE_DIR)/lib/meta-index: $(JRE_LIB_TARGETS)
|
||||
$(ECHO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
|
||||
$(CD) $(@D) && $(TOOL_BUILDMETAINDEX) -o meta-index *.jar
|
||||
$(CD) $(@D) && $(TOOL_BUILDMETAINDEX) -o meta-index `$(LS) *.jar | $(SED) 's/JObjC\.jar//g'`
|
||||
|
||||
$(JDK_IMAGE_DIR)/jre/lib/meta-index: $(JDKJRE_LIB_TARGETS)
|
||||
$(ECHO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
|
||||
$(CD) $(@D) && $(TOOL_BUILDMETAINDEX) -o meta-index *.jar
|
||||
$(CD) $(@D) && $(TOOL_BUILDMETAINDEX) -o meta-index `$(LS) *.jar | $(SED) 's/JObjC\.jar//g'`
|
||||
|
||||
$(JRE_IMAGE_DIR)/lib/ext/meta-index: $(JRE_LIB_TARGETS)
|
||||
$(ECHO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
|
||||
$(CD) $(@D) && $(TOOL_BUILDMETAINDEX) -o meta-index *.jar
|
||||
|
||||
$(JDK_IMAGE_DIR)/jre/lib/ext/meta-index: $(JRE_LIB_TARGETS)
|
||||
$(JDK_IMAGE_DIR)/jre/lib/ext/meta-index: $(JDKJRE_LIB_TARGETS)
|
||||
$(ECHO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
|
||||
$(CD) $(@D) && $(TOOL_BUILDMETAINDEX) -o meta-index *.jar
|
||||
|
||||
@ -378,12 +479,12 @@ endif
|
||||
# /demo dir
|
||||
|
||||
ifndef NO_DEMOS
|
||||
# FIXME: newdemo/applets/GraphLayout/GraphPanel$2.class is sometimes not copied.
|
||||
# FIXME: demo/applets/GraphLayout/GraphPanel$2.class is sometimes not copied.
|
||||
|
||||
# The db demo contains an empty dir that needs to be copied. The other
|
||||
# directories will always trigger the rule for recompile since
|
||||
# _the.list_of_packages files are touched.
|
||||
$(JDK_IMAGE_DIR)/demo/%: $(JDK_OUTPUTDIR)/newdemo/%
|
||||
$(JDK_IMAGE_DIR)/demo/%: $(JDK_OUTPUTDIR)/demo/%
|
||||
if [ ! -d "$@" ]; then \
|
||||
$(ECHO) Copying '$(patsubst $(OUTPUT_ROOT)/%,%,$@)'; \
|
||||
$(MKDIR) -p $(@D); \
|
||||
@ -391,8 +492,25 @@ ifndef NO_DEMOS
|
||||
fi
|
||||
|
||||
# Find all files including directories
|
||||
JDK_DEMO_TARGETS := $(patsubst $(JDK_OUTPUTDIR)/newdemo/%,$(JDK_IMAGE_DIR)/demo/%,\
|
||||
$(shell $(FIND) $(JDK_OUTPUTDIR)/newdemo ! -name "_the.*"))
|
||||
JDK_DEMO_TARGETS := $(patsubst $(JDK_OUTPUTDIR)/demo/%,$(JDK_IMAGE_DIR)/demo/%,\
|
||||
$(shell $(FIND) $(JDK_OUTPUTDIR)/demo ! \( -name "_the*" -o -name "javac_state" \) ))
|
||||
|
||||
|
||||
|
||||
# Param 1 is source file
|
||||
define CreateOverlayDemoRule
|
||||
$1_TARGET:=$$(subst $(JDK_OUTPUTDIR),$(JDK_OVERLAY_IMAGE_DIR),\
|
||||
$$(dir $1)$(OPENJDK_TARGET_CPU_ISADIR)/$$(notdir $1))
|
||||
$$($1_TARGET): $1
|
||||
$(ECHO) Copying '$$(patsubst $(OUTPUT_ROOT)/%,%,$$@)'
|
||||
$(MKDIR) -p $$(@D)
|
||||
$(RM) $$@
|
||||
$(CP) -f '$$<' '$$@'
|
||||
|
||||
JDK_OVERLAY_DEMO_TARGETS += $$($1_TARGET)
|
||||
endef
|
||||
JDK_OVERLAY_DEMO_SOURCES := $(shell $(FIND) $(JDK_OUTPUTDIR)/demo -name "*$(SHARED_LIBRARY_SUFFIX)")
|
||||
$(foreach lib,$(JDK_OVERLAY_DEMO_SOURCES),$(eval $(call CreateOverlayDemoRule,$(lib))))
|
||||
|
||||
endif
|
||||
|
||||
@ -471,50 +589,47 @@ JDKJRE_DOC_TARGETS := $(addprefix $(JDK_IMAGE_DIR)/jre/,$(JRE_DOC_FILES))
|
||||
JDK_DOC_TARGETS := $(addprefix $(JDK_IMAGE_DIR)/,$(JDK_DOC_FILES))
|
||||
|
||||
$(JRE_IMAGE_DIR)/%: $(JRE_DOC_LOCATION)/%
|
||||
$(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
|
||||
$(install-file)
|
||||
$(CHMOD) 444 $(@)
|
||||
$(process-doc-file)
|
||||
|
||||
$(JDK_IMAGE_DIR)/jre/%: $(JRE_DOC_LOCATION)/%
|
||||
$(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
|
||||
$(install-file)
|
||||
$(CHMOD) 444 $(@)
|
||||
$(process-doc-file)
|
||||
|
||||
$(JRE_IMAGE_DIR)/README.txt: $(JRE_DOC_LOCATION)/README
|
||||
$(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
|
||||
$(MKDIR) -p $(@D)
|
||||
$(CP) $< $@
|
||||
$(CHMOD) 444 $(@)
|
||||
$(process-doc-file)
|
||||
|
||||
$(JDK_IMAGE_DIR)/jre/README.txt: $(JRE_DOC_LOCATION)/README
|
||||
$(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
|
||||
$(MKDIR) -p $(@D)
|
||||
$(CP) $< $@
|
||||
$(CHMOD) 444 $(@)
|
||||
$(process-doc-file)
|
||||
|
||||
$(JDK_IMAGE_DIR)/%: $(JDK_DOC_LOCATION)/%
|
||||
$(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
|
||||
$(install-file)
|
||||
$(CHMOD) 444 $(@)
|
||||
$(process-doc-file)
|
||||
|
||||
$(JDK_IMAGE_DIR)/demo/%: $(JDK_DOC_LOCATION)/%
|
||||
$(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
|
||||
$(install-file)
|
||||
$(CHMOD) 444 $(@)
|
||||
$(process-doc-file)
|
||||
|
||||
$(JDK_IMAGE_DIR)/sample/%: $(JDK_DOC_LOCATION)/%
|
||||
$(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
|
||||
$(install-file)
|
||||
$(CHMOD) 444 $(@)
|
||||
$(process-doc-file)
|
||||
|
||||
JRE_INFO_FILE := $(JRE_IMAGE_DIR)/release
|
||||
JDK_INFO_FILE := $(JDK_IMAGE_DIR)/release
|
||||
|
||||
JRE_OVERLAY_INFO_FILE := $(JRE_OVERLAY_IMAGE_DIR)/release
|
||||
JDK_OVERLAY_INFO_FILE := $(JDK_OVERLAY_IMAGE_DIR)/release
|
||||
|
||||
# Common way to emit a line into the release or info file
|
||||
define info-file-item # name value
|
||||
$(PRINTF) '%s="%s"\n' $1 $2 >> $@
|
||||
endef
|
||||
|
||||
define create-info-file
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) $@
|
||||
$(call info-file-item, "JAVA_VERSION", "$(JDK_VERSION)")
|
||||
$(call info-file-item, "OS_NAME", "$(REQUIRED_OS_NAME)")
|
||||
$(call info-file-item, "OS_VERSION", "$(REQUIRED_OS_VERSION)")
|
||||
$(call info-file-item, "OS_ARCH", "$(OPENJDK_TARGET_CPU_LEGACY)")
|
||||
$(call info-file-item, "SOURCE", "$(ALL_SOURCE_TIPS)")
|
||||
endef
|
||||
|
||||
ALL_SOURCE_TIPS = $(shell \
|
||||
if [ -f $(OUTPUT_ROOT)/source_tips ] ; then \
|
||||
$(CAT) $(OUTPUT_ROOT)/source_tips ; \
|
||||
@ -522,23 +637,19 @@ ALL_SOURCE_TIPS = $(shell \
|
||||
|
||||
$(JRE_INFO_FILE): $(OUTPUT_ROOT)/spec.gmk $(OUTPUT_ROOT)/source_tips
|
||||
$(ECHO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) $@
|
||||
$(call info-file-item, "JAVA_VERSION", "$(JDK_VERSION)")
|
||||
$(call info-file-item, "OS_NAME", "$(REQUIRED_OS_NAME)")
|
||||
$(call info-file-item, "OS_VERSION", "$(REQUIRED_OS_VERSION)")
|
||||
$(call info-file-item, "OS_ARCH", "$(ARCH)")
|
||||
$(call info-file-item, "SOURCE", "$(ALL_SOURCE_TIPS)")
|
||||
$(call create-info-file)
|
||||
|
||||
$(JDK_INFO_FILE): $(OUTPUT_ROOT)/spec.gmk $(OUTPUT_ROOT)/source_tips
|
||||
$(ECHO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) $@
|
||||
$(call info-file-item, "JAVA_VERSION", "$(JDK_VERSION)")
|
||||
$(call info-file-item, "OS_NAME", "$(REQUIRED_OS_NAME)")
|
||||
$(call info-file-item, "OS_VERSION", "$(REQUIRED_OS_VERSION)")
|
||||
$(call info-file-item, "OS_ARCH", "$(ARCH)")
|
||||
$(call info-file-item, "SOURCE", "$(ALL_SOURCE_TIPS)")
|
||||
$(call create-info-file)
|
||||
|
||||
$(JRE_OVERLAY_INFO_FILE): $(OUTPUT_ROOT)/spec.gmk $(OUTPUT_ROOT)/source_tips
|
||||
$(ECHO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
|
||||
$(call create-info-file)
|
||||
|
||||
$(JDK_OVERLAY_INFO_FILE): $(OUTPUT_ROOT)/spec.gmk $(OUTPUT_ROOT)/source_tips
|
||||
$(ECHO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
|
||||
$(call create-info-file)
|
||||
|
||||
$(JDK_IMAGE_DIR)/src.zip: $(IMAGES_OUTPUTDIR)/src.zip
|
||||
$(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
|
||||
@ -549,51 +660,75 @@ $(JDK_IMAGE_DIR)/src.zip: $(IMAGES_OUTPUTDIR)/src.zip
|
||||
|
||||
ifneq ($(POST_STRIP_CMD),)
|
||||
ifeq ($(OPENJDK_TARGET_OS), windows)
|
||||
EXEC_LIST:=$(shell $(FIND) $(JDK_OUTPUTDIR)/bin -type f -name \*.exe \
|
||||
EXEC_LIST_BIN:=$(shell $(FIND) $(JDK_OUTPUTDIR)/bin -type f -name \*.exe \
|
||||
-o -name \*.dll | $(EGREP) -v -i "$(MSVCRNN_DLL)")
|
||||
else
|
||||
# Find all executables in JDK_OUTPUTDIR since they exist when this makefile is parsed
|
||||
EXEC_LIST:=$(shell $(FIND) $(JDK_OUTPUTDIR)/lib -type f -name \*$(SHARED_LIBRARY_SUFFIX) && \
|
||||
$(FILE) `$(FIND) $(JDK_OUTPUTDIR)/bin -type f -name \*$(EXE_SUFFIX)` \
|
||||
EXEC_LIST_BIN:=$(shell $(FILE) `$(FIND) $(JDK_OUTPUTDIR)/bin -type f -name \*$(EXE_SUFFIX)` \
|
||||
| $(EGREP) 'ELF' | $(CUT) -d':' -f1)
|
||||
# On mac, the old build searches for static libraries for stripping instead of shared.
|
||||
# Not clear if it's intentional.
|
||||
ifneq ($(OPENJDK_TARGET_OS), macosx)
|
||||
EXEC_LIST_LIB:=$(shell $(FIND) $(JDK_OUTPUTDIR)/lib -type f -name \*$(SHARED_LIBRARY_SUFFIX))
|
||||
endif
|
||||
endif
|
||||
# Filter out non JRE files and convert to unique touch files to depend on
|
||||
JRE_EXEC_TOUCH_LIST:=$(patsubst $(JDK_OUTPUTDIR)/%,$(IMAGES_OUTPUTDIR)/_strip_jre/%.stripped,\
|
||||
$(filter-out $(addprefix %,$(NOT_JRE_BIN_FILES) $(NOT_JRE_LIB_FILES)), $(EXEC_LIST)))
|
||||
|
||||
JDK_JRE_EXEC_TOUCH_LIST:=$(patsubst $(JDK_OUTPUTDIR)/%, \
|
||||
# Filter out the overlay specific bin files
|
||||
EXEC_LIST:=$(filter-out $(OVERLAY_FILTER),$(EXEC_LIST_BIN)) $(EXEC_LIST_LIB)
|
||||
EXEC_LIST_OVERLAY:=$(filter $(OVERLAY_FILTER),$(EXEC_LIST_BIN)) $(EXEC_LIST_LIB)
|
||||
|
||||
# Filter out non JRE files and convert to unique touch files to depend on
|
||||
JRE_STRIP_LIST:=$(patsubst $(JDK_OUTPUTDIR)/%,$(IMAGES_OUTPUTDIR)/_strip_jre/%.stripped,\
|
||||
$(filter-out $(addprefix %,$(NOT_JRE_BIN_FILES) $(NOT_JRE_LIB_FILES) $(JDKJRE_LIB_FILES)),\
|
||||
$(EXEC_LIST)))
|
||||
|
||||
JDKJRE_STRIP_LIST:=$(patsubst $(JDK_OUTPUTDIR)/%, \
|
||||
$(IMAGES_OUTPUTDIR)/_strip_jdk/jre/%.stripped, \
|
||||
$(filter-out $(addprefix %,$(NOT_JRE_BIN_FILES) $(NOT_JRE_LIB_FILES)), $(EXEC_LIST)))
|
||||
|
||||
JDK_BIN_EXEC_TOUCH_LIST := $(patsubst $(JDK_OUTPUTDIR)/%, \
|
||||
JDK_BIN_STRIP_LIST:=$(patsubst $(JDK_OUTPUTDIR)/%, \
|
||||
$(IMAGES_OUTPUTDIR)/_strip_jdk/%.stripped, \
|
||||
$(filter-out $(JDK_OUTPUTDIR)/lib/%, $(EXEC_LIST)))
|
||||
|
||||
# Do the same for overlay image
|
||||
JRE_OVERLAY_STRIP_LIST:=$(patsubst $(JDK_OUTPUTDIR)/%,$(IMAGES_OUTPUTDIR)/_strip_jre_overlay/%.stripped,\
|
||||
$(filter-out $(addprefix %,$(NOT_JRE_BIN_FILES) $(NOT_JRE_LIB_FILES) $(JDKJRE_LIB_FILES)),\
|
||||
$(EXEC_LIST_OVERLAY)))
|
||||
|
||||
JDKJRE_OVERLAY_STRIP_LIST:=$(patsubst $(JDK_OUTPUTDIR)/%, \
|
||||
$(IMAGES_OUTPUTDIR)/_strip_jdk_overlay/jre/%.stripped, \
|
||||
$(filter-out $(addprefix %,$(NOT_JRE_BIN_FILES) $(NOT_JRE_LIB_FILES)), $(EXEC_LIST_OVERLAY)))
|
||||
|
||||
JDK_OVERLAY_BIN_STRIP_LIST:=$(patsubst $(JDK_OUTPUTDIR)/%, \
|
||||
$(IMAGES_OUTPUTDIR)/_strip_jdk_overlay/%.stripped, \
|
||||
$(filter-out $(JDK_OUTPUTDIR)/lib/%, $(EXEC_LIST_OVERLAY)))
|
||||
|
||||
define mcs-file
|
||||
$(if $(POST_MCS_CMD),$(POST_MCS_CMD) $<)
|
||||
endef
|
||||
|
||||
define strip-file
|
||||
$(ECHO) Stripping $(patsubst $(OUTPUT_ROOT)/%,%,$<)
|
||||
$(CHMOD) u+w $<
|
||||
$(POST_STRIP_CMD) $<
|
||||
$(call mcs-file)
|
||||
$(CHMOD) go-w $<
|
||||
$(MKDIR) -p $(@D)
|
||||
$(TOUCH) $@
|
||||
endef
|
||||
|
||||
# Setup a rule for stripping files based on touch files
|
||||
$(IMAGES_OUTPUTDIR)/_strip_jre/%.stripped: $(JRE_IMAGE_DIR)/%
|
||||
$(ECHO) Stripping $(patsubst $(OUTPUT_ROOT)/%,%,$<)
|
||||
$(CHMOD) u+w $<
|
||||
$(POST_STRIP_CMD) $<
|
||||
$(CHMOD) go-w $<
|
||||
$(MKDIR) -p $(@D)
|
||||
$(TOUCH) $@
|
||||
$(call strip-file)
|
||||
|
||||
$(IMAGES_OUTPUTDIR)/_strip_jdk/bin/%.stripped: $(JDK_IMAGE_DIR)/bin/%
|
||||
$(ECHO) Stripping $(patsubst $(OUTPUT_ROOT)/%,%,$<)
|
||||
$(CHMOD) u+w $<
|
||||
$(POST_STRIP_CMD) $<
|
||||
$(CHMOD) go-w $<
|
||||
$(MKDIR) -p $(@D)
|
||||
$(TOUCH) $@
|
||||
$(IMAGES_OUTPUTDIR)/_strip_jdk/%.stripped: $(JDK_IMAGE_DIR)/%
|
||||
$(call strip-file)
|
||||
|
||||
# Setup a rule for stripping files based on touch files
|
||||
$(IMAGES_OUTPUTDIR)/_strip_jdk/jre/%.stripped: $(JDK_IMAGE_DIR)/jre/%
|
||||
$(ECHO) Stripping $(patsubst $(OUTPUT_ROOT)/%,%,$<)
|
||||
$(CHMOD) u+w $<
|
||||
$(POST_STRIP_CMD) $<
|
||||
$(CHMOD) go-w $<
|
||||
$(MKDIR) -p $(@D)
|
||||
$(TOUCH) $@
|
||||
$(IMAGES_OUTPUTDIR)/_strip_jre_overlay/%.stripped: $(JRE_OVERLAY_IMAGE_DIR)/%
|
||||
$(call strip-file)
|
||||
|
||||
$(IMAGES_OUTPUTDIR)/_strip_jdk_overlay/%.stripped: $(JDK_OVERLAY_IMAGE_DIR)/%
|
||||
$(call strip-file)
|
||||
|
||||
endif
|
||||
|
||||
@ -602,7 +737,7 @@ endif
|
||||
|
||||
jre-image: $(JRE_BIN_TARGETS) $(JRE_LIB_TARGETS) $(JRE_IMAGE_DIR)/lib/applet \
|
||||
$(JRE_IMAGE_DIR)/lib/meta-index $(JRE_IMAGE_DIR)/lib/ext/meta-index \
|
||||
$(JRE_MAN_PAGE_LIST) $(JRE_DOC_TARGETS) $(JRE_INFO_FILE) $(JRE_EXEC_TOUCH_LIST)
|
||||
$(JRE_MAN_PAGE_LIST) $(JRE_DOC_TARGETS) $(JRE_INFO_FILE) $(JRE_STRIP_LIST)
|
||||
|
||||
jdk-image: $(JDK_BIN_TARGETS) $(JDKJRE_BIN_TARGETS) \
|
||||
$(JDK_LIB_TARGETS) $(JDKJRE_LIB_TARGETS) \
|
||||
@ -612,9 +747,17 @@ jdk-image: $(JDK_BIN_TARGETS) $(JDKJRE_BIN_TARGETS) \
|
||||
$(JDK_MAN_PAGE_LIST) $(JDK_SAMPLE_TARGETS) \
|
||||
$(JDK_DB_TARGETS) $(JDK_INCLUDE_TARGETS) \
|
||||
$(JDKJRE_DOC_TARGETS) $(JDK_DOC_TARGETS) \
|
||||
$(JDK_INFO_FILE) $(JDK_JRE_EXEC_TOUCH_LIST) $(JDK_BIN_EXEC_TOUCH_LIST) \
|
||||
$(JDK_INFO_FILE) $(JDKJRE_STRIP_LIST) $(JDK_BIN_STRIP_LIST) \
|
||||
$(JDK_IMAGE_DIR)/src.zip
|
||||
|
||||
jre-overlay-image: $(JRE_OVERLAY_BIN_TARGETS) $(JRE_OVERLAY_LIB_TARGETS) \
|
||||
$(JRE_OVERLAY_INFO_FILE) $(JRE_OVERLAY_STRIP_LIST)
|
||||
|
||||
jdk-overlay-image: $(JDK_OVERLAY_BIN_TARGETS) $(JDKJRE_OVERLAY_BIN_TARGETS) \
|
||||
$(JDK_OVERLAY_LIB_TARGETS) $(JDKJRE_OVERLAY_LIB_TARGETS) \
|
||||
$(JDK_OVERLAY_DEMO_TARGETS) $(JDK_OVERLAY_INFO_FILE) \
|
||||
$(JDKJRE_OVERLAY_STRIP_LIST) $(JDK_OVERLAY_BIN_STRIP_LIST)
|
||||
|
||||
################################################################################
|
||||
|
||||
.PHONY: default images jre-image jdk-image
|
||||
|
@ -41,12 +41,8 @@ IMPORT_BINARIES := CORBA
|
||||
|
||||
# Put the libraries here. Different locations for different target apis.
|
||||
ifeq ($(OPENJDK_TARGET_OS_API),posix)
|
||||
ifneq ($(OPENJDK_TARGET_OS),macosx)
|
||||
INSTALL_LIBRARIES_HERE:=$(JDK_OUTPUTDIR)/lib/$(LIBARCH)
|
||||
else
|
||||
INSTALL_LIBRARIES_HERE:=$(JDK_OUTPUTDIR)/lib
|
||||
endif
|
||||
HOTSPOT_LIB_DIR:=$(HOTSPOT_DIST)/jre/lib/$(LIBARCH)
|
||||
INSTALL_LIBRARIES_HERE:=$(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)
|
||||
HOTSPOT_LIB_DIR:=$(HOTSPOT_DIST)/jre/lib$(OPENJDK_TARGET_CPU_LIBDIR)
|
||||
else
|
||||
INSTALL_LIBRARIES_HERE:=$(JDK_OUTPUTDIR)/bin
|
||||
HOTSPOT_LIB_DIR:=$(HOTSPOT_DIST)/jre/bin
|
||||
@ -65,6 +61,7 @@ IMPORT_TARGET_CLASSES += $(JDK_OUTPUTDIR)/classes/_the.$1.classes.imported
|
||||
$(JDK_OUTPUTDIR)/classes/_the.$1.classes.imported : $$($1_DIST)/lib/classes.jar $$($1_CLASSES_DEP)
|
||||
$(ECHO) Importing $1 classes.jar
|
||||
$(MKDIR) -p $$(@D)
|
||||
$(RM) $$@ $$@.tmp
|
||||
($(CD) $$(@D) && $(JAR) xvf $$< > $$@.tmp)
|
||||
$(MV) $$@.tmp $$@
|
||||
endef
|
||||
@ -76,6 +73,7 @@ IMPORT_TARGET_SOURCES += $(JDK_OUTPUTDIR)/impsrc/_the.$1.src.imported
|
||||
$(JDK_OUTPUTDIR)/impsrc/_the.$1.src.imported : $$($1_DIST)/lib/src.zip $$($1_SOURCES_DEP)
|
||||
$(ECHO) Importing $1 src.zip
|
||||
$(MKDIR) -p $$(@D)
|
||||
$(RM) $$@ $$@.tmp
|
||||
($(CD) $$(@D) && $(JAR) xvf $$< > $$@.tmp)
|
||||
$(MV) $$@.tmp $$@
|
||||
endef
|
||||
@ -87,6 +85,7 @@ IMPORT_TARGET_BINARIES += $(JDK_OUTPUTDIR)/_the.$1.binaries.imported
|
||||
$(JDK_OUTPUTDIR)/_the.$1.binaries.imported : $$($1_DIST)/lib/bin.zip $$($1_BINARIES_DEP)
|
||||
$(ECHO) Importing $1 bin.zip
|
||||
$(MKDIR) -p $$(@D)
|
||||
$(RM) $$@ $$@.tmp
|
||||
($(CD) $$(@D) && $(JAR) xvf $$< > $$@.tmp)
|
||||
$(MV) $$@.tmp $$@
|
||||
endef
|
||||
@ -103,23 +102,26 @@ IMPORT_TARGET_FILES += $(IMPORT_TARGET_CLASSES) $(IMPORT_TARGET_SOURCES) $(IMPOR
|
||||
|
||||
ifeq ($(OPENJDK_TARGET_OS),solaris)
|
||||
define do-install-file
|
||||
$(MKDIR) -p $$(@D)
|
||||
$(MKDIR) -p '$$(@D)'
|
||||
$(RM) '$$@'
|
||||
$(CP) -r -P '$$<' '$$(@D)'
|
||||
endef
|
||||
else ifeq ($(OPENJDK_TARGET_OS),macosx)
|
||||
define do-install-file
|
||||
$(MKDIR) -p $$(@D)
|
||||
$(MKDIR) -p '$$(@D)'
|
||||
$(RM) '$$@'
|
||||
$(CP) -pRP '$$<' '$$@'
|
||||
endef
|
||||
else
|
||||
define do-install-file
|
||||
$(MKDIR) -p $$(@D)
|
||||
$(MKDIR) -p '$$(@D)'
|
||||
$(RM) '$$@'
|
||||
$(CP) -P '$$<' '$$@'
|
||||
endef
|
||||
endif
|
||||
|
||||
define CopyDir
|
||||
$1_SRC_FILES := $(shell $(FIND) $2 -type f)
|
||||
$1_SRC_FILES := $(shell $(FIND) $2 -type f -a ! -name "wb.jar")
|
||||
$1_DST_FILES := $$(patsubst $2/%,$3/%,$$($1_SRC_FILES))
|
||||
IMPORT_TARGET_FILES += $$($1_DST_FILES)
|
||||
$3/% : $2/%
|
||||
@ -136,8 +138,8 @@ endef
|
||||
$(eval $(call CopyDir,HOTSPOT0, $(HOTSPOT_LIB_DIR), $(INSTALL_LIBRARIES_HERE)))
|
||||
$(eval $(call CopyDir,HOTSPOT1, $(HOTSPOT_DIST)/lib, $(JDK_OUTPUTDIR)/lib))
|
||||
|
||||
JSIG_DEBUGINFO := $(wildcard $(HOTSPOT_DIST)/jre/lib/$(LIBARCH)/libjsig.debuginfo) \
|
||||
$(wildcard $(HOTSPOT_DIST)/jre/lib/$(LIBARCH)/libjsig.diz)
|
||||
JSIG_DEBUGINFO := $(strip $(wildcard $(HOTSPOT_DIST)/jre/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libjsig.debuginfo) \
|
||||
$(wildcard $(HOTSPOT_DIST)/jre/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libjsig.diz) )
|
||||
|
||||
ifneq ($(OPENJDK_TARGET_OS), windows)
|
||||
ifeq ($(JVM_VARIANT_SERVER), true)
|
||||
@ -155,64 +157,75 @@ ifneq ($(OPENJDK_TARGET_OS), windows)
|
||||
endif
|
||||
|
||||
$(INSTALL_LIBRARIES_HERE)/server/%$(SHARED_LIBRARY_SUFFIX) : $(INSTALL_LIBRARIES_HERE)/%$(SHARED_LIBRARY_SUFFIX)
|
||||
$(RM) -f $@
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) $@
|
||||
$(LN) -s ../$(@F) $@
|
||||
|
||||
$(INSTALL_LIBRARIES_HERE)/server/%.debuginfo : $(INSTALL_LIBRARIES_HERE)/%.debuginfo
|
||||
$(RM) -f $@
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) $@
|
||||
$(LN) -s ../$(@F) $@
|
||||
|
||||
$(INSTALL_LIBRARIES_HERE)/server/%.diz : $(INSTALL_LIBRARIES_HERE)/%.diz
|
||||
$(RM) -f $@
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) $@
|
||||
ifeq (REALLY_WEIRD,1)
|
||||
$(LN) -s ../$(@F) $@
|
||||
else
|
||||
#
|
||||
# TODO: Check if this is what they really want...a zip containing a symlink
|
||||
#
|
||||
$(RM) -f $(basename $@).debuginfo
|
||||
$(RM) $@.tmp $(basename $@).debuginfo
|
||||
$(LN) -s ../$(basename $(@F)).debuginfo $(basename $@).debuginfo
|
||||
$(ZIP) -q -y $@ $(basename $@).debuginfo
|
||||
$(RM) -f $(basename $@).debuginfo
|
||||
$(ZIP) -q -y $@.tmp $(basename $@).debuginfo
|
||||
$(RM) $(basename $@).debuginfo
|
||||
$(MV) $@.tmp $@
|
||||
endif
|
||||
|
||||
$(INSTALL_LIBRARIES_HERE)/client/%$(SHARED_LIBRARY_SUFFIX) : $(INSTALL_LIBRARIES_HERE)/%$(SHARED_LIBRARY_SUFFIX)
|
||||
$(RM) -f $@
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) $@
|
||||
$(LN) -s ../$(@F) $@
|
||||
|
||||
$(INSTALL_LIBRARIES_HERE)/client/%.debuginfo : $(INSTALL_LIBRARIES_HERE)/%.debuginfo
|
||||
$(RM) -f $@
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) $@
|
||||
$(LN) -s ../$(@F) $@
|
||||
|
||||
$(INSTALL_LIBRARIES_HERE)/client/%.diz : $(INSTALL_LIBRARIES_HERE)/%.diz
|
||||
$(RM) -f $@
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) $@
|
||||
ifeq (REALLY_WEIRD,1)
|
||||
$(LN) -s ../$(@F) $@
|
||||
else
|
||||
#
|
||||
# TODO: Check if this is what they really want...a zip containing a symlink
|
||||
#
|
||||
$(RM) -f $(basename $@).debuginfo
|
||||
$(RM) $@.tmp $(basename $@).debuginfo
|
||||
$(LN) -s ../$(basename $(@F)).debuginfo $(basename $@).debuginfo
|
||||
$(ZIP) -q -y $@ $(basename $@).debuginfo
|
||||
$(RM) -f $(basename $@).debuginfo
|
||||
$(ZIP) -q -y $@.tmp $(basename $@).debuginfo
|
||||
$(RM) $(basename $@).debuginfo
|
||||
$(MV) $@.tmp $@
|
||||
endif
|
||||
|
||||
#######
|
||||
|
||||
ifeq ($(OPENJDK_TARGET_OS),solaris)
|
||||
define install-file
|
||||
$(MKDIR) -p $(@D)
|
||||
$(MKDIR) -p '$(@D)'
|
||||
$(RM) '$@'
|
||||
$(CP) -r -P '$<' '$(@D)'
|
||||
endef
|
||||
else ifeq ($(OPENJDK_TARGET_OS),macosx)
|
||||
define install-file
|
||||
$(MKDIR) -p $(@D)
|
||||
$(MKDIR) -p '$(@D)'
|
||||
$(RM) '$@'
|
||||
$(CP) -pRP '$<' '$@'
|
||||
endef
|
||||
else
|
||||
define install-file
|
||||
$(MKDIR) -p $(@D)
|
||||
$(MKDIR) -p '$(@D)'
|
||||
$(RM) '$@'
|
||||
$(CP) -P '$<' '$@'
|
||||
endef
|
||||
endif
|
||||
|
@ -26,6 +26,11 @@
|
||||
# This must be the first rule
|
||||
default: all
|
||||
|
||||
# Inclusion of this pseudo-target will cause make to execute this file
|
||||
# serially, regardless of -j. Recursively called makefiles will not be
|
||||
# affected, however. This is required for correct dependency management.
|
||||
.NOTPARALLEL:
|
||||
|
||||
include $(SPEC)
|
||||
include MakeBase.gmk
|
||||
include JavaCompilation.gmk
|
||||
@ -37,39 +42,72 @@ include Setup.gmk
|
||||
# Setup the build tools.
|
||||
include Tools.gmk
|
||||
|
||||
all: $(BUILD_TOOLS)
|
||||
import: $(BUILD_TOOLS) import-only
|
||||
import-only:
|
||||
# Import (corba jaxp jaxws langtools hotspot)
|
||||
+$(MAKE) -f Import.gmk
|
||||
#
|
||||
|
||||
gensrc: import gensrc-only
|
||||
gensrc-only:
|
||||
+$(MAKE) -f GenerateJavaSources.gmk
|
||||
# Ok, now gensrc is fully populated.
|
||||
|
||||
gendata: gensrc gendata-only
|
||||
gendata-only:
|
||||
+$(MAKE) -f GenerateData.gmk
|
||||
|
||||
classes: gendata classes-only
|
||||
classes-only:
|
||||
+$(MAKE) -f CompileJavaClasses.gmk
|
||||
# The classes are now built and
|
||||
# any javah files have now been generated.
|
||||
|
||||
libs: classes libs-only
|
||||
libs-only:
|
||||
+$(MAKE) -f CompileNativeLibraries.gmk
|
||||
|
||||
launchers: libs launchers-only
|
||||
launchers-only:
|
||||
# Finally compile the launchers.
|
||||
+$(MAKE) -f CompileLaunchers.gmk
|
||||
|
||||
genclasses: launchers genclasses-only
|
||||
genclasses-only:
|
||||
# Generate classes that have other sources. Needs
|
||||
# to execute launchers.
|
||||
+$(MAKE) -f GenerateClasses.gmk
|
||||
|
||||
demos: genclasses demos-only
|
||||
demos-only:
|
||||
# Now we have a complete jdk, which you can run.
|
||||
# It is not yet wrapped up as an installed image.
|
||||
# The demos are compiled against this jdk.
|
||||
ifndef NO_DEMOS
|
||||
+$(MAKE) -f CompileDemos.gmk
|
||||
endif
|
||||
|
||||
samples: demos samples-only
|
||||
samples-only:
|
||||
# Now copy the sample sources into the jdk.
|
||||
ifndef NO_SAMPLES
|
||||
+$(MAKE) -f CopySamples.gmk
|
||||
endif
|
||||
|
||||
# The all target builds the JDK, but not the images
|
||||
all: import gensrc gendata classes libs launchers genclasses demos samples
|
||||
|
||||
.PHONY: all images install overlay-images import-only gensrc-only gendata-only classes-only
|
||||
.PHONY: libs-only launchers-only genclasses-only demos-only samples-only
|
||||
|
||||
# Create the final jdk and jre images, to be wrapped up
|
||||
# into packages, or installed.
|
||||
images:
|
||||
+$(MAKE) -f CreateJars.gmk
|
||||
+$(MAKE) -f Images.gmk
|
||||
|
||||
overlay-images:
|
||||
+$(MAKE) -f CompileLaunchers.gmk OVERLAY_IMAGES=true
|
||||
+$(MAKE) -f Images.gmk overlay-images
|
||||
|
||||
BINARIES:=$(shell if test -d $(IMAGES_OUTPUTDIR)/j2sdk-image/bin; then cd $(IMAGES_OUTPUTDIR)/j2sdk-image/bin && $(LS) ; fi)
|
||||
INSTALLDIR:=openjdk-$(RELEASE)
|
||||
@ -84,5 +122,3 @@ install: images
|
||||
$(CP) -rp $(IMAGES_OUTPUTDIR)/j2sdk-image/* $(INSTALL_PREFIX)/jvm/$(INSTALLDIR)
|
||||
$(RM) $(addprefix $(INSTALL_PREFIX)/bin/,$(BINARIES))
|
||||
$(foreach b,$(BINARIES),$(LN) -s $(INSTALL_PREFIX)/jvm/$(INSTALLDIR)/bin/$b $(INSTALL_PREFIX)/bin/$b &&) true
|
||||
|
||||
.PHONY: all install images
|
||||
|
@ -36,10 +36,8 @@ $(eval $(call SetupJavaCompiler,GENERATE_OLDBYTECODE,\
|
||||
JVM:=$(JAVA),\
|
||||
JAVAC:=$(JAVAC_JARS),\
|
||||
FLAGS:=-source 7 -target 7 -bootclasspath $(BOOT_RTJAR) $(DISABLE_WARNINGS),\
|
||||
SERVER_DIR:=$(JAVAC_SERVERS),\
|
||||
SERVER_JVM:=$(SERVER_JAVA),\
|
||||
MODE:=$(JAVAC_USE_MODE),\
|
||||
USE_DEPS:=$(JAVAC_USE_DEPS)))
|
||||
SERVER_DIR:=$(SJAVAC_SERVER_DIR),\
|
||||
SERVER_JVM:=$(SJAVAC_SERVER_JAVA)))
|
||||
|
||||
# The generate new bytecode javac setup uses the new compiler to compile for the
|
||||
# new jdk. This new bytecode might only be possible to run using the new jvm.
|
||||
@ -47,11 +45,9 @@ $(eval $(call SetupJavaCompiler,GENERATE_JDKBYTECODE,\
|
||||
JVM:=$(JAVA),\
|
||||
JAVAC:=$(JAVAC_JARS),\
|
||||
JAVAH:=$(JAVAH_JARS),\
|
||||
FLAGS:=-bootclasspath "$(JDK_OUTPUTDIR)/classes" -Xprefer:source -XDignore.symbol.file=true $(DISABLE_WARNINGS),\
|
||||
SERVER_DIR:=$(JAVAC_SERVERS),\
|
||||
SERVER_JVM:=$(SERVER_JAVA),\
|
||||
MODE:=$(JAVAC_USE_MODE),\
|
||||
USE_DEPS:=$(JAVAC_USE_DEPS)))
|
||||
FLAGS:=-bootclasspath $(JDK_OUTPUTDIR)/classes -source 7 -target 7 -encoding ascii -XDignore.symbol.file=true $(DISABLE_WARNINGS),\
|
||||
SERVER_DIR:=$(SJAVAC_SERVER_DIR),\
|
||||
SERVER_JVM:=$(SJAVAC_SERVER_JAVA)))
|
||||
|
||||
# After the jdk is built, we want to build demos using only the recently
|
||||
# generated jdk classes and nothing else, no jdk source, etc etc.
|
||||
@ -60,19 +56,6 @@ $(eval $(call SetupJavaCompiler,GENERATE_JDKBYTECODE,\
|
||||
$(eval $(call SetupJavaCompiler,GENERATE_USINGJDKBYTECODE,\
|
||||
JVM:=$(JAVA),\
|
||||
JAVAC:=$(JAVAC_JARS),\
|
||||
FLAGS:= -Xbootclasspath:$(JDK_OUTPUTDIR)/classes $(DISABLE_WARNINGS),\
|
||||
SERVER_DIR:=$(JAVAC_SERVERS),\
|
||||
SERVER_JVM:=$(SERVER_JAVA),\
|
||||
MODE:=$(JAVAC_USE_MODE),\
|
||||
USE_DEPS:=$(JAVAC_USE_DEPS)))
|
||||
|
||||
# A temporary solution to work around the fact that Matrix3D.java
|
||||
# exists in several applets. The javacserver does not like to be
|
||||
# fed the same class twice. Thus we compile one applet outside of the
|
||||
# javacserver.
|
||||
$(eval $(call SetupJavaCompiler,GENERATE_USINGJDKBYTECODE_NOSERV,\
|
||||
JVM:=$(JAVA),\
|
||||
JAVAC:=$(JAVAC_JARS),\
|
||||
FLAGS:= -Xbootclasspath:$(JDK_OUTPUTDIR)/classes $(DISABLE_WARNINGS),\
|
||||
MODE:=SINGLE_THREADED_BATCH,\
|
||||
USE_DEPS:=FALSE))
|
||||
FLAGS:=-bootclasspath $(JDK_OUTPUTDIR)/classes $(DISABLE_WARNINGS),\
|
||||
SERVER_DIR:=$(SJAVAC_SERVER_DIR),\
|
||||
SERVER_JVM:=$(SJAVAC_SERVER_JAVA)))
|
||||
|
@ -134,8 +134,8 @@ TOOL_CLDRCONVERTER=$(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
|
||||
$(eval $(call SetupNativeCompilation,ADD_GNU_DEBUGLINK,\
|
||||
SRC:=$(JDK_TOPDIR)/make/tools/add_gnu_debuglink,\
|
||||
LANG:=C,\
|
||||
CC:=$(HOST_CC),\
|
||||
LDEXE:=$(HOST_LD),\
|
||||
CC:=$(BUILD_CC),\
|
||||
LDEXE:=$(BUILD_LD),\
|
||||
LDFLAGS:=-lelf,\
|
||||
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/add_gnu_debuglink,\
|
||||
OUTPUT_DIR:=$(JDK_OUTPUTDIR)/btbin,\
|
||||
@ -144,8 +144,8 @@ $(eval $(call SetupNativeCompilation,ADD_GNU_DEBUGLINK,\
|
||||
$(eval $(call SetupNativeCompilation,FIX_EMPTY_SEC_HDR_FLAGS,\
|
||||
SRC:=$(JDK_TOPDIR)/make/tools/fix_empty_sec_hdr_flags,\
|
||||
LANG:=C,\
|
||||
CC:=$(HOST_CC),\
|
||||
LDEXE:=$(HOST_LD),\
|
||||
CC:=$(BUILD_CC),\
|
||||
LDEXE:=$(BUILD_LD),\
|
||||
LDFLAGS:=-lelf,\
|
||||
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/fix_empty_sec_hdr_flags,\
|
||||
OUTPUT_DIR:=$(JDK_OUTPUTDIR)/btbin,\
|
||||
|
48
jdk/makefiles/mapfiles/launchers/mapfile-x86
Normal file
48
jdk/makefiles/mapfiles/launchers/mapfile-x86
Normal file
@ -0,0 +1,48 @@
|
||||
#
|
||||
# Copyright (c) 2004, 2011, Oracle and/or its affiliates. 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. Oracle designates this
|
||||
# particular file as subject to the "Classpath" exception as provided
|
||||
# by Oracle 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
# or visit www.oracle.com if you need additional information or have any
|
||||
# questions.
|
||||
#
|
||||
#
|
||||
# Specify what global symbols we export. Note that we're not really
|
||||
# interested in declaring a version, simply scoping the file is sufficient.
|
||||
#
|
||||
|
||||
SUNWprivate_1.1 {
|
||||
global:
|
||||
main; # Provides basic adb symbol offsets
|
||||
environ; # Public symbols and required by Java run time
|
||||
_environ;
|
||||
__environ_lock;
|
||||
___Argv; # The following are private, but as they are
|
||||
_start; # exported from ctr1/crtn, the clever hacker
|
||||
_init; # might know about them. However note, that
|
||||
_fini; # their use is strictly not supported.
|
||||
_lib_version;
|
||||
# _mcount;
|
||||
__fsr;
|
||||
__fsr_init_value;
|
||||
__longdouble_used;
|
||||
|
||||
local:
|
||||
*;
|
||||
};
|
39
jdk/makefiles/mapfiles/launchers/mapfile-x86_64
Normal file
39
jdk/makefiles/mapfiles/launchers/mapfile-x86_64
Normal file
@ -0,0 +1,39 @@
|
||||
#
|
||||
# Copyright (c) 2004, 2011, Oracle and/or its affiliates. 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. Oracle designates this
|
||||
# particular file as subject to the "Classpath" exception as provided
|
||||
# by Oracle 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
# or visit www.oracle.com if you need additional information or have any
|
||||
# questions.
|
||||
#
|
||||
#
|
||||
# Specify what global symbols we export. Note that we're not really
|
||||
# interested in declaring a version, simply scoping the file is sufficient.
|
||||
#
|
||||
|
||||
SUNWprivate_1.1 {
|
||||
global:
|
||||
main; # Provides basic adb symbol offsets
|
||||
environ; # Public symbols and required by Java run time
|
||||
_environ;
|
||||
__environ_lock;
|
||||
|
||||
local:
|
||||
*;
|
||||
};
|
1
jdk/makefiles/mapfiles/libawt_headless/reorder-x86
Normal file
1
jdk/makefiles/mapfiles/libawt_headless/reorder-x86
Normal file
@ -0,0 +1 @@
|
||||
# Temporary file for headless
|
@ -285,6 +285,8 @@ SUNWprivate_1.1 {
|
||||
# Java_sun_misc_VM_unsuspendSomeThreads; threads.c
|
||||
# Java_sun_misc_VM_unsuspendThreads; threads.c
|
||||
|
||||
Java_sun_util_locale_provider_HostLocaleProviderAdapterImpl_getPattern;
|
||||
|
||||
# Outcalls from libjvm done using dlsym().
|
||||
|
||||
VerifyClassCodes;
|
||||
|
109
jdk/makefiles/mapfiles/libjava/reorder-x86
Normal file
109
jdk/makefiles/mapfiles/libjava/reorder-x86
Normal file
@ -0,0 +1,109 @@
|
||||
data = R0x2000;
|
||||
text = LOAD ?RXO;
|
||||
# Test Null
|
||||
text: .text%_init;
|
||||
text: .text%init64IO: OUTPUTDIR/UnixFileSystem_md.o;
|
||||
text: .text%JNI_OnLoad;
|
||||
text: .text%Canonicalize;
|
||||
text: .text%canonicalize;
|
||||
text: .text%collapse: OUTPUTDIR/canonicalize_md.o;
|
||||
text: .text%Java_java_lang_Object_registerNatives;
|
||||
text: .text%Java_java_lang_System_registerNatives;
|
||||
text: .text%Java_java_lang_Thread_registerNatives;
|
||||
text: .text%Java_java_security_AccessController_getStackAccessControlContext;
|
||||
text: .text%Java_java_security_AccessController_getInheritedAccessControlContext;
|
||||
text: .text%Java_java_lang_ClassLoader_registerNatives;
|
||||
text: .text%Java_java_security_AccessController_doPrivileged__Ljava_security_PrivilegedAction_2;
|
||||
text: .text%Java_java_lang_Class_registerNatives;
|
||||
text: .text%Java_java_lang_Class_getPrimitiveClass;
|
||||
text: .text%Java_java_lang_System_initProperties;
|
||||
text: .text%GetJavaProperties;
|
||||
text: .text%uname: OUTPUTDIR/java_props_md.o;
|
||||
text: .text%mapLookup: OUTPUTDIR/java_props_md.o;
|
||||
text: .text%setPathEnvironment: OUTPUTDIR/java_props_md.o;
|
||||
text: .text%JNU_NewStringPlatform;
|
||||
text: .text%JNU_CallStaticMethodByName;
|
||||
text: .text%NewStringPlatform;
|
||||
text: .text%Java_java_io_FileInputStream_initIDs;
|
||||
text: .text%Java_java_io_FileDescriptor_initIDs;
|
||||
text: .text%Java_java_io_FileOutputStream_initIDs;
|
||||
text: .text%Java_java_lang_System_setIn0;
|
||||
text: .text%Java_sun_reflect_Reflection_getCallerClass;
|
||||
text: .text%Java_java_lang_Class_forName0;
|
||||
text: .text%Java_java_lang_String_intern;
|
||||
text: .text%Java_sun_reflect_NativeConstructorAccessorImpl_newInstance0;
|
||||
text: .text%Java_java_lang_Throwable_fillInStackTrace;
|
||||
text: .text%Java_java_lang_System_setOut0;
|
||||
text: .text%Java_java_lang_System_setErr0;
|
||||
text: .text%Java_java_lang_Compiler_registerNatives;
|
||||
text: .text%Java_java_io_FileSystem_getFileSystem;
|
||||
text: .text%JNU_NewObjectByName;
|
||||
text: .text%Java_java_io_UnixFileSystem_initIDs;
|
||||
text: .text%Java_java_security_AccessController_doPrivileged__Ljava_security_PrivilegedExceptionAction_2;
|
||||
text: .text%Java_java_io_UnixFileSystem_list;
|
||||
text: .text%JNU_GetStringPlatformChars;
|
||||
text: .text%JNU_ReleaseStringPlatformChars;
|
||||
text: .text%JNU_ClassString;
|
||||
text: .text%JNU_CopyObjectArray;
|
||||
text: .text%Java_java_io_UnixFileSystem_canonicalize;
|
||||
text: .text%Java_java_io_UnixFileSystem_getBooleanAttributes0;
|
||||
text: .text%Java_java_lang_ClassLoader_findLoadedClass;
|
||||
text: .text%Java_java_lang_ClassLoader_findBootstrapClass;
|
||||
text: .text%Java_java_security_AccessController_doPrivileged__Ljava_security_PrivilegedExceptionAction_2Ljava_security_AccessControlContext_2;
|
||||
text: .text%Java_java_lang_System_mapLibraryName;
|
||||
text: .text%cpchars: OUTPUTDIR/System.o;
|
||||
text: .text%Java_java_lang_ClassLoader_00024NativeLibrary_load;
|
||||
text: .text%Java_java_lang_ClassLoader_00024NativeLibrary_find;
|
||||
text: .text%Java_java_lang_Float_floatToIntBits;
|
||||
text: .text%Java_java_lang_Double_doubleToLongBits;
|
||||
text: .text%Java_java_io_FileInputStream_open;
|
||||
text: .text%fileOpen;
|
||||
text: .text%Java_java_io_UnixFileSystem_getLength;
|
||||
text: .text%Java_java_io_FileInputStream_readBytes;
|
||||
text: .text%readBytes;
|
||||
text: .text%Java_java_io_FileInputStream_close0;
|
||||
text: .text%Java_java_lang_Object_getClass;
|
||||
text: .text%Java_java_lang_ClassLoader_defineClass0;
|
||||
text: .text%VerifyClassCodes;
|
||||
# Test Exit
|
||||
text: .text%Java_java_lang_Shutdown_halt;
|
||||
# Test Hello
|
||||
text: .text%Java_java_io_FileOutputStream_writeBytes;
|
||||
text: .text%writeBytes;
|
||||
# Test Sleep
|
||||
# Test IntToString
|
||||
# Test LoadToolkit
|
||||
text: .text%Java_java_util_ResourceBundle_getClassContext;
|
||||
text: .text%Java_java_security_AccessController_doPrivileged__Ljava_security_PrivilegedAction_2Ljava_security_AccessControlContext_2;
|
||||
text: .text%JNU_GetEnv;
|
||||
text: .text%Java_java_io_UnixFileSystem_checkAccess;
|
||||
text: .text%Java_sun_reflect_NativeMethodAccessorImpl_invoke0;
|
||||
text: .text%Java_java_lang_ref_Finalizer_invokeFinalizeMethod;
|
||||
text: .text%Java_java_io_FileInputStream_available;
|
||||
text: .text%Java_java_lang_reflect_Array_newArray;
|
||||
text: .text%Java_java_lang_Throwable_getStackTraceDepth;
|
||||
text: .text%Java_java_lang_Throwable_getStackTraceElement;
|
||||
text: .text%Java_java_lang_System_identityHashCode;
|
||||
text: .text%Java_sun_misc_Signal_findSignal;
|
||||
text: .text%Java_sun_misc_Signal_handle0;
|
||||
text: .text%JNU_NotifyAll;
|
||||
# Test LoadFrame
|
||||
text: .text%JNU_CallMethodByName;
|
||||
text: .text%JNU_CallMethodByNameV;
|
||||
text: .text%Java_java_util_logging_FileHandler_lockFile;
|
||||
text: .text%Java_java_io_FileOutputStream_open;
|
||||
text: .text%Java_java_io_UnixFileSystem_createDirectory;
|
||||
text: .text%Java_java_io_UnixFileSystem_getLastModifiedTime;
|
||||
text: .text%Java_java_util_prefs_FileSystemPreferences_lockFile0;
|
||||
text: .text%Java_java_io_UnixFileSystem_setLastModifiedTime;
|
||||
text: .text%Java_java_util_prefs_FileSystemPreferences_unlockFile0;
|
||||
text: .text%Java_java_io_FileOutputStream_close0;
|
||||
text: .text%Java_java_util_logging_FileHandler_unlockFile;
|
||||
# Test LoadJFrame
|
||||
text: .text%Java_java_lang_Class_isAssignableFrom;
|
||||
text: .text%Java_java_lang_Class_isInstance;
|
||||
# Test JHello
|
||||
# SwingSet
|
||||
text: .text%Java_java_util_TimeZone_getSystemTimeZoneID;
|
||||
text: .text%findJavaTZ_md;
|
||||
text: .text%Java_java_lang_StrictMath_log;
|
@ -34,6 +34,8 @@ SUNWprivate_1.1 {
|
||||
JLI_ReportErrorMessageSys;
|
||||
JLI_ReportMessage;
|
||||
JLI_ReportExceptionDescription;
|
||||
JLI_GetStdArgs;
|
||||
JLI_GetStdArgc;
|
||||
local:
|
||||
*;
|
||||
};
|
||||
|
119
jdk/makefiles/mapfiles/libjpeg/reorder-x86
Normal file
119
jdk/makefiles/mapfiles/libjpeg/reorder-x86
Normal file
@ -0,0 +1,119 @@
|
||||
data = R0x2000;
|
||||
text = LOAD ?RXO;
|
||||
# Test Null
|
||||
# Test Exit
|
||||
# Test Hello
|
||||
# Test Sleep
|
||||
# Test IntToString
|
||||
# Test LoadToolkit
|
||||
# Test LoadFrame
|
||||
# Test LoadJFrame
|
||||
# Test JHello
|
||||
# SwingSet
|
||||
text: .text%JNI_OnLoad;
|
||||
text: .text%Java_sun_awt_image_JPEGImageDecoder_initIDs;
|
||||
text: .text%Java_sun_awt_image_JPEGImageDecoder_readImage;
|
||||
text: .text%jStdError;
|
||||
text: .text%jCreaDecompress;
|
||||
text: .text%jIMemMgr;
|
||||
text: .text%jMemInit;
|
||||
text: .text%jGetSmall;
|
||||
text: .text%jIMReader;
|
||||
text: .text%alloc_small: OUTPUTDIR/jmemmgr.o;
|
||||
text: .text%reset_marker_reader: OUTPUTDIR/jdmarker.o;
|
||||
text: .text%jIInCtlr;
|
||||
# text: .text%GET_ARRAYS: OUTPUTDIR/jpegdecoder.o;
|
||||
text: .text%jReadHeader;
|
||||
text: .text%jConsumeInput;
|
||||
text: .text%reset_input_controller: OUTPUTDIR/jdinput.o;
|
||||
text: .text%reset_error_mgr: OUTPUTDIR/jerror.o;
|
||||
text: .text%sun_jpeg_init_source;
|
||||
text: .text%consume_markers: OUTPUTDIR/jdinput.o;
|
||||
text: .text%read_markers: OUTPUTDIR/jdmarker.o;
|
||||
# text: .text%first_marker: OUTPUTDIR/jdmarker.o;
|
||||
text: .text%sun_jpeg_fill_input_buffer;
|
||||
# text: .text%RELEASE_ARRAYS: OUTPUTDIR/jpegdecoder.o;
|
||||
# text: .text%get_soi: OUTPUTDIR/jdmarker.o;
|
||||
text: .text%emit_message: OUTPUTDIR/jerror.o;
|
||||
# text: .text%next_marker: OUTPUTDIR/jdmarker.o;
|
||||
text: .text%get_interesting_appn: OUTPUTDIR/jdmarker.o;
|
||||
# text: .text%examine_app0: OUTPUTDIR/jdmarker.o;
|
||||
text: .text%skip_variable: OUTPUTDIR/jdmarker.o;
|
||||
text: .text%sun_jpeg_skip_input_data;
|
||||
# text: .text%examine_app14: OUTPUTDIR/jdmarker.o;
|
||||
text: .text%get_dqt: OUTPUTDIR/jdmarker.o;
|
||||
text: .text%jAlcQTable;
|
||||
text: .text%get_sof: OUTPUTDIR/jdmarker.o;
|
||||
# text: .text%get_dri: OUTPUTDIR/jdmarker.o;
|
||||
text: .text%get_dht: OUTPUTDIR/jdmarker.o;
|
||||
text: .text%jAlcHTable;
|
||||
text: .text%get_sos: OUTPUTDIR/jdmarker.o;
|
||||
# text: .text%initial_setup: OUTPUTDIR/jdinput.o;
|
||||
text: .text%jDivRound;
|
||||
# text: .text%default_decompress_parms: OUTPUTDIR/jdapimin.o;
|
||||
text: .text%jHasMultScn;
|
||||
text: .text%jStrtDecompress;
|
||||
text: .text%jIDMaster;
|
||||
# text: .text%master_selection: OUTPUTDIR/jdmaster.o;
|
||||
text: .text%jCalcDimensions;
|
||||
# text: .text%use_merged_upsample: OUTPUTDIR/jdmaster.o;
|
||||
# text: .text%prepare_range_limit_table: OUTPUTDIR/jdmaster.o;
|
||||
text: .text%jIDColor;
|
||||
# text: .text%build_ycc_rgb_table: OUTPUTDIR/jdcolor.o;
|
||||
text: .text%jIUpsampler;
|
||||
text: .text%jRound;
|
||||
text: .text%alloc_sarray: OUTPUTDIR/jmemmgr.o;
|
||||
text: .text%alloc_large: OUTPUTDIR/jmemmgr.o;
|
||||
text: .text%jGetLarge;
|
||||
text: .text%jIDPostC;
|
||||
text: .text%jIIDCT;
|
||||
text: .text%jIHDecoder;
|
||||
text: .text%jIDCoefC;
|
||||
text: .text%jIDMainC;
|
||||
# text: .text%alloc_funny_pointers: OUTPUTDIR/jdmainct.o;
|
||||
text: .text%realize_virt_arrays: OUTPUTDIR/jmemmgr.o;
|
||||
text: .text%start_input_pass: OUTPUTDIR/jdinput.o;
|
||||
# text: .text%per_scan_setup: OUTPUTDIR/jdinput.o;
|
||||
# text: .text%latch_quant_tables: OUTPUTDIR/jdinput.o;
|
||||
text: .text%start_pass_huff_decoder: OUTPUTDIR/jdhuff.o;
|
||||
text: .text%jMkDDerived;
|
||||
text: .text%start_input_pass: OUTPUTDIR/jdcoefct.o;
|
||||
# text: .text%start_iMCU_row: OUTPUTDIR/jdcoefct.o;
|
||||
# text: .text%output_pass_setup: OUTPUTDIR/jdapistd.o;
|
||||
text: .text%prepare_for_output_pass: OUTPUTDIR/jdmaster.o;
|
||||
text: .text%start_pass: OUTPUTDIR/jddctmgr.o;
|
||||
text: .text%start_output_pass: OUTPUTDIR/jdcoefct.o;
|
||||
text: .text%start_pass_dcolor: OUTPUTDIR/jdcolor.o;
|
||||
text: .text%start_pass_upsample: OUTPUTDIR/jdsample.o;
|
||||
text: .text%start_pass_dpost: OUTPUTDIR/jdpostct.o;
|
||||
text: .text%start_pass_main: OUTPUTDIR/jdmainct.o;
|
||||
# text: .text%make_funny_pointers: OUTPUTDIR/jdmainct.o;
|
||||
text: .text%jReadScanlines;
|
||||
text: .text%process_data_context_main: OUTPUTDIR/jdmainct.o;
|
||||
text: .text%decompress_onepass: OUTPUTDIR/jdcoefct.o;
|
||||
text: .text%jZeroFar;
|
||||
text: .text%decode_mcu: OUTPUTDIR/jdhuff.o;
|
||||
text: .text%jFilBitBuf;
|
||||
text: .text%jHufDecode;
|
||||
text: .text%jRDislow;
|
||||
text: .text%sep_upsample: OUTPUTDIR/jdsample.o;
|
||||
text: .text%fullsize_upsample: OUTPUTDIR/jdsample.o;
|
||||
text: .text%h2v2_fancy_upsample: OUTPUTDIR/jdsample.o;
|
||||
text: .text%ycc_rgb_convert: OUTPUTDIR/jdcolor.o;
|
||||
# text: .text%set_wraparound_pointers: OUTPUTDIR/jdmainct.o;
|
||||
# text: .text%process_restart: OUTPUTDIR/jdhuff.o;
|
||||
text: .text%read_restart_marker: OUTPUTDIR/jdmarker.o;
|
||||
text: .text%finish_input_pass: OUTPUTDIR/jdinput.o;
|
||||
# text: .text%set_bottom_pointers: OUTPUTDIR/jdmainct.o;
|
||||
text: .text%jFinDecompress;
|
||||
text: .text%finish_output_pass: OUTPUTDIR/jdmaster.o;
|
||||
text: .text%sun_jpeg_term_source;
|
||||
text: .text%jAbort;
|
||||
text: .text%free_pool: OUTPUTDIR/jmemmgr.o;
|
||||
text: .text%jFreeLarge;
|
||||
text: .text%jFreeSmall;
|
||||
text: .text%jDestDecompress;
|
||||
text: .text%jDestroy;
|
||||
text: .text%self_destruct: OUTPUTDIR/jmemmgr.o;
|
||||
text: .text%jMemTerm;
|
||||
text: .text%process_data_simple_main: OUTPUTDIR/jdmainct.o;
|
@ -143,6 +143,7 @@ SUNWprivate_1.1 {
|
||||
Java_sun_nio_fs_LinuxNativeDispatcher_fsetxattr0;
|
||||
Java_sun_nio_fs_LinuxNativeDispatcher_fremovexattr0;
|
||||
Java_sun_nio_fs_LinuxNativeDispatcher_setmntent0;
|
||||
Java_sun_nio_fs_LinuxNativeDispatcher_getmntent;
|
||||
Java_sun_nio_fs_LinuxNativeDispatcher_endmntent;
|
||||
Java_sun_nio_fs_UnixNativeDispatcher_init;
|
||||
Java_sun_nio_fs_UnixNativeDispatcher_getcwd;
|
||||
@ -189,7 +190,6 @@ SUNWprivate_1.1 {
|
||||
Java_sun_nio_fs_UnixNativeDispatcher_getgrgid;
|
||||
Java_sun_nio_fs_UnixNativeDispatcher_getpwnam0;
|
||||
Java_sun_nio_fs_UnixNativeDispatcher_getgrnam0;
|
||||
Java_sun_nio_fs_UnixNativeDispatcher_getextmntent;
|
||||
Java_sun_nio_fs_UnixCopyFile_transfer;
|
||||
handleSocketError;
|
||||
|
||||
|
174
jdk/makefiles/mapfiles/libnio/mapfile-macosx
Normal file
174
jdk/makefiles/mapfiles/libnio/mapfile-macosx
Normal file
@ -0,0 +1,174 @@
|
||||
#
|
||||
# Copyright (c) 2001, 2011, Oracle and/or its affiliates. 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. Oracle designates this
|
||||
# particular file as subject to the "Classpath" exception as provided
|
||||
# by Oracle 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
# or visit www.oracle.com if you need additional information or have any
|
||||
# questions.
|
||||
#
|
||||
|
||||
SUNWprivate_1.1 {
|
||||
global:
|
||||
Java_java_nio_MappedByteBuffer_force0;
|
||||
Java_java_nio_MappedByteBuffer_isLoaded0;
|
||||
Java_java_nio_MappedByteBuffer_load0;
|
||||
Java_sun_nio_ch_DatagramChannelImpl_disconnect0;
|
||||
Java_sun_nio_ch_DatagramChannelImpl_initIDs;
|
||||
Java_sun_nio_ch_DatagramChannelImpl_receive0;
|
||||
Java_sun_nio_ch_DatagramChannelImpl_send0;
|
||||
Java_sun_nio_ch_DatagramDispatcher_read0;
|
||||
Java_sun_nio_ch_DatagramDispatcher_readv0;
|
||||
Java_sun_nio_ch_DatagramDispatcher_write0;
|
||||
Java_sun_nio_ch_DatagramDispatcher_writev0;
|
||||
Java_sun_nio_ch_FileChannelImpl_close0;
|
||||
Java_sun_nio_ch_FileChannelImpl_initIDs;
|
||||
Java_sun_nio_ch_FileChannelImpl_map0;
|
||||
Java_sun_nio_ch_FileChannelImpl_position0;
|
||||
Java_sun_nio_ch_FileChannelImpl_transferTo0;
|
||||
Java_sun_nio_ch_FileChannelImpl_unmap0;
|
||||
Java_sun_nio_ch_FileDispatcherImpl_close0;
|
||||
Java_sun_nio_ch_FileDispatcherImpl_closeIntFD;
|
||||
Java_sun_nio_ch_FileDispatcherImpl_force0;
|
||||
Java_sun_nio_ch_FileDispatcherImpl_init;
|
||||
Java_sun_nio_ch_FileDispatcherImpl_lock0;
|
||||
Java_sun_nio_ch_FileDispatcherImpl_preClose0;
|
||||
Java_sun_nio_ch_FileDispatcherImpl_pread0;
|
||||
Java_sun_nio_ch_FileDispatcherImpl_pwrite0;
|
||||
Java_sun_nio_ch_FileDispatcherImpl_read0;
|
||||
Java_sun_nio_ch_FileDispatcherImpl_readv0;
|
||||
Java_sun_nio_ch_FileDispatcherImpl_release0;
|
||||
Java_sun_nio_ch_FileDispatcherImpl_size0;
|
||||
Java_sun_nio_ch_FileDispatcherImpl_truncate0;
|
||||
Java_sun_nio_ch_FileDispatcherImpl_write0;
|
||||
Java_sun_nio_ch_FileDispatcherImpl_writev0;
|
||||
Java_sun_nio_ch_FileKey_init;
|
||||
Java_sun_nio_ch_FileKey_initIDs;
|
||||
Java_sun_nio_ch_InheritedChannel_close0;
|
||||
Java_sun_nio_ch_InheritedChannel_dup;
|
||||
Java_sun_nio_ch_InheritedChannel_dup2;
|
||||
Java_sun_nio_ch_InheritedChannel_open0;
|
||||
Java_sun_nio_ch_InheritedChannel_peerAddress0;
|
||||
Java_sun_nio_ch_InheritedChannel_peerPort0;
|
||||
Java_sun_nio_ch_InheritedChannel_soType0;
|
||||
Java_sun_nio_ch_IOUtil_configureBlocking;
|
||||
Java_sun_nio_ch_IOUtil_drain;
|
||||
Java_sun_nio_ch_IOUtil_fdVal;
|
||||
Java_sun_nio_ch_IOUtil_initIDs;
|
||||
Java_sun_nio_ch_IOUtil_makePipe;
|
||||
Java_sun_nio_ch_IOUtil_randomBytes;
|
||||
Java_sun_nio_ch_IOUtil_setfdVal;
|
||||
Java_sun_nio_ch_KQueue_kqueue;
|
||||
Java_sun_nio_ch_KQueue_keventRegister;
|
||||
Java_sun_nio_ch_KQueue_keventPoll;
|
||||
Java_sun_nio_ch_KQueue_keventSize;
|
||||
Java_sun_nio_ch_KQueue_identOffset;
|
||||
Java_sun_nio_ch_KQueue_filterOffset;
|
||||
Java_sun_nio_ch_KQueue_flagsOffset;
|
||||
Java_sun_nio_ch_KQueuePort_socketpair;
|
||||
Java_sun_nio_ch_KQueuePort_interrupt;
|
||||
Java_sun_nio_ch_KQueuePort_drain1;
|
||||
Java_sun_nio_ch_KQueuePort_close0;
|
||||
Java_sun_nio_ch_NativeThread_current;
|
||||
Java_sun_nio_ch_NativeThread_init;
|
||||
Java_sun_nio_ch_NativeThread_signal;
|
||||
Java_sun_nio_ch_Net_canIPv6SocketJoinIPv4Group0;
|
||||
Java_sun_nio_ch_Net_canJoin6WithIPv4Group0;
|
||||
Java_sun_nio_ch_Net_socket0;
|
||||
Java_sun_nio_ch_Net_bind0;
|
||||
Java_sun_nio_ch_Net_connect0;
|
||||
Java_sun_nio_ch_Net_listen;
|
||||
Java_sun_nio_ch_Net_localPort;
|
||||
Java_sun_nio_ch_Net_localInetAddress;
|
||||
Java_sun_nio_ch_Net_getIntOption0;
|
||||
Java_sun_nio_ch_Net_setIntOption0;
|
||||
Java_sun_nio_ch_Net_initIDs;
|
||||
Java_sun_nio_ch_Net_isIPv6Available0;
|
||||
Java_sun_nio_ch_Net_joinOrDrop4;
|
||||
Java_sun_nio_ch_Net_blockOrUnblock4;
|
||||
Java_sun_nio_ch_Net_joinOrDrop6;
|
||||
Java_sun_nio_ch_Net_blockOrUnblock6;
|
||||
Java_sun_nio_ch_Net_setInterface4;
|
||||
Java_sun_nio_ch_Net_getInterface4;
|
||||
Java_sun_nio_ch_Net_setInterface6;
|
||||
Java_sun_nio_ch_Net_getInterface6;
|
||||
Java_sun_nio_ch_Net_shutdown;
|
||||
Java_sun_nio_ch_PollArrayWrapper_interrupt;
|
||||
Java_sun_nio_ch_PollArrayWrapper_poll0;
|
||||
Java_sun_nio_ch_ServerSocketChannelImpl_accept0;
|
||||
Java_sun_nio_ch_ServerSocketChannelImpl_initIDs;
|
||||
Java_sun_nio_ch_SocketChannelImpl_checkConnect;
|
||||
Java_sun_nio_ch_SocketChannelImpl_sendOutOfBandData;
|
||||
Java_sun_nio_ch_UnixAsynchronousServerSocketChannelImpl_accept0;
|
||||
Java_sun_nio_ch_UnixAsynchronousServerSocketChannelImpl_initIDs;
|
||||
Java_sun_nio_ch_UnixAsynchronousSocketChannelImpl_checkConnect;
|
||||
Java_sun_nio_fs_BsdNativeDispatcher_initIDs;
|
||||
Java_sun_nio_fs_BsdNativeDispatcher_getfsstat;
|
||||
Java_sun_nio_fs_BsdNativeDispatcher_fsstatEntry;
|
||||
Java_sun_nio_fs_BsdNativeDispatcher_endfsstat;
|
||||
Java_sun_nio_fs_UnixNativeDispatcher_init;
|
||||
Java_sun_nio_fs_UnixNativeDispatcher_getcwd;
|
||||
Java_sun_nio_fs_UnixNativeDispatcher_strerror;
|
||||
Java_sun_nio_fs_UnixNativeDispatcher_dup;
|
||||
Java_sun_nio_fs_UnixNativeDispatcher_access0;
|
||||
Java_sun_nio_fs_UnixNativeDispatcher_stat0;
|
||||
Java_sun_nio_fs_UnixNativeDispatcher_lstat0;
|
||||
Java_sun_nio_fs_UnixNativeDispatcher_fstat;
|
||||
Java_sun_nio_fs_UnixNativeDispatcher_fstatat0;
|
||||
Java_sun_nio_fs_UnixNativeDispatcher_chmod0;
|
||||
Java_sun_nio_fs_UnixNativeDispatcher_fchmod;
|
||||
Java_sun_nio_fs_UnixNativeDispatcher_chown0;
|
||||
Java_sun_nio_fs_UnixNativeDispatcher_lchown0;
|
||||
Java_sun_nio_fs_UnixNativeDispatcher_fchown;
|
||||
Java_sun_nio_fs_UnixNativeDispatcher_utimes0;
|
||||
Java_sun_nio_fs_UnixNativeDispatcher_futimes;
|
||||
Java_sun_nio_fs_UnixNativeDispatcher_open0;
|
||||
Java_sun_nio_fs_UnixNativeDispatcher_openat0;
|
||||
Java_sun_nio_fs_UnixNativeDispatcher_close;
|
||||
Java_sun_nio_fs_UnixNativeDispatcher_read;
|
||||
Java_sun_nio_fs_UnixNativeDispatcher_write;
|
||||
Java_sun_nio_fs_UnixNativeDispatcher_fopen0;
|
||||
Java_sun_nio_fs_UnixNativeDispatcher_fclose;
|
||||
Java_sun_nio_fs_UnixNativeDispatcher_opendir0;
|
||||
Java_sun_nio_fs_UnixNativeDispatcher_fdopendir;
|
||||
Java_sun_nio_fs_UnixNativeDispatcher_readdir;
|
||||
Java_sun_nio_fs_UnixNativeDispatcher_closedir;
|
||||
Java_sun_nio_fs_UnixNativeDispatcher_link0;
|
||||
Java_sun_nio_fs_UnixNativeDispatcher_unlink0;
|
||||
Java_sun_nio_fs_UnixNativeDispatcher_unlinkat0;
|
||||
Java_sun_nio_fs_UnixNativeDispatcher_rename0;
|
||||
Java_sun_nio_fs_UnixNativeDispatcher_renameat0;
|
||||
Java_sun_nio_fs_UnixNativeDispatcher_mkdir0;
|
||||
Java_sun_nio_fs_UnixNativeDispatcher_rmdir0;
|
||||
Java_sun_nio_fs_UnixNativeDispatcher_symlink0;
|
||||
Java_sun_nio_fs_UnixNativeDispatcher_readlink0;
|
||||
Java_sun_nio_fs_UnixNativeDispatcher_realpath0;
|
||||
Java_sun_nio_fs_UnixNativeDispatcher_statvfs0;
|
||||
Java_sun_nio_fs_UnixNativeDispatcher_pathconf0;
|
||||
Java_sun_nio_fs_UnixNativeDispatcher_fpathconf;
|
||||
Java_sun_nio_fs_UnixNativeDispatcher_mknod0;
|
||||
Java_sun_nio_fs_UnixNativeDispatcher_getpwuid;
|
||||
Java_sun_nio_fs_UnixNativeDispatcher_getgrgid;
|
||||
Java_sun_nio_fs_UnixNativeDispatcher_getpwnam0;
|
||||
Java_sun_nio_fs_UnixNativeDispatcher_getgrnam0;
|
||||
Java_sun_nio_fs_UnixCopyFile_transfer;
|
||||
handleSocketError;
|
||||
|
||||
local:
|
||||
*;
|
||||
};
|
@ -169,10 +169,10 @@ SUNWprivate_1.1 {
|
||||
Java_sun_nio_fs_UnixNativeDispatcher_getgrgid;
|
||||
Java_sun_nio_fs_UnixNativeDispatcher_getpwnam0;
|
||||
Java_sun_nio_fs_UnixNativeDispatcher_getgrnam0;
|
||||
Java_sun_nio_fs_UnixNativeDispatcher_getextmntent;
|
||||
Java_sun_nio_fs_UnixCopyFile_transfer;
|
||||
Java_sun_nio_fs_SolarisNativeDispatcher_init;
|
||||
Java_sun_nio_fs_SolarisNativeDispatcher_facl;
|
||||
Java_sun_nio_fs_SolarisNativeDispatcher_getextmntent;
|
||||
Java_sun_nio_fs_SolarisWatchService_init;
|
||||
Java_sun_nio_fs_SolarisWatchService_portCreate;
|
||||
Java_sun_nio_fs_SolarisWatchService_portAssociate;
|
||||
|
17
jdk/makefiles/mapfiles/libnio/reorder-x86
Normal file
17
jdk/makefiles/mapfiles/libnio/reorder-x86
Normal file
@ -0,0 +1,17 @@
|
||||
data = R0x2000;
|
||||
text = LOAD ?RXO;
|
||||
# Test Null
|
||||
# Test Exit
|
||||
# Test Hello
|
||||
# Test Sleep
|
||||
# Test IntToString
|
||||
# Test LoadToolkit
|
||||
text: .text%Java_sun_nio_ch_FileChannelImpl_initIDs;
|
||||
text: .text%Java_sun_nio_ch_FileDispatcher_initIDs;
|
||||
text: .text%Java_sun_nio_ch_IOUtil_initIDs;
|
||||
text: .text%Java_sun_nio_ch_FileDispatcher_read0;
|
||||
text: .text%convertReturnVal;
|
||||
# Test LoadFrame
|
||||
# Test LoadJFrame
|
||||
# Test JHello
|
||||
# SwingSet
|
40
jdk/makefiles/mapfiles/libverify/reorder-x86
Normal file
40
jdk/makefiles/mapfiles/libverify/reorder-x86
Normal file
@ -0,0 +1,40 @@
|
||||
data = R0x2000;
|
||||
text = LOAD ?RXO;
|
||||
# Test Null
|
||||
text: .text%VerifyFixClassname;
|
||||
text: .text%VerifyClassname;
|
||||
text: .text%skip_over_fieldname: OUTPUTDIR/check_format.o;
|
||||
text: .text%skip_over_field_signature: OUTPUTDIR/check_format.o;
|
||||
text: .text%VerifyClass;
|
||||
text: .text%make_class_info_from_name: OUTPUTDIR/check_code.o;
|
||||
text: .text%class_name_to_ID: OUTPUTDIR/check_code.o;
|
||||
text: .text%make_class_info: OUTPUTDIR/check_code.o;
|
||||
text: .text%free_block: OUTPUTDIR/check_code.o;
|
||||
text: .text%verify_method: OUTPUTDIR/check_code.o;
|
||||
text: .text%verify_opcode_operands: OUTPUTDIR/check_code.o;
|
||||
text: .text%initialize_dataflow: OUTPUTDIR/check_code.o;
|
||||
text: .text%signature_to_fieldtype: OUTPUTDIR/check_code.o;
|
||||
text: .text%check_register_values: OUTPUTDIR/check_code.o;
|
||||
text: .text%pop_stack: OUTPUTDIR/check_code.o;
|
||||
text: .text%update_registers: OUTPUTDIR/check_code.o;
|
||||
text: .text%push_stack: OUTPUTDIR/check_code.o;
|
||||
text: .text%merge_into_successors: OUTPUTDIR/check_code.o;
|
||||
text: .text%cp_index_to_class_fullinfo: OUTPUTDIR/check_code.o;
|
||||
text: .text%set_protected: OUTPUTDIR/check_code.o;
|
||||
text: .text%merge_into_one_successor: OUTPUTDIR/check_code.o;
|
||||
text: .text%merge_registers: OUTPUTDIR/check_code.o;
|
||||
# Test Exit
|
||||
# Test Hello
|
||||
text: .text%merge_fullinfo_types: OUTPUTDIR/check_code.o;
|
||||
text: .text%isAssignableTo: OUTPUTDIR/check_code.o;
|
||||
# Test Sleep
|
||||
text: .text%isLegalTarget: OUTPUTDIR/check_code.o;
|
||||
text: .text%verify_constant_pool_type: OUTPUTDIR/check_code.o;
|
||||
# Test IntToString
|
||||
# Test LoadToolkit
|
||||
# Test LoadFrame
|
||||
# Test LoadJFrame
|
||||
# Test JHello
|
||||
# SwingSet
|
||||
text: .text%copy_stack: OUTPUTDIR/check_code.o;
|
||||
text: .text%ntohl: OUTPUTDIR/check_code.o;
|
@ -37,16 +37,12 @@ SUNWprivate_1.1 {
|
||||
Java_java_util_zip_Deflater_deflateBytes;
|
||||
Java_java_util_zip_Deflater_end;
|
||||
Java_java_util_zip_Deflater_getAdler;
|
||||
Java_java_util_zip_Deflater_getBytesRead;
|
||||
Java_java_util_zip_Deflater_getBytesWritten;
|
||||
Java_java_util_zip_Deflater_init;
|
||||
Java_java_util_zip_Deflater_initIDs;
|
||||
Java_java_util_zip_Deflater_reset;
|
||||
Java_java_util_zip_Deflater_setDictionary;
|
||||
Java_java_util_zip_Inflater_end;
|
||||
Java_java_util_zip_Inflater_getAdler;
|
||||
Java_java_util_zip_Inflater_getBytesRead;
|
||||
Java_java_util_zip_Inflater_getBytesWritten;
|
||||
Java_java_util_zip_Inflater_inflateBytes;
|
||||
Java_java_util_zip_Inflater_init;
|
||||
Java_java_util_zip_Inflater_initIDs;
|
||||
|
49
jdk/makefiles/mapfiles/libzip/reorder-x86
Normal file
49
jdk/makefiles/mapfiles/libzip/reorder-x86
Normal file
@ -0,0 +1,49 @@
|
||||
data = R0x2000;
|
||||
text = LOAD ?RXO;
|
||||
# Test Null
|
||||
text: .text%ZIP_Open;
|
||||
text: .text%ZIP_Open_Generic;
|
||||
text: .text%InitializeZip;
|
||||
text: .text%allocZip;
|
||||
text: .text%readCEN: OUTPUTDIR/zip_util.o;
|
||||
text: .text%findEND: OUTPUTDIR/zip_util.o;
|
||||
text: .text%hash: OUTPUTDIR/zip_util.o;
|
||||
text: .text%isMetaName: OUTPUTDIR/zip_util.o;
|
||||
text: .text%addMetaName: OUTPUTDIR/zip_util.o;
|
||||
text: .text%ZIP_FindEntry;
|
||||
text: .text%ZIP_GetEntry;
|
||||
text: .text%ZIP_Lock;
|
||||
text: .text%readLOC: OUTPUTDIR/zip_util.o;
|
||||
text: .text%ZIP_Unlock;
|
||||
text: .text%ZIP_FreeEntry;
|
||||
text: .text%Java_java_util_zip_ZipFile_initIDs;
|
||||
text: .text%Java_java_util_zip_ZipFile_open;
|
||||
text: .text%Java_java_util_zip_ZipFile_getTotal;
|
||||
text: .text%Java_java_util_zip_ZipFile_getEntry;
|
||||
text: .text%Java_java_util_zip_ZipFile_freeEntry;
|
||||
text: .text%Java_java_util_zip_ZipFile_getEntryTime;
|
||||
text: .text%Java_java_util_zip_ZipFile_getEntryCrc;
|
||||
text: .text%Java_java_util_zip_ZipFile_getEntryCSize;
|
||||
text: .text%Java_java_util_zip_ZipFile_getEntrySize;
|
||||
text: .text%Java_java_util_zip_ZipFile_getEntryFlag;
|
||||
text: .text%Java_java_util_zip_ZipFile_getEntryMethod;
|
||||
text: .text%Java_java_util_zip_ZipFile_getEntryBytes;
|
||||
text: .text%Java_java_util_zip_Inflater_initIDs;
|
||||
text: .text%Java_java_util_zip_Inflater_init;
|
||||
text: .text%inflateInit2_;
|
||||
text: .text%zcalloc;
|
||||
text: .text%inflateReset;
|
||||
text: .text%Java_java_util_zip_Inflater_inflateBytes;
|
||||
text: .text%inflate;
|
||||
text: .text%Java_java_util_zip_ZipFile_read;
|
||||
text: .text%ZIP_Read;
|
||||
text: .text%huft_build: OUTPUTDIR/inftrees.o;
|
||||
text: .text%zcfree;
|
||||
text: .text%Java_java_util_jar_JarFile_getMetaInfEntryNames;
|
||||
text: .text%ZIP_ReadEntry;
|
||||
text: .text%InflateFully;
|
||||
text: .text%inflateEnd;
|
||||
text: .text%Java_java_util_zip_Inflater_reset;
|
||||
text: .text%Java_java_util_zip_ZipFile_close;
|
||||
text: .text%ZIP_Close;
|
||||
text: .text%Java_java_util_zip_Inflater_end;
|
Loading…
x
Reference in New Issue
Block a user