author | thartmann |
Fri, 22 May 2015 13:08:50 +0200 | |
changeset 31043 | 8907751034f8 |
parent 30434 | 6b881118c93b |
child 30654 | 3c2e826aa5ea |
permissions | -rw-r--r-- |
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
1 |
# |
29374
f031a666744a
8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents:
27799
diff
changeset
|
2 |
# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. |
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
3 |
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
4 |
# |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
5 |
# This code is free software; you can redistribute it and/or modify it |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
6 |
# under the terms of the GNU General Public License version 2 only, as |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
7 |
# published by the Free Software Foundation. Oracle designates this |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
8 |
# particular file as subject to the "Classpath" exception as provided |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
9 |
# by Oracle in the LICENSE file that accompanied this code. |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
10 |
# |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
11 |
# This code is distributed in the hope that it will be useful, but WITHOUT |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
12 |
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
13 |
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
14 |
# version 2 for more details (a copy is included in the LICENSE file that |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
15 |
# accompanied this code). |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
16 |
# |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
17 |
# You should have received a copy of the GNU General Public License version |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
18 |
# 2 along with this work; if not, write to the Free Software Foundation, |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
19 |
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
20 |
# |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
21 |
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
22 |
# or visit www.oracle.com if you need additional information or have any |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
23 |
# questions. |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
24 |
# |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
25 |
|
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
26 |
default: all |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
27 |
|
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
28 |
include $(SPEC) |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
29 |
include MakeBase.gmk |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
30 |
include JavaCompilation.gmk |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
31 |
include NativeCompilation.gmk |
26191
a0ff4b39d34b
8055188: General cleanup of minor issues from source restructure
erikj
parents:
25859
diff
changeset
|
32 |
include SetupJavaCompilers.gmk |
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
33 |
|
25859 | 34 |
# Prepare the find cache. |
20547 | 35 |
$(eval $(call FillCacheFind, $(JDK_TOPDIR)/src)) |
15126
bceb690ccf35
8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents:
14596
diff
changeset
|
36 |
|
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
37 |
# Append demo goals to this variable. |
20547 | 38 |
BUILD_DEMOS = |
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
39 |
|
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
40 |
# The demo structure and contents should really be cleaned up. |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
41 |
# Now every other demo has its own quirks where to put the |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
42 |
# READMEs and other files. |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
43 |
|
25859 | 44 |
DEMO_SHARE_SRC := $(JDK_TOPDIR)/src/demo/share |
45 |
DEMO_CLOSED_SHARE_SRC := $(JDK_TOPDIR)/src/closed/demo/share |
|
46 |
DEMO_SOLARIS_SRC := $(JDK_TOPDIR)/src/demo/solaris |
|
27736
8c9bd4be4a86
8058631: Rename posix to unix in build system to match file name changes
ihse
parents:
27194
diff
changeset
|
47 |
DEMO_OS_TYPE_SRC := $(JDK_TOPDIR)/src/demo/$(OPENJDK_TARGET_OS_TYPE) |
29925
6d47adfc6b47
8077847: Better handling of Windows executable manifest version
ihse
parents:
29392
diff
changeset
|
48 |
GLOBAL_VERSION_INFO_RESOURCE := $(JDK_TOPDIR)/src/java.base/windows/native/common/version.rc |
25859 | 49 |
|
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
50 |
################################################################################################## |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
51 |
|
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
52 |
define SetupAppletDemo |
20547 | 53 |
$$(eval $$(call SetupJavaCompilation,BUILD_DEMO_APPLET_$1, \ |
54 |
SETUP := GENERATE_USINGJDKBYTECODE, \ |
|
25859 | 55 |
SRC := $(JDK_TOPDIR)/src/$3demo/share/applets/$1, \ |
27565 | 56 |
BIN := $(SUPPORT_OUTPUTDIR)/demo/image/applets/$1, \ |
20547 | 57 |
COPY := .html .java .xyz .obj .au .gif, \ |
58 |
DISABLE_SJAVAC := $2)) |
|
59 |
BUILD_DEMOS += $$(BUILD_DEMO_APPLET_$1) |
|
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
60 |
endef |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
61 |
|
21742
e61b55843e88
8028645: [infra] purge applet demos from the Solaris distros
ksrini
parents:
21535
diff
changeset
|
62 |
ifneq ($(OPENJDK_TARGET_OS), solaris) |
e61b55843e88
8028645: [infra] purge applet demos from the Solaris distros
ksrini
parents:
21535
diff
changeset
|
63 |
$(eval $(call SetupAppletDemo,ArcTest)) |
e61b55843e88
8028645: [infra] purge applet demos from the Solaris distros
ksrini
parents:
21535
diff
changeset
|
64 |
$(eval $(call SetupAppletDemo,BarChart)) |
e61b55843e88
8028645: [infra] purge applet demos from the Solaris distros
ksrini
parents:
21535
diff
changeset
|
65 |
$(eval $(call SetupAppletDemo,Blink)) |
e61b55843e88
8028645: [infra] purge applet demos from the Solaris distros
ksrini
parents:
21535
diff
changeset
|
66 |
$(eval $(call SetupAppletDemo,CardTest)) |
e61b55843e88
8028645: [infra] purge applet demos from the Solaris distros
ksrini
parents:
21535
diff
changeset
|
67 |
$(eval $(call SetupAppletDemo,Clock)) |
e61b55843e88
8028645: [infra] purge applet demos from the Solaris distros
ksrini
parents:
21535
diff
changeset
|
68 |
$(eval $(call SetupAppletDemo,DitherTest)) |
e61b55843e88
8028645: [infra] purge applet demos from the Solaris distros
ksrini
parents:
21535
diff
changeset
|
69 |
$(eval $(call SetupAppletDemo,DrawTest)) |
e61b55843e88
8028645: [infra] purge applet demos from the Solaris distros
ksrini
parents:
21535
diff
changeset
|
70 |
$(eval $(call SetupAppletDemo,Fractal)) |
e61b55843e88
8028645: [infra] purge applet demos from the Solaris distros
ksrini
parents:
21535
diff
changeset
|
71 |
$(eval $(call SetupAppletDemo,GraphicsTest)) |
e61b55843e88
8028645: [infra] purge applet demos from the Solaris distros
ksrini
parents:
21535
diff
changeset
|
72 |
$(eval $(call SetupAppletDemo,NervousText)) |
e61b55843e88
8028645: [infra] purge applet demos from the Solaris distros
ksrini
parents:
21535
diff
changeset
|
73 |
$(eval $(call SetupAppletDemo,SimpleGraph)) |
e61b55843e88
8028645: [infra] purge applet demos from the Solaris distros
ksrini
parents:
21535
diff
changeset
|
74 |
$(eval $(call SetupAppletDemo,SortDemo)) |
e61b55843e88
8028645: [infra] purge applet demos from the Solaris distros
ksrini
parents:
21535
diff
changeset
|
75 |
$(eval $(call SetupAppletDemo,SpreadSheet)) |
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
76 |
|
21742
e61b55843e88
8028645: [infra] purge applet demos from the Solaris distros
ksrini
parents:
21535
diff
changeset
|
77 |
ifndef OPENJDK |
e61b55843e88
8028645: [infra] purge applet demos from the Solaris distros
ksrini
parents:
21535
diff
changeset
|
78 |
$(eval $(call SetupAppletDemo,Animator,,closed/)) |
e61b55843e88
8028645: [infra] purge applet demos from the Solaris distros
ksrini
parents:
21535
diff
changeset
|
79 |
$(eval $(call SetupAppletDemo,GraphLayout,true,closed/)) |
e61b55843e88
8028645: [infra] purge applet demos from the Solaris distros
ksrini
parents:
21535
diff
changeset
|
80 |
$(eval $(call SetupAppletDemo,JumpingBox,,closed/)) |
e61b55843e88
8028645: [infra] purge applet demos from the Solaris distros
ksrini
parents:
21535
diff
changeset
|
81 |
$(eval $(call SetupAppletDemo,TicTacToe,,closed/)) |
e61b55843e88
8028645: [infra] purge applet demos from the Solaris distros
ksrini
parents:
21535
diff
changeset
|
82 |
endif |
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
83 |
endif |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
84 |
|
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
85 |
################################################################################################## |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
86 |
|
20547 | 87 |
PATTERNS_TO_COPY = .html .txt .properties .js .gif .jpg .theme .data .opt README .c .h .png .ttf .xyz .obj |
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
88 |
|
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
89 |
define SetupDemo |
20547 | 90 |
# Param 1 = Name of the demo |
91 |
# Param 2 = Subdirectory of the demo below the demo directory. |
|
92 |
# Param 3 = Additional javac flags. |
|
93 |
# Param 4 = The main class for the jar. |
|
94 |
# Param 5 = Additional source directory. |
|
95 |
# Param 6 = Extra dir below $(JDK_TOPDIR)/src (closed) |
|
96 |
# Param 7 = List of files to copy |
|
97 |
# Param 8 = Base name of jar file. Defaults to $1 |
|
98 |
# Param 9 = Exclude list |
|
99 |
# Param 10 = Extra copy patterns |
|
100 |
# Param 11 = Extra manifest attribute |
|
101 |
# Param 12 = Suffix for compiler setup name |
|
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
102 |
|
25859 | 103 |
$1_SRC_BASE := $(JDK_TOPDIR)/src/$6demo/share/$2/$1 |
20547 | 104 |
# In some demos the source is found in a subdir called src. |
25859 | 105 |
$1_MAIN_SRC := $$(wildcard $$($1_SRC_BASE)/src) |
20547 | 106 |
ifeq ($$($1_MAIN_SRC), ) |
25859 | 107 |
$1_MAIN_SRC := $$($1_SRC_BASE) |
20547 | 108 |
endif |
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
109 |
|
20547 | 110 |
ifneq ($8, ) |
111 |
$1_JARFILE := $8.jar |
|
112 |
else |
|
113 |
$1_JARFILE := $1.jar |
|
114 |
endif |
|
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
115 |
|
20547 | 116 |
ifeq ($(findstring $1,Laffy SwingSet3), ) |
117 |
$$(eval $$(call SetupJavaCompilation,BUILD_DEMO_$1, \ |
|
118 |
SETUP := GENERATE_USINGJDKBYTECODE, \ |
|
119 |
ADD_JAVAC_FLAGS := $3, \ |
|
120 |
SRC := $$($1_MAIN_SRC) $5, \ |
|
27565 | 121 |
BIN := $(SUPPORT_OUTPUTDIR)/demo/classes/$2/$1, \ |
20547 | 122 |
COPY := $(PATTERNS_TO_COPY) $(10), \ |
27565 | 123 |
JAR := $(SUPPORT_OUTPUTDIR)/demo/image/$2/$1/$$($1_JARFILE), \ |
20547 | 124 |
JARMAIN := $4, \ |
21805 | 125 |
MANIFEST := $(JDK_TOPDIR)/make/data/mainmanifest/manifest.mf, \ |
20547 | 126 |
EXTRA_MANIFEST_ATTR := $(11), \ |
27565 | 127 |
SRCZIP := $(SUPPORT_OUTPUTDIR)/demo/image/$2/$1/src.zip, \ |
20547 | 128 |
EXCLUDE_FILES := $9, \ |
129 |
DISABLE_SJAVAC := $(12))) |
|
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
130 |
|
20547 | 131 |
BUILD_DEMOS += $$(BUILD_DEMO_$1) \ |
27565 | 132 |
$(SUPPORT_OUTPUTDIR)/demo/image/$2/$1/$$($1_JARFILE) \ |
133 |
$(SUPPORT_OUTPUTDIR)/demo/image/$2/$1/src.zip |
|
20547 | 134 |
endif |
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
135 |
|
20547 | 136 |
# Copy files. |
25859 | 137 |
$1_COPY_TARGETS := $$(patsubst $$($1_SRC_BASE)/%, \ |
27565 | 138 |
$(SUPPORT_OUTPUTDIR)/demo/image/$2/$1/%, \ |
25859 | 139 |
$$(wildcard $$(addprefix $$($1_SRC_BASE)/, $7))) |
20547 | 140 |
ifneq ($7, ) |
27565 | 141 |
$(SUPPORT_OUTPUTDIR)/demo/image/$2/$1/%: $$($1_SRC_BASE)/% |
20547 | 142 |
$$(call install-file) |
143 |
$(CHMOD) -f ug+w $$@ |
|
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
144 |
|
20547 | 145 |
BUILD_DEMOS += $$($1_COPY_TARGETS) |
146 |
endif |
|
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
147 |
|
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
148 |
endef |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
149 |
|
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
150 |
$(eval $(call SetupDemo,CodePointIM,jfc,,CodePointIM,,,*.html)) |
27565 | 151 |
$(SUPPORT_OUTPUTDIR)/demo/image/jfc/CodePointIM/_the.services: \ |
152 |
$(SUPPORT_OUTPUTDIR)/demo/image/jfc/CodePointIM/CodePointIM.jar \ |
|
25859 | 153 |
$(DEMO_SHARE_SRC)/jfc/CodePointIM/java.awt.im.spi.InputMethodDescriptor |
27565 | 154 |
(cd $(SUPPORT_OUTPUTDIR)/demo/image/jfc/CodePointIM && \ |
20547 | 155 |
$(MKDIR) -p _the.tmp/META-INF/services && \ |
25859 | 156 |
$(CP) $(DEMO_SHARE_SRC)/jfc/CodePointIM/java.awt.im.spi.InputMethodDescriptor _the.tmp/META-INF/services && \ |
27194
48c1741d0f2a
8061924: demos target fails if users CDPATH is incorrectly set
erikj
parents:
26202
diff
changeset
|
157 |
cd ./_the.tmp && \ |
27565 | 158 |
$(JAR) uf $(SUPPORT_OUTPUTDIR)/demo/image/jfc/CodePointIM/CodePointIM.jar META-INF/services/java.awt.im.spi.InputMethodDescriptor && \ |
27194
48c1741d0f2a
8061924: demos target fails if users CDPATH is incorrectly set
erikj
parents:
26202
diff
changeset
|
159 |
cd ./META-INF/services && \ |
27565 | 160 |
$(JAR) uf $(SUPPORT_OUTPUTDIR)/demo/image/jfc/CodePointIM/CodePointIM.jar java.awt.im.spi.InputMethodDescriptor) |
161 |
$(RM) -r $(SUPPORT_OUTPUTDIR)/demo/image/jfc/CodePointIM/_the.tmp |
|
12892 | 162 |
$(TOUCH) $@ |
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
163 |
|
27565 | 164 |
BUILD_DEMOS += $(SUPPORT_OUTPUTDIR)/demo/image/jfc/CodePointIM/_the.services |
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
165 |
|
21742
e61b55843e88
8028645: [infra] purge applet demos from the Solaris distros
ksrini
parents:
21535
diff
changeset
|
166 |
ifneq ($(OPENJDK_TARGET_OS), solaris) |
e61b55843e88
8028645: [infra] purge applet demos from the Solaris distros
ksrini
parents:
21535
diff
changeset
|
167 |
$(eval $(call SetupDemo,MoleculeViewer,applets,,XYZChemModel,,,example*.html *.java)) |
e61b55843e88
8028645: [infra] purge applet demos from the Solaris distros
ksrini
parents:
21535
diff
changeset
|
168 |
$(eval $(call SetupDemo,WireFrame,applets,,ThreeD,,,example*.html *.java)) |
e61b55843e88
8028645: [infra] purge applet demos from the Solaris distros
ksrini
parents:
21535
diff
changeset
|
169 |
$(eval $(call SetupDemo,SwingApplet,jfc,,SwingApplet,,,README* *.html)) |
e61b55843e88
8028645: [infra] purge applet demos from the Solaris distros
ksrini
parents:
21535
diff
changeset
|
170 |
endif |
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
171 |
$(eval $(call SetupDemo,FileChooserDemo,jfc,,FileChooserDemo,,,README*)) |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
172 |
$(eval $(call SetupDemo,Font2DTest,jfc,,Font2DTest,,,*.html *.txt)) |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
173 |
$(eval $(call SetupDemo,Metalworks,jfc,,Metalworks,,,README*)) |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
174 |
$(eval $(call SetupDemo,Notepad,jfc,,Notepad,,,README*)) |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
175 |
$(eval $(call SetupDemo,SampleTree,jfc,,SampleTree,,,README*)) |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
176 |
$(eval $(call SetupDemo,TableExample,jfc,,TableExample,,,README*)) |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
177 |
$(eval $(call SetupDemo,TransparentRuler,jfc,,transparentruler.Ruler,,,README*)) |
14521
6196ce8b0c33
8001906: build-infra: warning: [path] bad path element on Solaris
tbell
parents:
14231
diff
changeset
|
178 |
$(eval $(call SetupDemo,jconsole-plugin,scripting,,,,,*.xml *.txt,,,,Main-Class: \n)) |
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
179 |
$(eval $(call SetupDemo,FullThreadDump,management,,FullThreadDump,,,README*)) |
14521
6196ce8b0c33
8001906: build-infra: warning: [path] bad path element on Solaris
tbell
parents:
14231
diff
changeset
|
180 |
$(eval $(call SetupDemo,JTop,management,,JTop,,,README*)) |
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
181 |
$(eval $(call SetupDemo,MemoryMonitor,management,,MemoryMonitor,,,README*)) |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
182 |
$(eval $(call SetupDemo,VerboseGC,management,,VerboseGC,,,README*)) |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
183 |
|
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
184 |
ifndef OPENJDK |
20547 | 185 |
$(eval $(call SetupDemo,Laffy,jfc,,,,closed/,*)) |
186 |
$(eval $(call SetupDemo,SwingSet3,jfc,,,,closed/,*)) |
|
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
187 |
|
20547 | 188 |
$(eval $(call SetupDemo,Java2D,jfc,,java2d.Java2Demo,,closed/,*.html README*,Java2Demo)) |
189 |
$(eval $(call SetupDemo,Stylepad,jfc,,Stylepad, \ |
|
25859 | 190 |
$(DEMO_SHARE_SRC)/jfc/Notepad,closed/,*.txt,,$(DEMO_SHARE_SRC)/jfc/Notepad/README.txt)) |
20547 | 191 |
$(eval $(call SetupDemo,SwingSet2,jfc,,SwingSet2,,closed/,README* *.html,,,.java COPYRIGHT, \ |
192 |
SplashScreen-Image: resources/images/splash.png,true)) |
|
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
193 |
|
25859 | 194 |
BUILD_DEMOS += $(patsubst $(DEMO_CLOSED_SHARE_SRC)/nbproject/%, \ |
27565 | 195 |
$(SUPPORT_OUTPUTDIR)/demo/image/nbproject/%, \ |
25859 | 196 |
$(call CacheFind, $(DEMO_CLOSED_SHARE_SRC)/nbproject)) |
20547 | 197 |
|
27565 | 198 |
$(SUPPORT_OUTPUTDIR)/demo/image/nbproject/%: $(DEMO_CLOSED_SHARE_SRC)/nbproject/% |
20547 | 199 |
$(call install-file) |
200 |
$(CHMOD) -f ug+w $@ |
|
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
201 |
endif |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
202 |
|
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
203 |
################################################################################################## |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
204 |
|
20547 | 205 |
# In the old makefiles, j2dbench was not compiled. |
206 |
#$(eval $(call SetupDemo,J2DBench, java2d, /src, , j2dbench/J2DBench)) |
|
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
207 |
|
13702 | 208 |
# JVMTI demos are a bit strange and share some files, but be careful the |
20547 | 209 |
# shared files are just the *.c and *.h files, not the README or sample |
210 |
# makefiles. So we always exclude the README.txt and sample.makefile.txt |
|
211 |
# from the extra sources. |
|
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
212 |
define SetupJVMTIDemo |
20547 | 213 |
# Param 1 = Name of the demo |
214 |
# Param 2 = add these directories to the includes, default is agent_util |
|
215 |
# Param 3 = extra CFLAGS |
|
216 |
# Param 4 = C or C++ (defaults to C) |
|
27736
8c9bd4be4a86
8058631: Rename posix to unix in build system to match file name changes
ihse
parents:
27194
diff
changeset
|
217 |
# Param 5 = libs for unix |
20547 | 218 |
# Param 6 = libs for windows |
219 |
# Param 7 = libs for solaris |
|
22597
7515a991bb37
8024854: PPC64: Basic changes and files to build the class library on AIX
simonis
parents:
21535
diff
changeset
|
220 |
# Param 8 = libs for linux |
7515a991bb37
8024854: PPC64: Basic changes and files to build the class library on AIX
simonis
parents:
21535
diff
changeset
|
221 |
# Param 9 = extra directories with required sources |
29374
f031a666744a
8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents:
27799
diff
changeset
|
222 |
# Param 10 = DISABLED_WARNINGS_gcc |
f031a666744a
8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents:
27799
diff
changeset
|
223 |
# Param 11 = DISABLED_WARNINGS_microsoft |
f031a666744a
8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents:
27799
diff
changeset
|
224 |
# Param 12 = DISABLED_WARNINGS_clang |
20547 | 225 |
BUILD_DEMO_JVMTI_$1_EXTRA_SRC := \ |
27736
8c9bd4be4a86
8058631: Rename posix to unix in build system to match file name changes
ihse
parents:
27194
diff
changeset
|
226 |
$$(wildcard $(DEMO_OS_TYPE_SRC)/jvmti/$1) \ |
25859 | 227 |
$$(wildcard $$(addprefix $(DEMO_SHARE_SRC)/jvmti/, $2)) \ |
22597
7515a991bb37
8024854: PPC64: Basic changes and files to build the class library on AIX
simonis
parents:
21535
diff
changeset
|
228 |
$9 |
20547 | 229 |
BUILD_DEMO_JVMTI_$1_EXTRA_SRC_EXCLUDE := \ |
25859 | 230 |
$$(wildcard $$(patsubst %, $(DEMO_SHARE_SRC)/jvmti/%/README.txt, $2)) \ |
231 |
$$(wildcard $$(patsubst %, $(DEMO_SHARE_SRC)/jvmti/%/sample.makefile.txt, $2)) |
|
20547 | 232 |
BUILD_DEMO_JVMTI_$1_EXTRA_INC := $$(addprefix -I, $$(BUILD_DEMO_JVMTI_$1_EXTRA_SRC)) |
233 |
ifeq (C++, $4) |
|
29931
64e274ed6567
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29925
diff
changeset
|
234 |
BUILD_DEMO_JVMTI_$1_TOOLCHAIN := TOOLCHAIN_LINK_CXX |
20547 | 235 |
$1_EXTRA_CXX := $(LDFLAGS_CXX_JDK) $(LIBCXX) |
236 |
endif |
|
13164 | 237 |
|
25859 | 238 |
$1_CXXFLAGS := $(CXXFLAGS_JDKLIB) -I$(DEMO_SHARE_SRC)/jvmti/$1 \ |
20547 | 239 |
$$(BUILD_DEMO_JVMTI_$1_EXTRA_INC) $3 \ |
240 |
$(CXXFLAGS_DEBUG_SYMBOLS) |
|
241 |
ifeq ($1-$(OPENJDK_TARGET_CPU_ARCH), waiters-sparc) |
|
242 |
$1_FILTER := -xregs=no%appl |
|
243 |
$1_CXXFLAGS := $$(filter-out $$($1_FILTER), $$($1_CXXFLAGS)) |
|
244 |
endif |
|
13164 | 245 |
|
20547 | 246 |
# Workaround for CFLAGS_JDKLIB containing ',' on solaris. If this is added as 'CFLAGS' to the |
247 |
# eval call below, the comma gets expanded too early. |
|
248 |
BUILD_DEMO_JVMTI_$1_CFLAGS := $(CFLAGS_JDKLIB) $(CFLAGS_DEBUG_SYMBOLS) \ |
|
25859 | 249 |
-I$(DEMO_SHARE_SRC)/jvmti/$1 $$(BUILD_DEMO_JVMTI_$1_EXTRA_INC) $3 |
13702 | 250 |
|
20547 | 251 |
# Remove the -incremental:no setting to get .ilk-files like in the old build. |
252 |
$$(eval $$(call SetupNativeCompilation,BUILD_DEMO_JVMTI_$1, \ |
|
25859 | 253 |
SRC := $(DEMO_SHARE_SRC)/jvmti/$1 $$(BUILD_DEMO_JVMTI_$1_EXTRA_SRC), \ |
29931
64e274ed6567
8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents:
29925
diff
changeset
|
254 |
TOOLCHAIN := $$(BUILD_DEMO_JVMTI_$1_TOOLCHAIN), \ |
20547 | 255 |
OPTIMIZATION := LOW, \ |
256 |
CXXFLAGS := $$($1_CXXFLAGS), \ |
|
29374
f031a666744a
8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents:
27799
diff
changeset
|
257 |
DISABLED_WARNINGS_gcc := $(10), \ |
f031a666744a
8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents:
27799
diff
changeset
|
258 |
DISABLED_WARNINGS_clang := $(12), \ |
f031a666744a
8074096: Disable (most) native warnings in JDK on a per-library basis
ihse
parents:
27799
diff
changeset
|
259 |
DISABLED_WARNINGS_microsoft := $(11), \ |
20547 | 260 |
LDFLAGS := $(filter-out -incremental:no -opt:ref, $(LDFLAGS_JDKLIB)), \ |
261 |
LDFLAGS_macosx := $(call SET_EXECUTABLE_ORIGIN), \ |
|
262 |
LDFLAGS_SUFFIX := $$($1_EXTRA_CXX), \ |
|
27736
8c9bd4be4a86
8058631: Rename posix to unix in build system to match file name changes
ihse
parents:
27194
diff
changeset
|
263 |
LDFLAGS_SUFFIX_unix := $5, \ |
20547 | 264 |
LDFLAGS_SUFFIX_windows := $6, \ |
265 |
LDFLAGS_SUFFIX_solaris := $7 -lc, \ |
|
266 |
LDFLAGS_SUFFIX_linux := $8, \ |
|
29925
6d47adfc6b47
8077847: Better handling of Windows executable manifest version
ihse
parents:
29392
diff
changeset
|
267 |
VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ |
20547 | 268 |
RC_FLAGS := $$(RC_FLAGS) \ |
269 |
-D "JDK_FNAME=$1.dll" \ |
|
270 |
-D "JDK_INTERNAL_NAME=$1" \ |
|
271 |
-D "JDK_FTYPE=0x2L", \ |
|
27565 | 272 |
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/demo/native/jvmti/$1, \ |
273 |
OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/demo/image/jvmti/$1/lib, \ |
|
20547 | 274 |
LIBRARY := $1)) |
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
275 |
|
20547 | 276 |
$$(eval $$(call SetupZipArchive,BUILD_DEMO_JVMTI_SRC_$1, \ |
25859 | 277 |
SRC := $(DEMO_SHARE_SRC)/jvmti/$1 $$(BUILD_DEMO_JVMTI_$1_EXTRA_SRC), \ |
20547 | 278 |
EXCLUDE_FILES := $$(BUILD_DEMO_JVMTI_$1_EXTRA_SRC_EXCLUDE), \ |
27565 | 279 |
ZIP := $(SUPPORT_OUTPUTDIR)/demo/image/jvmti/$1/src.zip)) |
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
280 |
|
27565 | 281 |
$(SUPPORT_OUTPUTDIR)/demo/image/jvmti/$1/README.txt: $(DEMO_SHARE_SRC)/jvmti/$1/README.txt |
20547 | 282 |
$$(call install-file) |
283 |
$(CHMOD) -f ug+w $$@ |
|
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
284 |
|
25859 | 285 |
ifneq (, $$(wildcard $(DEMO_SHARE_SRC)/jvmti/$1/*.java)) |
20547 | 286 |
$$(eval $$(call SetupJavaCompilation,BUILD_DEMO_JVMTI_$1_JAVA, \ |
287 |
SETUP := GENERATE_USINGJDKBYTECODE, \ |
|
25859 | 288 |
SRC := $(DEMO_SHARE_SRC)/jvmti/$1, \ |
27565 | 289 |
BIN := $(SUPPORT_OUTPUTDIR)/demo/classes/jvmti/$1, \ |
20547 | 290 |
COPY := $(PATTERNS_TO_COPY), \ |
27565 | 291 |
JAR := $(SUPPORT_OUTPUTDIR)/demo/image/jvmti/$1/$1.jar, \ |
20547 | 292 |
EXTRA_MANIFEST_ATTR := Main-Class: \n, \ |
21805 | 293 |
MANIFEST := $(JDK_TOPDIR)/make/data/mainmanifest/manifest.mf)) |
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
294 |
|
27565 | 295 |
BUILD_DEMOS += $(SUPPORT_OUTPUTDIR)/demo/image/jvmti/$1/$1.jar |
20547 | 296 |
endif |
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
297 |
|
20547 | 298 |
BUILD_DEMOS += $$(BUILD_DEMO_JVMTI_$1) \ |
27565 | 299 |
$(SUPPORT_OUTPUTDIR)/demo/image/jvmti/$1/src.zip \ |
300 |
$(SUPPORT_OUTPUTDIR)/demo/image/jvmti/$1/README.txt |
|
13702 | 301 |
|
20547 | 302 |
ifeq ($(OPENJDK_TARGET_OS), windows) |
303 |
# These files normally end up in OBJECT_DIR but for demos they |
|
304 |
# are supposed to be included in the distro. |
|
27565 | 305 |
$(SUPPORT_OUTPUTDIR)/demo/image/jvmti/$1/lib/$1.lib: $$(BUILD_DEMO_JVMTI_$1) |
306 |
$(CP) $(SUPPORT_OUTPUTDIR)/demo/native/jvmti/$1/$1.lib $$@ |
|
13702 | 307 |
|
27565 | 308 |
$(SUPPORT_OUTPUTDIR)/demo/image/jvmti/$1/lib/$1.exp: $$(BUILD_DEMO_JVMTI_$1) |
309 |
$(CP) $(SUPPORT_OUTPUTDIR)/demo/native/jvmti/$1/$1.exp $$@ |
|
13702 | 310 |
|
27565 | 311 |
BUILD_DEMOS += $(SUPPORT_OUTPUTDIR)/demo/image/jvmti/$1/lib/$1.lib \ |
312 |
$(SUPPORT_OUTPUTDIR)/demo/image/jvmti/$1/lib/$1.exp |
|
20547 | 313 |
endif |
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
314 |
endef |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
315 |
|
29392
89636c9b09d0
8074841: Resolve disabled warnings for the JVMTI demo compiledMethodLoad
sla
parents:
29374
diff
changeset
|
316 |
$(eval $(call SetupJVMTIDemo,compiledMethodLoad, agent_util)) |
20547 | 317 |
$(eval $(call SetupJVMTIDemo,gctest, agent_util)) |
318 |
$(eval $(call SetupJVMTIDemo,heapTracker, agent_util java_crw_demo)) |
|
319 |
$(eval $(call SetupJVMTIDemo,heapViewer, agent_util)) |
|
320 |
$(eval $(call SetupJVMTIDemo,minst, agent_util java_crw_demo)) |
|
321 |
$(eval $(call SetupJVMTIDemo,mtrace, agent_util java_crw_demo)) |
|
29392
89636c9b09d0
8074841: Resolve disabled warnings for the JVMTI demo compiledMethodLoad
sla
parents:
29374
diff
changeset
|
322 |
$(eval $(call SetupJVMTIDemo,waiters, agent_util, , C++)) |
20547 | 323 |
$(eval $(call SetupJVMTIDemo,versionCheck, agent_util)) |
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
324 |
|
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
325 |
################################################################################################## |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
326 |
|
27565 | 327 |
$(SUPPORT_OUTPUTDIR)/demo/image/management/index.html: $(DEMO_SHARE_SRC)/management/index.html |
16636
1cc691bcfe50
8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents:
15676
diff
changeset
|
328 |
$(call install-file) |
1cc691bcfe50
8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents:
15676
diff
changeset
|
329 |
$(CHMOD) -f ug+w $@ |
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
330 |
|
27565 | 331 |
$(SUPPORT_OUTPUTDIR)/demo/image/jvmti/index.html: $(DEMO_SHARE_SRC)/jvmti/index.html |
16636
1cc691bcfe50
8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents:
15676
diff
changeset
|
332 |
$(call install-file) |
1cc691bcfe50
8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents:
15676
diff
changeset
|
333 |
$(CHMOD) -f ug+w $@ |
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
334 |
|
27565 | 335 |
BUILD_DEMOS += $(SUPPORT_OUTPUTDIR)/demo/image/management/index.html \ |
336 |
$(SUPPORT_OUTPUTDIR)/demo/image/jvmti/index.html |
|
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
337 |
|
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
338 |
################################################################################################## |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
339 |
|
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
340 |
# The netbeans project files are copied into the demo directory. |
22067
3623b46a325d
8029513: SwingApplet demo files still found in JDK 8 on Solaris
ksrini
parents:
21854
diff
changeset
|
341 |
ifeq ($(OPENJDK_TARGET_OS), solaris) |
25859 | 342 |
BUILD_DEMOS += $(patsubst $(DEMO_SHARE_SRC)/nbproject/%, \ |
27565 | 343 |
$(SUPPORT_OUTPUTDIR)/demo/image/nbproject/%, \ |
25859 | 344 |
$(filter-out $(DEMO_SHARE_SRC)/nbproject/jfc/SwingApplet%, \ |
345 |
$(call CacheFind, $(DEMO_SHARE_SRC)/nbproject))) |
|
22067
3623b46a325d
8029513: SwingApplet demo files still found in JDK 8 on Solaris
ksrini
parents:
21854
diff
changeset
|
346 |
else |
25859 | 347 |
BUILD_DEMOS += $(patsubst $(DEMO_SHARE_SRC)/nbproject/%, \ |
27565 | 348 |
$(SUPPORT_OUTPUTDIR)/demo/image/nbproject/%, \ |
25859 | 349 |
$(call CacheFind, $(DEMO_SHARE_SRC)/nbproject)) |
22067
3623b46a325d
8029513: SwingApplet demo files still found in JDK 8 on Solaris
ksrini
parents:
21854
diff
changeset
|
350 |
endif |
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
351 |
|
27565 | 352 |
$(SUPPORT_OUTPUTDIR)/demo/image/nbproject/%: $(DEMO_SHARE_SRC)/nbproject/% |
16636
1cc691bcfe50
8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents:
15676
diff
changeset
|
353 |
$(call install-file) |
12892 | 354 |
$(CHMOD) -f ug+w $@ |
355 |
||
356 |
################################################################################################## |
|
357 |
||
27565 | 358 |
$(SUPPORT_OUTPUTDIR)/demo/image/README: $(DEMO_SHARE_SRC)/README |
16636
1cc691bcfe50
8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents:
15676
diff
changeset
|
359 |
$(call install-file) |
12892 | 360 |
|
27565 | 361 |
BUILD_DEMOS += $(SUPPORT_OUTPUTDIR)/demo/image/README |
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
362 |
|
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
363 |
################################################################################################## |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
364 |
|
13164 | 365 |
ifeq ($(OPENJDK_TARGET_OS), solaris) |
12892 | 366 |
|
27565 | 367 |
$(SUPPORT_OUTPUTDIR)/demo/classes/jni/Poller/%: $(DEMO_SOLARIS_SRC)/jni/Poller/% |
16636
1cc691bcfe50
8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents:
15676
diff
changeset
|
368 |
$(call install-file) |
1cc691bcfe50
8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents:
15676
diff
changeset
|
369 |
$(CHMOD) -f ug+w $@ |
12892 | 370 |
|
27565 | 371 |
$(SUPPORT_OUTPUTDIR)/demo/image/jni/Poller/README.txt: $(DEMO_SOLARIS_SRC)/jni/Poller/README.txt |
16636
1cc691bcfe50
8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents:
15676
diff
changeset
|
372 |
$(call install-file) |
1cc691bcfe50
8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents:
15676
diff
changeset
|
373 |
$(CHMOD) -f ug+w $@ |
12892 | 374 |
|
27565 | 375 |
$(SUPPORT_OUTPUTDIR)/demo/image/jni/Poller/Poller.jar: \ |
376 |
$(SUPPORT_OUTPUTDIR)/demo/classes/jni/Poller/README.txt \ |
|
377 |
$(SUPPORT_OUTPUTDIR)/demo/classes/jni/Poller/Poller.c |
|
12892 | 378 |
|
20547 | 379 |
$(eval $(call SetupJavaCompilation,BUILD_DEMO_POLLER_JAR, \ |
380 |
SETUP := GENERATE_USINGJDKBYTECODE, \ |
|
25859 | 381 |
SRC := $(DEMO_SOLARIS_SRC)/jni/Poller, \ |
27565 | 382 |
BIN := $(SUPPORT_OUTPUTDIR)/demo/classes/jni/Poller, \ |
383 |
HEADERS := $(SUPPORT_OUTPUTDIR)/demo/classes/jni/Poller, \ |
|
384 |
JAR := $(SUPPORT_OUTPUTDIR)/demo/image/jni/Poller/Poller.jar, \ |
|
21805 | 385 |
MANIFEST := $(JDK_TOPDIR)/make/data/mainmanifest/manifest.mf, \ |
27565 | 386 |
SRCZIP := $(SUPPORT_OUTPUTDIR)/demo/image/jni/Poller/src.zip, \ |
20547 | 387 |
COPY := README.txt Poller.c, \ |
388 |
JARMAIN := Client)) |
|
12892 | 389 |
|
390 |
||
391 |
||
27565 | 392 |
BUILD_DEMOS += $(SUPPORT_OUTPUTDIR)/demo/image/jni/Poller/Poller.jar \ |
393 |
$(SUPPORT_OUTPUTDIR)/demo/image/jni/Poller/src.zip \ |
|
394 |
$(SUPPORT_OUTPUTDIR)/demo/image/jni/Poller/README.txt |
|
12892 | 395 |
|
20547 | 396 |
$(eval $(call SetupNativeCompilation,BUILD_LIBPOLLER, \ |
25859 | 397 |
SRC := $(DEMO_SOLARIS_SRC)/jni/Poller, \ |
20547 | 398 |
OPTIMIZATION := LOW, \ |
30434 | 399 |
CFLAGS := $(CFLAGS_JDKLIB) \ |
27565 | 400 |
-I$(SUPPORT_OUTPUTDIR)/demo/classes/jni/Poller, \ |
20547 | 401 |
LDFLAGS := $(LDFLAGS_JDKLIB), \ |
402 |
LDFLAGS_SUFFIX_solaris := -lc, \ |
|
27565 | 403 |
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/demo/native/jni/Poller, \ |
404 |
OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/demo/native, \ |
|
20547 | 405 |
LIBRARY := Poller)) |
12892 | 406 |
|
20547 | 407 |
# |
408 |
# We can only compile native code after jar has been build (since we depend on generated .h files) |
|
409 |
# |
|
27565 | 410 |
$(SUPPORT_OUTPUTDIR)/demo/native/jni/Poller/Poller.o: $(SUPPORT_OUTPUTDIR)/demo/image/jni/Poller/Poller.jar |
12892 | 411 |
|
27565 | 412 |
$(SUPPORT_OUTPUTDIR)/demo/image/jni/Poller/lib/$(LIBRARY_PREFIX)Poller$(SHARED_LIBRARY_SUFFIX): \ |
413 |
$(SUPPORT_OUTPUTDIR)/demo/native/$(LIBRARY_PREFIX)Poller$(SHARED_LIBRARY_SUFFIX) |
|
16636
1cc691bcfe50
8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents:
15676
diff
changeset
|
414 |
$(call install-file) |
12892 | 415 |
|
27565 | 416 |
BUILD_DEMOS += $(SUPPORT_OUTPUTDIR)/demo/image/jni/Poller/lib/$(LIBRARY_PREFIX)Poller$(SHARED_LIBRARY_SUFFIX) |
12892 | 417 |
|
418 |
endif |
|
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
419 |
|
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
420 |
################################################################################################## |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
421 |
|
12892 | 422 |
ifndef OPENJDK |
25859 | 423 |
DB_ZIP_DIR := $(wildcard $(JDK_TOPDIR)/src/closed/db) |
424 |
DB_DEMO_ZIPFILE := $(wildcard $(DB_ZIP_DIR)/*.zip) |
|
12892 | 425 |
|
27565 | 426 |
$(SUPPORT_OUTPUTDIR)/demo/image/_the.db.unzipped: $(DB_DEMO_ZIPFILE) |
12892 | 427 |
$(MKDIR) -p $(@D) |
27565 | 428 |
$(RM) -r $(SUPPORT_OUTPUTDIR)/demo/image/db $(SUPPORT_OUTPUTDIR)/demo/image/demo |
429 |
$(CD) $(SUPPORT_OUTPUTDIR)/demo/image && $(UNZIP) -q -o $< |
|
430 |
$(MV) $(SUPPORT_OUTPUTDIR)/demo/image/db-derby-*-bin/demo $(SUPPORT_OUTPUTDIR)/demo/image/db |
|
431 |
$(CD) $(SUPPORT_OUTPUTDIR)/demo/image && $(RM) -r db-derby-*-bin |
|
12892 | 432 |
$(TOUCH) $@ |
433 |
||
20547 | 434 |
# Copy this after the unzip above to avoid race with directory creation and mv command. |
27565 | 435 |
$(SUPPORT_OUTPUTDIR)/demo/image/db/README-JDK-DEMOS.html: \ |
25859 | 436 |
$(DB_ZIP_DIR)/README-JDK-DEMOS.html \ |
27565 | 437 |
| $(SUPPORT_OUTPUTDIR)/demo/image/_the.db.unzipped |
17428 | 438 |
$(MKDIR) -p $(@D) |
25859 | 439 |
$(CAT) $< | $(SED) "s/XXXX/$(shell cat $(DB_ZIP_DIR)/COPYRIGHTYEAR)/" > $@ |
16636
1cc691bcfe50
8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents:
15676
diff
changeset
|
440 |
|
27565 | 441 |
BUILD_DEMOS += $(SUPPORT_OUTPUTDIR)/demo/image/_the.db.unzipped $(SUPPORT_OUTPUTDIR)/demo/image/db/README-JDK-DEMOS.html |
12892 | 442 |
endif |
443 |
||
444 |
################################################################################################## |
|
445 |
||
446 |
all: $(BUILD_DEMOS) |
|
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
447 |
|
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
448 |
.PHONY: all |