stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8173801: Modify makefiles to not build demos and samples bundles

Browse Source 
Reviewed-by: ihse, prr, erikj
This commit is contained in:
Alexandre Iline 2017-04-17 19:23:42 -07:00
parent bdada9936e
commit 19abae4791
6 changed files with 5 additions and 917 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/autoconf/spec.gmk.in
View File

@ -841,11 +841,6 @@ JRE_COMPACT3_BUNDLE_NAME := \
jre-$(VERSION_SHORT)+$(VERSION_BUILD)-compact3_$(OPENJDK_TARGET_BUNDLE_PLATFORM)_bin$(DEBUG_PART).tar.gz
JDK_SYMBOLS_BUNDLE_NAME := jdk-$(BASE_NAME)_bin$(DEBUG_PART)-symbols.tar.gz
JRE_SYMBOLS_BUNDLE_NAME := jre-$(BASE_NAME)_bin$(DEBUG_PART)-symbols.tar.gz
ifeq ($(OPENJDK_TARGET_OS), windows)
DEMOS_BUNDLE_NAME := jdk-$(BASE_NAME)_demo$(DEBUG_PART).zip
else
DEMOS_BUNDLE_NAME := jdk-$(BASE_NAME)_demo$(DEBUG_PART).tar.gz
endif
TEST_BUNDLE_NAME := jdk-$(BASE_NAME)_bin-tests$(DEBUG_PART).tar.gz
DOCS_BUNDLE_NAME := jdk-$(BASE_NAME)_doc-api-spec$(DEBUG_PART).tar.gz
@ -853,7 +848,6 @@ JDK_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(JDK_BUNDLE_NAME)
JRE_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(JRE_BUNDLE_NAME)
JDK_SYMBOLS_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(JDK_SYMBOLS_BUNDLE_NAME)
JRE_SYMBOLS_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(JRE_SYMBOLS_BUNDLE_NAME)
DEMOS_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(DEMOS_BUNDLE_NAME)
TEST_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(TEST_BUNDLE_NAME)
DOCS_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(DOCS_BUNDLE_NAME)

64
common/bin/compare_exceptions.sh.incl
View File

