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