--- a/jdk/make/CompileDemos.gmk Mon Apr 17 01:02:11 2017 -0700
+++ b/jdk/make/CompileDemos.gmk Mon Apr 17 19:23:43 2017 -0700
@@ -263,239 +263,13 @@
MAIN_CLASS := transparentruler.Ruler, \
))
-$(eval $(call SetupBuildDemo, jconsole-plugin, \
- DEMO_SUBDIR := scripting, \
- SRC_SUB_DIR := src, \
- MAIN_CLASS := NONE, \
-))
-
-$(eval $(call SetupBuildDemo, FullThreadDump, \
- DEMO_SUBDIR := management, \
-))
-
-$(eval $(call SetupBuildDemo, JTop, \
- DEMO_SUBDIR := management, \
-))
-
-$(eval $(call SetupBuildDemo, MemoryMonitor, \
- DEMO_SUBDIR := management, \
-))
-
-$(eval $(call SetupBuildDemo, VerboseGC, \
- DEMO_SUBDIR := management, \
-))
-
-################################################################################
-# Build JVMTI demos.
-
-# Setup make rules for building a JVMTI demo.
-#
-# Parameter 1 is the name of the rule. This name is used as variable prefix,
-# and the targets generated are listed in a variable by that name.
-#
-# Remaining parameters are named arguments. These include:
-# EXTRA_SRC_SUBDIR Also include these subdirectories
-# TOOLCHAIN Optionally specify toolchain to use
-SetupBuildJvmtiDemo = $(NamedParamsMacroTemplate)
-define SetupBuildJvmtiDemoBody
- $1_SRC := \
- $(DEMO_SHARE_SRC)/jvmti/$1 \
- $$(wildcard $$(addprefix $(DEMO_SHARE_SRC)/jvmti/, \
- agent_util $$($1_EXTRA_SRC_SUBDIR)))
-
- ### Build the native lib
- $1_CFLAGS_INCLUDE := $$(addprefix -I, $$($1_SRC))
-
- $1_CXXFLAGS := $$($1_CFLAGS_INCLUDE) $(CXXFLAGS_JDKLIB) $(CXXFLAGS_DEBUG_SYMBOLS)
-
- ifeq ($$($1_TOOLCHAIN), TOOLCHAIN_LINK_CXX)
- # For C++, we also need some special treatment.
- $1_LDFLAGS := $$(LDFLAGS_CXX_JDK)
- $1_LIBS := $(LIBCXX)
-
- ifeq ($(OPENJDK_TARGET_CPU_ARCH), sparc)
- $1_CXXFLAGS := $$(filter-out -xregs=no%appl, $$($1_CXXFLAGS))
- endif
- endif
-
- # Remove the -incremental:no setting to get .ilk-files like in the old build.
- $$(eval $$(call SetupNativeCompilation, BUILD_DEMO_JVMTI_NATIVE_$1, \
- SRC := $$($1_SRC), \
- TOOLCHAIN := $$($1_TOOLCHAIN), \
- OPTIMIZATION := LOW, \
- CFLAGS := $$($1_CFLAGS_INCLUDE) $$(CFLAGS_JDKLIB) $$(CFLAGS_DEBUG_SYMBOLS), \
- CXXFLAGS := $$($1_CXXFLAGS), \
- LDFLAGS := $(filter-out -incremental:no -opt:ref, $$(LDFLAGS_JDKLIB)) \
- $$($1_LDFLAGS), \
- LDFLAGS_macosx := $$(call SET_EXECUTABLE_ORIGIN), \
- LIBS := $$($1_LIBS), \
- LIBS_solaris := -lc, \
- VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
- RC_FLAGS := $$(RC_FLAGS) \
- -D "JDK_FNAME=$1.dll" \
- -D "JDK_INTERNAL_NAME=$1" \
- -D "JDK_FTYPE=0x2L", \
- OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/demos/native/jvmti/$1, \
- OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/demos/image/jvmti/$1/lib, \
- LIBRARY := $1, \
- STRIP_SYMBOLS := false, \
- ))
-
- $1 += $$(BUILD_DEMO_JVMTI_NATIVE_$1)
-
- ### Build the jar, if we have java sources
- ifneq ($$(wildcard $(DEMO_SHARE_SRC)/jvmti/$1/*.java), )
- $$(eval $$(call SetupJavaCompilation, BUILD_DEMO_JVMTI_JAVA_$1, \
- SETUP := GENERATE_USINGJDKBYTECODE, \
- SRC := $(DEMO_SHARE_SRC)/jvmti/$1, \
- BIN := $(SUPPORT_OUTPUTDIR)/demos/classes/jvmti/$1, \
- COPY := $(COPY_TO_JAR), \
- JAR := $(SUPPORT_OUTPUTDIR)/demos/image/jvmti/$1/$1.jar, \
- EXTRA_MANIFEST_ATTR := Main-Class: \n, \
- MANIFEST := $(DEMO_MANIFEST), \
- ))
-
- $1 += $$(BUILD_DEMO_JVMTI_JAVA_$1_JAR)
- endif
-
- ### Build the source zip
- $1_EXCLUDE_FILES := \
- $$(wildcard $$(patsubst %, $(DEMO_SHARE_SRC)/jvmti/%/README.txt, \
- agent_util $$($1_EXTRA_SRC_SUBDIR))) \
- $$(wildcard $$(patsubst %, $(DEMO_SHARE_SRC)/jvmti/%/sample.makefile.txt, \
- agent_util $$($1_EXTRA_SRC_SUBDIR)))
-
- $$(eval $$(call SetupZipArchive, BUILD_DEMO_JVMTI_SRC_$1, \
- SRC := $$($1_SRC), \
- EXCLUDE_FILES := $$($1_EXCLUDE_FILES), \
- ZIP := $(SUPPORT_OUTPUTDIR)/demos/image/jvmti/$1/src.zip, \
- ))
-
- $1 += $$(BUILD_DEMO_JVMTI_SRC_$1)
-
- # Copy files to image
- $(SUPPORT_OUTPUTDIR)/demos/image/jvmti/$1/README.txt: $(DEMO_SHARE_SRC)/jvmti/$1/README.txt
- $$(call install-file)
- $(CHMOD) -f ug+w $$@
-
- $1 += $(SUPPORT_OUTPUTDIR)/demos/image/jvmti/$1/README.txt
-
- ifeq ($(OPENJDK_TARGET_OS), windows)
- # These lib and exp files normally end up in OBJECT_DIR but for demos they
- # are supposed to be included in the distro. Since they are created as
- # a side-effect of the library compilation, make does not know about them.
- $1_SUPPORT_OUTPUTDIR := $(SUPPORT_OUTPUTDIR)/demos/native/jvmti/$1
- $1_IMAGE_OUTPUTDIR := $(SUPPORT_OUTPUTDIR)/demos/image/jvmti/$1/lib
-
- $$($1_SUPPORT_OUTPUTDIR)/$1.lib: $$(BUILD_DEMO_JVMTI_NATIVE_$1)
-
- $$($1_SUPPORT_OUTPUTDIR)/$1.exp: $$(BUILD_DEMO_JVMTI_NATIVE_$1)
-
- $$($1_IMAGE_OUTPUTDIR)/$1.lib: $$($1_SUPPORT_OUTPUTDIR)/$1.lib
- $$(call install-file)
-
- $$($1_IMAGE_OUTPUTDIR)/$1.exp: $$($1_SUPPORT_OUTPUTDIR)/$1.exp
- $$(call install-file)
-
- $1 += $$($1_IMAGE_OUTPUTDIR)/$1.lib $$($1_IMAGE_OUTPUTDIR)/$1.exp
- endif
-
- TARGETS += $$($1)
-endef
-
-$(eval $(call SetupBuildJvmtiDemo, compiledMethodLoad))
-$(eval $(call SetupBuildJvmtiDemo, gctest))
-$(eval $(call SetupBuildJvmtiDemo, heapViewer))
-$(eval $(call SetupBuildJvmtiDemo, versionCheck))
-
-$(eval $(call SetupBuildJvmtiDemo, heapTracker, \
- EXTRA_SRC_SUBDIR := java_crw_demo, \
-))
-
-$(eval $(call SetupBuildJvmtiDemo, minst, \
- EXTRA_SRC_SUBDIR := java_crw_demo, \
-))
-
-$(eval $(call SetupBuildJvmtiDemo, mtrace, \
- EXTRA_SRC_SUBDIR := java_crw_demo, \
-))
-
-$(eval $(call SetupBuildJvmtiDemo, waiters, \
- TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
-))
-
-################################################################################
-# Build the Poller demo (on Solaris only).
-
-ifeq ($(OPENJDK_TARGET_OS), solaris)
- DEMO_SOLARIS_SRC := $(JDK_TOPDIR)/src/demo/solaris
-
- $(eval $(call SetupJavaCompilation, BUILD_DEMO_JAVA_Poller, \
- SETUP := GENERATE_USINGJDKBYTECODE, \
- SRC := $(DEMO_SOLARIS_SRC)/jni/Poller, \
- BIN := $(SUPPORT_OUTPUTDIR)/demos/classes/jni/Poller, \
- HEADERS := $(SUPPORT_OUTPUTDIR)/demos/classes/jni/Poller, \
- JAR := $(SUPPORT_OUTPUTDIR)/demos/image/jni/Poller/Poller.jar, \
- MANIFEST := $(SUPPORT_OUTPUTDIR)/demos/java-main-manifest.mf, \
- SRCZIP := $(SUPPORT_OUTPUTDIR)/demos/image/jni/Poller/src.zip, \
- COPY := README.txt Poller.c, \
- JARMAIN := Client, \
- ))
-
- TARGETS += $(BUILD_DEMO_JAVA_Poller)
-
- $(eval $(call SetupNativeCompilation, BUILD_DEMO_NATIVE_Poller, \
- SRC := $(DEMO_SOLARIS_SRC)/jni/Poller, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(CFLAGS_JDKLIB) \
- -I$(SUPPORT_OUTPUTDIR)/demos/classes/jni/Poller, \
- LDFLAGS := $(LDFLAGS_JDKLIB), \
- LIBS_solaris := -lc, \
- OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/demos/native/jni/Poller, \
- OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/demos/native, \
- LIBRARY := Poller, \
- STRIP_SYMBOLS := false, \
- ))
-
- TARGETS += $(BUILD_DEMO_NATIVE_Poller)
-
- # We can only compile native code after java has been compiled (since we
- # depend on generated .h files)
- $(SUPPORT_OUTPUTDIR)/demos/native/jni/Poller/Poller.o: \
- $(BUILD_DEMO_JAVA_Poller)
-
- # Copy to image
- $(SUPPORT_OUTPUTDIR)/demos/image/jni/Poller/README.txt: \
- $(DEMO_SOLARIS_SRC)/jni/Poller/README.txt
- $(call install-file)
- $(CHMOD) -f ug+w $@
-
- TARGETS += $(SUPPORT_OUTPUTDIR)/demos/image/jni/Poller/README.txt
-
- $(SUPPORT_OUTPUTDIR)/demos/image/jni/Poller/lib/libPoller.so: \
- $(SUPPORT_OUTPUTDIR)/demos/native/libPoller.so
- $(call install-file)
-
- TARGETS += $(SUPPORT_OUTPUTDIR)/demos/image/jni/Poller/lib/libPoller.so
-endif
-
################################################################################
# Copy html and README files.
-$(SUPPORT_OUTPUTDIR)/demos/image/management/index.html: $(DEMO_SHARE_SRC)/management/index.html
- $(call install-file)
- $(CHMOD) -f ug+w $@
-
-$(SUPPORT_OUTPUTDIR)/demos/image/jvmti/index.html: $(DEMO_SHARE_SRC)/jvmti/index.html
- $(call install-file)
- $(CHMOD) -f ug+w $@
-
$(SUPPORT_OUTPUTDIR)/demos/image/README: $(DEMO_SHARE_SRC)/README
$(call install-file)
-TARGETS += $(SUPPORT_OUTPUTDIR)/demos/image/management/index.html \
- $(SUPPORT_OUTPUTDIR)/demos/image/jvmti/index.html \
- $(SUPPORT_OUTPUTDIR)/demos/image/README
+TARGETS += $(SUPPORT_OUTPUTDIR)/demos/image/README
################################################################################
# Copy netbeans project files.