@ -38,25 +38,9 @@ fi
if [ "$OPENJDK_TARGET_OS" = "linux" ]; then
STRIP_BEFORE_COMPARE="
./demo/jvmti/compiledMethodLoad/lib/libcompiledMethodLoad.so
./demo/jvmti/gctest/lib/libgctest.so
./demo/jvmti/heapTracker/lib/libheapTracker.so
./demo/jvmti/heapViewer/lib/libheapViewer.so
./demo/jvmti/minst/lib/libminst.so
./demo/jvmti/mtrace/lib/libmtrace.so
./demo/jvmti/versionCheck/lib/libversionCheck.so
./demo/jvmti/waiters/lib/libwaiters.so
"
ACCEPTED_BIN_DIFF="
./demo/jvmti/compiledMethodLoad/lib/libcompiledMethodLoad.so
./demo/jvmti/gctest/lib/libgctest.so
./demo/jvmti/heapTracker/lib/libheapTracker.so
./demo/jvmti/heapViewer/lib/libheapViewer.so
./demo/jvmti/minst/lib/libminst.so
./demo/jvmti/mtrace/lib/libmtrace.so
./demo/jvmti/versionCheck/lib/libversionCheck.so
./demo/jvmti/waiters/lib/libwaiters.so
./lib/client/libjsig.so
./lib/client/libjvm.so
./lib/libattach.so
@ -151,15 +135,6 @@ fi
if [ "$OPENJDK_TARGET_OS" = "solaris" ] && [ "$OPENJDK_TARGET_CPU" = "x86_64" ]; then
STRIP_BEFORE_COMPARE="
./demo/jni/Poller/lib/libPoller.so
./demo/jvmti/compiledMethodLoad/lib/libcompiledMethodLoad.so
./demo/jvmti/gctest/lib/libgctest.so
./demo/jvmti/heapTracker/lib/libheapTracker.so
./demo/jvmti/heapViewer/lib/libheapViewer.so
./demo/jvmti/minst/lib/libminst.so
./demo/jvmti/mtrace/lib/libmtrace.so
./demo/jvmti/versionCheck/lib/libversionCheck.so
./demo/jvmti/waiters/lib/libwaiters.so
"
SORT_SYMBOLS="
@ -174,15 +149,6 @@ if [ "$OPENJDK_TARGET_OS" = "solaris" ] && [ "$OPENJDK_TARGET_CPU" = "x86_64" ];
SKIP_BIN_DIFF="true"
ACCEPTED_SMALL_SIZE_DIFF="
./demo/jni/Poller/lib/libPoller.so
./demo/jvmti/compiledMethodLoad/lib/libcompiledMethodLoad.so
./demo/jvmti/gctest/lib/libgctest.so
./demo/jvmti/heapTracker/lib/libheapTracker.so
./demo/jvmti/heapViewer/lib/libheapViewer.so
./demo/jvmti/minst/lib/libminst.so
./demo/jvmti/mtrace/lib/libmtrace.so
./demo/jvmti/versionCheck/lib/libversionCheck.so
./demo/jvmti/waiters/lib/libwaiters.so
./lib/jli/libjli.so
./lib/jspawnhelper
./lib/libJdbcOdbc.so
@ -279,19 +245,9 @@ fi
if [ "$OPENJDK_TARGET_OS" = "solaris" ] && [ "$OPENJDK_TARGET_CPU" = "sparcv9" ]; then
STRIP_BEFORE_COMPARE="
./demo/jni/Poller/lib/libPoller.so
./demo/jvmti/compiledMethodLoad/lib/libcompiledMethodLoad.so
./demo/jvmti/gctest/lib/libgctest.so
./demo/jvmti/heapTracker/lib/libheapTracker.so
./demo/jvmti/heapViewer/lib/libheapViewer.so
./demo/jvmti/minst/lib/libminst.so
./demo/jvmti/mtrace/lib/libmtrace.so
./demo/jvmti/versionCheck/lib/libversionCheck.so
./demo/jvmti/waiters/lib/libwaiters.so
"
SORT_SYMBOLS="
./demo/jvmti/waiters/lib/libwaiters.so
./lib/libjsig.so
./lib/libfontmanager.so
./lib/libjimage.so
@ -305,15 +261,6 @@ if [ "$OPENJDK_TARGET_OS" = "solaris" ] && [ "$OPENJDK_TARGET_CPU" = "sparcv9" ]
SKIP_BIN_DIFF="true"
ACCEPTED_SMALL_SIZE_DIFF="
./demo/jni/Poller/lib/libPoller.so
./demo/jvmti/compiledMethodLoad/lib/libcompiledMethodLoad.so
./demo/jvmti/gctest/lib/libgctest.so
./demo/jvmti/heapTracker/lib/libheapTracker.so
./demo/jvmti/heapViewer/lib/libheapViewer.so
./demo/jvmti/minst/lib/libminst.so
./demo/jvmti/mtrace/lib/libmtrace.so
./demo/jvmti/versionCheck/lib/libversionCheck.so
./demo/jvmti/waiters/lib/libwaiters.so
./lib/client/libjvm.so
./lib/jli/libjli.so
./lib/jspawnhelper
@ -438,9 +385,6 @@ if [ "$OPENJDK_TARGET_OS" = "windows" ]; then
# Probably should add all libs here
ACCEPTED_SMALL_SIZE_DIFF="
./demo/jvmti/gctest/lib/gctest.dll
./demo/jvmti/heapTracker/lib/heapTracker.dll
./demo/jvmti/minst/lib/minst.dll
./bin/attach.dll
./bin/jsoundds.dll
./bin/client/jvm.dll
@ -579,14 +523,6 @@ if [ "$OPENJDK_TARGET_OS" = "macosx" ]; then
./bin/wsgen
./bin/wsimport
./bin/xjc
./demo/jvmti/compiledMethodLoad/lib/libcompiledMethodLoad.dylib
./demo/jvmti/gctest/lib/libgctest.dylib
./demo/jvmti/heapTracker/lib/libheapTracker.dylib
./demo/jvmti/heapViewer/lib/libheapViewer.dylib
./demo/jvmti/minst/lib/libminst.dylib
./demo/jvmti/mtrace/lib/libmtrace.dylib
./demo/jvmti/versionCheck/lib/libversionCheck.dylib
./demo/jvmti/waiters/lib/libwaiters.dylib
./Contents/Home/bin/_javaws
./Contents/Home/bin/javaws
./Contents/Home/bin/idlj

805
common/nb_native/nbproject/configurations.xml
View File

@ -982,52 +982,6 @@
</df>
</df>
<df name="src">
<df name="demo">
<df name="share">
<df name="jvmti">
<df name="agent_util">
<in>agent_util.c</in>
</df>
<df name="compiledMethodLoad">
<in>compiledMethodLoad.c</in>
</df>
<df name="gctest">
<in>gctest.c</in>
</df>
<df name="heapTracker">
<in>heapTracker.c</in>
</df>
<df name="heapViewer">
<in>heapViewer.c</in>
</df>
<df name="java_crw_demo">
<in>java_crw_demo.c</in>
</df>
<df name="minst">
<in>minst.c</in>
</df>
<df name="mtrace">
<in>mtrace.c</in>
</df>
<df name="versionCheck">
<in>versionCheck.c</in>
</df>
<df name="waiters">
<in>Agent.cpp</in>
<in>Monitor.cpp</in>
<in>Thread.cpp</in>
<in>waiters.cpp</in>
</df>
</df>
</df>
<df name="solaris">
<df name="jni">
<df name="Poller">
<in>Poller.c</in>
</df>
</df>
</df>
</df>
<df name="java.base">
<df name="linux">
<df name="native">
@ -21533,89 +21487,6 @@
</incDir>
</ccTool>
</item>
<item path="../../jdk/src/demo/share/jvmti/agent_util/agent_util.c"
ex="false"
tool="0"
flavor2="3">
<cTool flags="5">
</cTool>
</item>
<item path="../../jdk/src/demo/share/jvmti/compiledMethodLoad/compiledMethodLoad.c"
ex="false"
tool="0"
flavor2="3">
<cTool flags="5">
</cTool>
</item>
<item path="../../jdk/src/demo/share/jvmti/gctest/gctest.c"
ex="false"
tool="0"
flavor2="3">
<cTool flags="5">
</cTool>
</item>
<item path="../../jdk/src/demo/share/jvmti/heapTracker/heapTracker.c"
ex="false"
tool="0"
flavor2="3">
<cTool flags="5">
</cTool>
</item>
<item path="../../jdk/src/demo/share/jvmti/heapViewer/heapViewer.c"
ex="false"
tool="0"
flavor2="3">
<cTool flags="5">
</cTool>
</item>
<item path="../../jdk/src/demo/share/jvmti/java_crw_demo/java_crw_demo.c"
ex="false"
tool="0"
flavor2="3">
<cTool flags="5">
</cTool>
</item>
<item path="../../jdk/src/demo/share/jvmti/minst/minst.c"
ex="false"
tool="0"
flavor2="3">
<cTool flags="5">
</cTool>
</item>
<item path="../../jdk/src/demo/share/jvmti/mtrace/mtrace.c"
ex="false"
tool="0"
flavor2="3">
<cTool flags="5">
</cTool>
</item>
<item path="../../jdk/src/demo/share/jvmti/versionCheck/versionCheck.c"
ex="false"
tool="0"
flavor2="3">
<cTool flags="5">
</cTool>
</item>
<item path="../../jdk/src/demo/share/jvmti/waiters/Agent.cpp"
ex="false"
tool="1"
flavor2="4">
</item>
<item path="../../jdk/src/demo/share/jvmti/waiters/Monitor.cpp"
ex="false"
tool="1"
flavor2="4">
</item>
<item path="../../jdk/src/demo/share/jvmti/waiters/Thread.cpp"
ex="false"
tool="1"
flavor2="4">
</item>
<item path="../../jdk/src/demo/share/jvmti/waiters/waiters.cpp"
ex="false"
tool="1"
flavor2="4">
</item>
<item path="../../jdk/src/java.base/macosx/native/libjava/HostLocaleProviderAdapter_md.c"
ex="false"
tool="0"
@ -30509,113 +30380,6 @@
</incDir>
</cTool>
</folder>
<folder path="0/jdk/src/demo">
<cTool>
<preprocessorList>
<Elem>DEBUG</Elem>
</preprocessorList>
</cTool>
<ccTool>
<incDir>
<pElem>../../jdk/src/java.base/share/native/include</pElem>
<pElem>../../jdk/src/demo/share/jvmti/waiters</pElem>
<pElem>../../jdk/src/java.base/macosx/native/include</pElem>
<pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>DEBUG</Elem>
</preprocessorList>
</ccTool>
</folder>
<folder path="0/jdk/src/demo/share/jvmti/agent_util">
<cTool>
<incDir>
<pElem>../../jdk/src/java.base/share/native/include</pElem>
<pElem>../../jdk/src/demo/share/jvmti/agent_util</pElem>
<pElem>../../jdk/src/java.base/macosx/native/include</pElem>
<pElem>../../jdk/make</pElem>
</incDir>
</cTool>
</folder>
<folder path="0/jdk/src/demo/share/jvmti/compiledMethodLoad">
<cTool>
<incDir>
<pElem>../../jdk/src/demo/share/jvmti/compiledMethodLoad</pElem>
<pElem>../../jdk/src/java.base/share/native/include</pElem>
<pElem>../../jdk/src/java.base/macosx/native/include</pElem>
<pElem>../../jdk/make</pElem>
</incDir>
</cTool>
</folder>
<folder path="0/jdk/src/demo/share/jvmti/gctest">
<cTool>
<incDir>
<pElem>../../jdk/src/java.base/share/native/include</pElem>
<pElem>../../jdk/src/java.base/macosx/native/include</pElem>
<pElem>../../jdk/src/demo/share/jvmti/gctest</pElem>
<pElem>../../jdk/make</pElem>
</incDir>
</cTool>
</folder>
<folder path="0/jdk/src/demo/share/jvmti/heapTracker">
<cTool>
<incDir>
<pElem>../../jdk/src/java.base/share/native/include</pElem>
<pElem>../../jdk/src/java.base/macosx/native/include</pElem>
<pElem>../../jdk/src/demo/share/jvmti/heapTracker</pElem>
<pElem>../../jdk/make</pElem>
</incDir>
</cTool>
</folder>
<folder path="0/jdk/src/demo/share/jvmti/heapViewer">
<cTool>
<incDir>
<pElem>../../jdk/src/java.base/share/native/include</pElem>
<pElem>../../jdk/src/demo/share/jvmti/heapViewer</pElem>
<pElem>../../jdk/src/java.base/macosx/native/include</pElem>
<pElem>../../jdk/make</pElem>
</incDir>
</cTool>
</folder>
<folder path="0/jdk/src/demo/share/jvmti/java_crw_demo">
<cTool>
<incDir>
<pElem>../../jdk/src/demo/share/jvmti/java_crw_demo</pElem>
<pElem>../../jdk/src/java.base/share/native/include</pElem>
<pElem>../../jdk/make</pElem>
</incDir>
</cTool>
</folder>
<folder path="0/jdk/src/demo/share/jvmti/minst">
<cTool>
<incDir>
<pElem>../../jdk/src/java.base/share/native/include</pElem>
<pElem>../../jdk/src/java.base/macosx/native/include</pElem>
<pElem>../../jdk/src/demo/share/jvmti/minst</pElem>
<pElem>../../jdk/make</pElem>
</incDir>
</cTool>
</folder>
<folder path="0/jdk/src/demo/share/jvmti/mtrace">
<cTool>
<incDir>
<pElem>../../jdk/src/java.base/share/native/include</pElem>
<pElem>../../jdk/src/java.base/macosx/native/include</pElem>
<pElem>../../jdk/src/demo/share/jvmti/mtrace</pElem>
<pElem>../../jdk/make</pElem>
</incDir>
</cTool>
</folder>
<folder path="0/jdk/src/demo/share/jvmti/versionCheck">
<cTool>
<incDir>
<pElem>../../jdk/src/java.base/share/native/include</pElem>
<pElem>../../jdk/src/demo/share/jvmti/versionCheck</pElem>
<pElem>../../jdk/src/java.base/macosx/native/include</pElem>
<pElem>../../jdk/make</pElem>
</incDir>
</cTool>
</folder>
<folder path="0/jdk/src/java.base">
<cTool>
<incDir>
@ -36906,106 +36670,6 @@
<cTool flags="3">
</cTool>
</item>
<item path="../../jdk/src/demo/share/jvmti/agent_util/agent_util.c"
ex="false"
tool="0"
flavor2="0">
<cTool flags="5">
</cTool>
</item>
<item path="../../jdk/src/demo/share/jvmti/compiledMethodLoad/compiledMethodLoad.c"
ex="false"
tool="0"
flavor2="0">
<cTool flags="5">
</cTool>
</item>
<item path="../../jdk/src/demo/share/jvmti/gctest/gctest.c"
ex="false"
tool="0"
flavor2="0">
<cTool flags="5">
</cTool>
</item>
<item path="../../jdk/src/demo/share/jvmti/heapTracker/heapTracker.c"
ex="false"
tool="0"
flavor2="0">
<cTool flags="5">
</cTool>
</item>
<item path="../../jdk/src/demo/share/jvmti/heapViewer/heapViewer.c"
ex="false"
tool="0"
flavor2="0">
<cTool flags="5">
</cTool>
</item>
<item path="../../jdk/src/demo/share/jvmti/java_crw_demo/java_crw_demo.c"
ex="false"
tool="0"
flavor2="0">
<cTool flags="5">
</cTool>
</item>
<item path="../../jdk/src/demo/share/jvmti/minst/minst.c"
ex="false"
tool="0"
flavor2="0">
<cTool flags="5">
</cTool>
</item>
<item path="../../jdk/src/demo/share/jvmti/mtrace/mtrace.c"
ex="false"
tool="0"
flavor2="0">
<cTool flags="5">
</cTool>
</item>
<item path="../../jdk/src/demo/share/jvmti/versionCheck/versionCheck.c"
ex="false"
tool="0"
flavor2="0">
<cTool flags="5">
</cTool>
</item>
<item path="../../jdk/src/demo/share/jvmti/waiters/Agent.cpp"
ex="false"
tool="1"
flavor2="0">
<ccTool flags="2">
</ccTool>
</item>
<item path="../../jdk/src/demo/share/jvmti/waiters/Monitor.cpp"
ex="false"
tool="1"
flavor2="0">
<ccTool flags="2">
<preprocessorList>
<Elem>THIS_FILE="Monitor.cpp"</Elem>
</preprocessorList>
</ccTool>
</item>
<item path="../../jdk/src/demo/share/jvmti/waiters/Thread.cpp"
ex="false"
tool="1"
flavor2="0">
<ccTool flags="2">
<preprocessorList>
<Elem>THIS_FILE="Thread.cpp"</Elem>
</preprocessorList>
</ccTool>
</item>
<item path="../../jdk/src/demo/share/jvmti/waiters/waiters.cpp"
ex="false"
tool="1"
flavor2="0">
<ccTool flags="2">
<preprocessorList>
<Elem>THIS_FILE="waiters.cpp"</Elem>
</preprocessorList>
</ccTool>
</item>
<item path="../../jdk/src/java.base/linux/native/libjava/ProcessHandleImpl_linux.c"
ex="false"
tool="0"
@ -46197,183 +45861,6 @@
</preprocessorList>
</cTool>
</folder>
<folder path="0/jdk/src/demo">
<cTool>
<preprocessorList>
<Elem>DEBUG</Elem>
</preprocessorList>
</cTool>
<ccTool>
<incDir>
<pElem>../../jdk/src/demo/share/jvmti/waiters</pElem>
<pElem>../../jdk/src/demo/share/jvmti/agent_util</pElem>
<pElem>../../jdk/src/java.base/share/native/include</pElem>
<pElem>../../jdk/src/java.base/linux/native/include</pElem>
<pElem>../../jdk/src/java.base/unix/native/include</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>DEBUG</Elem>
</preprocessorList>
</ccTool>
</folder>
<folder path="0/jdk/src/demo/share/jvmti/agent_util">
<cTool>
<incDir>
<pElem>../../jdk/src/demo/share/jvmti/heapTracker</pElem>
<pElem>../../jdk/src/demo/share/jvmti/agent_util</pElem>
<pElem>../../jdk/src/demo/share/jvmti/java_crw_demo</pElem>
<pElem>../../jdk/src/java.base/share/native/include</pElem>
<pElem>../../jdk/src/java.base/linux/native/include</pElem>
<pElem>../../jdk/src/java.base/unix/native/include</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/make</pElem>
</incDir>
</cTool>
</folder>
<folder path="0/jdk/src/demo/share/jvmti/compiledMethodLoad">
<cTool>
<incDir>
<pElem>../../jdk/src/demo/share/jvmti/compiledMethodLoad</pElem>
<pElem>../../jdk/src/demo/share/jvmti/agent_util</pElem>
<pElem>../../jdk/src/java.base/share/native/include</pElem>
<pElem>../../jdk/src/java.base/linux/native/include</pElem>
<pElem>../../jdk/src/java.base/unix/native/include</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="compiledMethodLoad.c"</Elem>
</preprocessorList>
</cTool>
</folder>
<folder path="0/jdk/src/demo/share/jvmti/gctest">
<cTool>
<incDir>
<pElem>../../jdk/src/demo/share/jvmti/gctest</pElem>
<pElem>../../jdk/src/demo/share/jvmti/agent_util</pElem>
<pElem>../../jdk/src/java.base/share/native/include</pElem>
<pElem>../../jdk/src/java.base/linux/native/include</pElem>
<pElem>../../jdk/src/java.base/unix/native/include</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="gctest.c"</Elem>
</preprocessorList>
</cTool>
</folder>
<folder path="0/jdk/src/demo/share/jvmti/heapTracker">
<cTool>
<incDir>
<pElem>../../jdk/src/demo/share/jvmti/heapTracker</pElem>
<pElem>../../jdk/src/demo/share/jvmti/agent_util</pElem>
<pElem>../../jdk/src/demo/share/jvmti/java_crw_demo</pElem>
<pElem>../../jdk/src/java.base/share/native/include</pElem>
<pElem>../../jdk/src/java.base/linux/native/include</pElem>
<pElem>../../jdk/src/java.base/unix/native/include</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="heapTracker.c"</Elem>
</preprocessorList>
</cTool>
</folder>
<folder path="0/jdk/src/demo/share/jvmti/heapViewer">
<cTool>
<incDir>
<pElem>../../jdk/src/demo/share/jvmti/heapViewer</pElem>
<pElem>../../jdk/src/demo/share/jvmti/agent_util</pElem>
<pElem>../../jdk/src/java.base/share/native/include</pElem>
<pElem>../../jdk/src/java.base/linux/native/include</pElem>
<pElem>../../jdk/src/java.base/unix/native/include</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="heapViewer.c"</Elem>
</preprocessorList>
</cTool>
</folder>
<folder path="0/jdk/src/demo/share/jvmti/java_crw_demo">
<cTool>
<incDir>
<pElem>../../jdk/src/demo/share/jvmti/heapTracker</pElem>
<pElem>../../jdk/src/demo/share/jvmti/agent_util</pElem>
<pElem>../../jdk/src/demo/share/jvmti/java_crw_demo</pElem>
<pElem>../../jdk/src/java.base/share/native/include</pElem>
<pElem>../../jdk/src/java.base/linux/native/include</pElem>
<pElem>../../jdk/src/java.base/unix/native/include</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="java_crw_demo.c"</Elem>
</preprocessorList>
</cTool>
</folder>
<folder path="0/jdk/src/demo/share/jvmti/minst">
<cTool>
<incDir>
<pElem>../../jdk/src/demo/share/jvmti/minst</pElem>
<pElem>../../jdk/src/demo/share/jvmti/agent_util</pElem>
<pElem>../../jdk/src/demo/share/jvmti/java_crw_demo</pElem>
<pElem>../../jdk/src/java.base/share/native/include</pElem>
<pElem>../../jdk/src/java.base/linux/native/include</pElem>
<pElem>../../jdk/src/java.base/unix/native/include</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="minst.c"</Elem>
</preprocessorList>
</cTool>
</folder>
<folder path="0/jdk/src/demo/share/jvmti/mtrace">
<cTool>
<incDir>
<pElem>../../jdk/src/demo/share/jvmti/mtrace</pElem>
<pElem>../../jdk/src/demo/share/jvmti/agent_util</pElem>
<pElem>../../jdk/src/demo/share/jvmti/java_crw_demo</pElem>
<pElem>../../jdk/src/java.base/share/native/include</pElem>
<pElem>../../jdk/src/java.base/linux/native/include</pElem>
<pElem>../../jdk/src/java.base/unix/native/include</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="mtrace.c"</Elem>
</preprocessorList>
</cTool>
</folder>
<folder path="0/jdk/src/demo/share/jvmti/versionCheck">
<cTool>
<incDir>
<pElem>../../jdk/src/demo/share/jvmti/versionCheck</pElem>
<pElem>../../jdk/src/demo/share/jvmti/agent_util</pElem>
<pElem>../../jdk/src/java.base/share/native/include</pElem>
<pElem>../../jdk/src/java.base/linux/native/include</pElem>
<pElem>../../jdk/src/java.base/unix/native/include</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="versionCheck.c"</Elem>
</preprocessorList>
</cTool>
</folder>
<folder path="0/jdk/src/java.base">
<cTool>
<preprocessorList>
@ -55235,113 +54722,6 @@
<ccTool flags="0">
</ccTool>
</item>
<item path="../../jdk/src/demo/share/jvmti/agent_util/agent_util.c"
ex="false"
tool="0"
flavor2="0">
<cTool flags="3">
</cTool>
</item>
<item path="../../jdk/src/demo/share/jvmti/compiledMethodLoad/compiledMethodLoad.c"
ex="false"
tool="0"
flavor2="0">
<cTool flags="3">
</cTool>
</item>
<item path="../../jdk/src/demo/share/jvmti/gctest/gctest.c"
ex="false"
tool="0"
flavor2="0">
<cTool flags="3">
</cTool>
</item>
<item path="../../jdk/src/demo/share/jvmti/heapTracker/heapTracker.c"
ex="false"
tool="0"
flavor2="0">
<cTool flags="3">
</cTool>
</item>
<item path="../../jdk/src/demo/share/jvmti/heapViewer/heapViewer.c"
ex="false"
tool="0"
flavor2="0">
<cTool flags="3">
</cTool>
</item>
<item path="../../jdk/src/demo/share/jvmti/java_crw_demo/java_crw_demo.c"
ex="false"
tool="0"
flavor2="0">
<cTool flags="3">
</cTool>
</item>
<item path="../../jdk/src/demo/share/jvmti/minst/minst.c"
ex="false"
tool="0"
flavor2="0">
<cTool flags="3">
</cTool>
</item>
<item path="../../jdk/src/demo/share/jvmti/mtrace/mtrace.c"
ex="false"
tool="0"
flavor2="0">
<cTool flags="3">
</cTool>
</item>
<item path="../../jdk/src/demo/share/jvmti/versionCheck/versionCheck.c"
ex="false"
tool="0"
flavor2="0">
<cTool flags="3">
</cTool>
</item>
<item path="../../jdk/src/demo/share/jvmti/waiters/Agent.cpp"
ex="false"
tool="1"
flavor2="0">
<ccTool flags="0">
</ccTool>
</item>
<item path="../../jdk/src/demo/share/jvmti/waiters/Monitor.cpp"
ex="false"
tool="1"
flavor2="0">
<ccTool flags="0">
<preprocessorList>
<Elem>THIS_FILE="Monitor.cpp"</Elem>
</preprocessorList>
</ccTool>
</item>
<item path="../../jdk/src/demo/share/jvmti/waiters/Thread.cpp"
ex="false"
tool="1"
flavor2="0">
<ccTool flags="0">
<preprocessorList>
<Elem>THIS_FILE="Thread.cpp"</Elem>
</preprocessorList>
</ccTool>
</item>
<item path="../../jdk/src/demo/share/jvmti/waiters/waiters.cpp"
ex="false"
tool="1"
flavor2="0">
<ccTool flags="0">
<preprocessorList>
<Elem>THIS_FILE="waiters.cpp"</Elem>
</preprocessorList>
</ccTool>
</item>
<item path="../../jdk/src/demo/solaris/jni/Poller/Poller.c"
ex="false"
tool="0"
flavor2="0">
<cTool flags="2">
</cTool>
</item>
<item path="../../jdk/src/java.base/share/native/launcher/main.c"
ex="false"
tool="0"
@ -64674,8 +64054,6 @@
</cTool>
<ccTool>
<incDir>
<pElem>../../jdk/src/demo/share/jvmti/waiters</pElem>
<pElem>../../jdk/src/demo/share/jvmti/agent_util</pElem>
<pElem>../../jdk/src/java.base/share/native/include</pElem>
<pElem>../../jdk/src/java.base/solaris/native/include</pElem>
<pElem>../../jdk/src/java.base/unix/native/include</pElem>
@ -64699,189 +64077,6 @@
</preprocessorList>
</ccTool>
</folder>
<folder path="0/jdk/src/demo">
<cTool>
<preprocessorList>
<Elem>DEBUG</Elem>
</preprocessorList>
</cTool>
<ccTool>
<preprocessorList>
<Elem>DEBUG</Elem>
</preprocessorList>
</ccTool>
</folder>
<folder path="0/jdk/src/demo/share/jvmti/agent_util">
<cTool>
<incDir>
<pElem>../../jdk/src/demo/share/jvmti/heapTracker</pElem>
<pElem>../../jdk/src/demo/share/jvmti/agent_util</pElem>
<pElem>../../jdk/src/demo/share/jvmti/java_crw_demo</pElem>
<pElem>../../jdk/src/java.base/share/native/include</pElem>
<pElem>../../jdk/src/java.base/solaris/native/include</pElem>
<pElem>../../jdk/src/java.base/unix/native/include</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/make</pElem>
</incDir>
</cTool>
</folder>
<folder path="0/jdk/src/demo/share/jvmti/compiledMethodLoad">
<cTool>
<incDir>
<pElem>../../jdk/src/demo/share/jvmti/compiledMethodLoad</pElem>
<pElem>../../jdk/src/demo/share/jvmti/agent_util</pElem>
<pElem>../../jdk/src/java.base/share/native/include</pElem>
<pElem>../../jdk/src/java.base/solaris/native/include</pElem>
<pElem>../../jdk/src/java.base/unix/native/include</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="compiledMethodLoad.c"</Elem>
</preprocessorList>
</cTool>
</folder>
<folder path="0/jdk/src/demo/share/jvmti/gctest">
<cTool>
<incDir>
<pElem>../../jdk/src/demo/share/jvmti/gctest</pElem>
<pElem>../../jdk/src/demo/share/jvmti/agent_util</pElem>
<pElem>../../jdk/src/java.base/share/native/include</pElem>
<pElem>../../jdk/src/java.base/solaris/native/include</pElem>
<pElem>../../jdk/src/java.base/unix/native/include</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="gctest.c"</Elem>
</preprocessorList>
</cTool>
</folder>
<folder path="0/jdk/src/demo/share/jvmti/heapTracker">
<cTool>
<incDir>
<pElem>../../jdk/src/demo/share/jvmti/heapTracker</pElem>
<pElem>../../jdk/src/demo/share/jvmti/agent_util</pElem>
<pElem>../../jdk/src/demo/share/jvmti/java_crw_demo</pElem>
<pElem>../../jdk/src/java.base/share/native/include</pElem>
<pElem>../../jdk/src/java.base/solaris/native/include</pElem>
<pElem>../../jdk/src/java.base/unix/native/include</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="heapTracker.c"</Elem>
</preprocessorList>
</cTool>
</folder>
<folder path="0/jdk/src/demo/share/jvmti/heapViewer">
<cTool>
<incDir>
<pElem>../../jdk/src/demo/share/jvmti/heapViewer</pElem>
<pElem>../../jdk/src/demo/share/jvmti/agent_util</pElem>
<pElem>../../jdk/src/java.base/share/native/include</pElem>
<pElem>../../jdk/src/java.base/solaris/native/include</pElem>
<pElem>../../jdk/src/java.base/unix/native/include</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="heapViewer.c"</Elem>
</preprocessorList>
</cTool>
</folder>
<folder path="0/jdk/src/demo/share/jvmti/java_crw_demo">
<cTool>
<incDir>
<pElem>../../jdk/src/demo/share/jvmti/heapTracker</pElem>
<pElem>../../jdk/src/demo/share/jvmti/agent_util</pElem>
<pElem>../../jdk/src/demo/share/jvmti/java_crw_demo</pElem>
<pElem>../../jdk/src/java.base/share/native/include</pElem>
<pElem>../../jdk/src/java.base/solaris/native/include</pElem>
<pElem>../../jdk/src/java.base/unix/native/include</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="java_crw_demo.c"</Elem>
</preprocessorList>
</cTool>
</folder>
<folder path="0/jdk/src/demo/share/jvmti/minst">
<cTool>
<incDir>
<pElem>../../jdk/src/demo/share/jvmti/minst</pElem>
<pElem>../../jdk/src/demo/share/jvmti/agent_util</pElem>
<pElem>../../jdk/src/demo/share/jvmti/java_crw_demo</pElem>
<pElem>../../jdk/src/java.base/share/native/include</pElem>
<pElem>../../jdk/src/java.base/solaris/native/include</pElem>
<pElem>../../jdk/src/java.base/unix/native/include</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="minst.c"</Elem>
</preprocessorList>
</cTool>
</folder>
<folder path="0/jdk/src/demo/share/jvmti/mtrace">
<cTool>
<incDir>
<pElem>../../jdk/src/demo/share/jvmti/mtrace</pElem>
<pElem>../../jdk/src/demo/share/jvmti/agent_util</pElem>
<pElem>../../jdk/src/demo/share/jvmti/java_crw_demo</pElem>
<pElem>../../jdk/src/java.base/share/native/include</pElem>
<pElem>../../jdk/src/java.base/solaris/native/include</pElem>
<pElem>../../jdk/src/java.base/unix/native/include</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="mtrace.c"</Elem>
</preprocessorList>
</cTool>
</folder>
<folder path="0/jdk/src/demo/share/jvmti/versionCheck">
<cTool>
<incDir>
<pElem>../../jdk/src/demo/share/jvmti/versionCheck</pElem>
<pElem>../../jdk/src/demo/share/jvmti/agent_util</pElem>
<pElem>../../jdk/src/java.base/share/native/include</pElem>
<pElem>../../jdk/src/java.base/solaris/native/include</pElem>
<pElem>../../jdk/src/java.base/unix/native/include</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="versionCheck.c"</Elem>
</preprocessorList>
</cTool>
</folder>
<folder path="0/jdk/src/demo/solaris">
<cTool>
<incDir>
<pElem>../../jdk/src/java.base/share/native/include</pElem>
<pElem>../../jdk/src/java.base/solaris/native/include</pElem>
<pElem>../../jdk/src/java.base/unix/native/include</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../build/support/demos/classes/jni/Poller</pElem>
<pElem>../../jdk/make</pElem>
</incDir>
<preprocessorList>
<Elem>THIS_FILE="Poller.c"</Elem>
</preprocessorList>
</cTool>
</folder>
<folder path="0/jdk/src/java.base">
<cTool>
<incDir>

23
make/Bundles.gmk
View File

@ -183,29 +183,16 @@ ifneq ($(filter product-bundles, $(MAKECMDGOALS)), )
$(JDK_SYMBOLS_EXCLUDE_PATTERN) \
$(JDK_EXTRA_EXCLUDES) \
$(SYMBOLS_EXCLUDE_PATTERN) \
$(JDK_IMAGE_HOMEDIR)/demo/% $(JDK_IMAGE_HOMEDIR)/sample/% \
, \
$(ALL_JDK_FILES) \
)
DEMOS_BUNDLE_FILES := \
$(filter-out \
$(JDK_SYMBOLS_EXCLUDE_PATTERN) \
$(SYMBOLS_EXCLUDE_PATTERN) \
, \
$(filter \
$(JDK_IMAGE_HOMEDIR)/demo/% $(JDK_IMAGE_HOMEDIR)/sample/% \
$(JDK_IMAGE_HOMEDIR)/release \
, \
$(ALL_JDK_FILES) \
) \
)
JDK_SYMBOLS_BUNDLE_FILES := \
$(filter \
$(JDK_SYMBOLS_EXCLUDE_PATTERN) \
$(SYMBOLS_EXCLUDE_PATTERN) \
, \
$(filter-out \
$(JDK_IMAGE_HOMEDIR)/demo/% $(JDK_IMAGE_HOMEDIR)/sample/% \
$(JDK_IMAGE_HOMEDIR)/demo/% \
, \
$(ALL_JDK_FILES) \
) \
@ -271,14 +258,6 @@ ifneq ($(filter product-bundles, $(MAKECMDGOALS)), )
PRODUCT_TARGETS += $(BUILD_JRE_SYMBOLS_BUNDLE)
$(eval $(call SetupBundleFile, BUILD_DEMOS_BUNDLE, \
BUNDLE_NAME := $(DEMOS_BUNDLE_NAME), \
FILES := $(DEMOS_BUNDLE_FILES), \
BASE_DIRS := $(JDK_IMAGE_DIR), \
SUBDIR := $(JDK_BUNDLE_SUBDIR), \
))
PRODUCT_TARGETS += $(BUILD_DEMOS_BUNDLE)
endif
################################################################################

11
make/Images.gmk
View File

@ -348,17 +348,6 @@ ifneq ($(filter jdk, $(MAKECMDGOALS)), )
JDK_TARGETS += $(JDK_COPY_DEMOS)
endif
################################################################################
# /sample dir
$(eval $(call SetupCopyFiles, COPY_SAMPLES, \
SRC := $(SUPPORT_OUTPUTDIR)/sample/image, \
DEST := $(JDK_IMAGE_DIR)/sample, \
FILES := $(if $(wildcard $(SUPPORT_OUTPUTDIR)/sample/image), \
$(call CacheFind,$(SUPPORT_OUTPUTDIR)/sample/image))))
JDK_TARGETS += $(COPY_SAMPLES)
################################################################################
# Code coverage data files

13
make/Main.gmk
View File

@ -272,15 +272,12 @@ ALL_TARGETS += $(HOTSPOT_VARIANT_TARGETS) $(HOTSPOT_VARIANT_GENSRC_TARGETS) \
$(HOTSPOT_VARIANT_LIBS_TARGETS) hotspot-jsig hotspot-ide-project
################################################################################
# Build demos and samples targets
# Build demos targets
demos-jdk:
+($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileDemos.gmk)
samples-jdk:
+($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CopySamples.gmk)
ALL_TARGETS += demos-jdk samples-jdk
ALL_TARGETS += demos-jdk
################################################################################
# Jigsaw specific data and analysis targets.
@ -759,7 +756,7 @@ else
release-file: create-source-revision-tracker
jdk-image: jmods zip-source demos samples release-file
jdk-image: jmods zip-source demos release-file
jre-image: jmods release-file
symbols-image: $(LIBS_TARGETS) $(LAUNCHER_TARGETS)
@ -890,8 +887,6 @@ java.base: hotspot
demos: demos-jdk
samples: samples-jdk
# The "exploded image" is a locally runnable JDK in $(BUILD_OUTPUT)/jdk.
exploded-image-base: $(ALL_MODULES)
exploded-image: exploded-image-base release-file
@ -948,7 +943,7 @@ all-bundles: product-bundles test-bundles docs-bundles
ALL_TARGETS += buildtools hotspot hotspot-libs hotspot-gensrc gensrc gendata \
copy java rmic libs launchers jmods \
jdk.jdwp.agent-gensrc $(ALL_MODULES) demos samples \
jdk.jdwp.agent-gensrc $(ALL_MODULES) demos \
exploded-image-base exploded-image \
create-buildjdk mac-bundles product-images \
profiles profiles-images \