jdk/make/CompileDemos.gmk
author sspitsyn
Fri, 17 Jan 2014 02:13:40 -0800
changeset 22519 924605caa9a8
parent 22067 3623b46a325d
child 22606 9c09d5a52807
permissions -rw-r--r--
8030027: nsk/jvmti/scenarios/hotswap/HS101/hs101t006 Crashed the vm on Linux-amd64: SIGSEGV in JavaThread::last_java_vframe(RegisterMap*)+0xfa Summary: Add a safe guard to VMOp_GetCurrentLocation against non-walkable stack of target thread exiting from Java execution Reviewed-by: mgronlun, dholmes, sla, dcubed Contributed-by: serguei.spitsyn@oracle.com
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
17428
5c68e5cbfde0 8013403: Update JDK8 with Java DB 10.10.1.1.
dwanvik
parents: 16636
diff changeset
     1
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     2
#
21742
e61b55843e88 8028645: [infra] purge applet demos from the Solaris distros
ksrini
parents: 21535
diff changeset
     3
# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     4
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     5
#
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     6
# 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
     7
# 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
     8
# published by the Free Software Foundation.  Oracle designates this
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     9
# particular file as subject to the "Classpath" exception as provided
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    10
# by Oracle in the LICENSE file that accompanied this code.
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    11
#
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    12
# 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
    13
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    14
# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    15
# 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
    16
# accompanied this code).
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    17
#
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    18
# 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
    19
# 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
    20
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    21
#
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    22
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    23
# 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
    24
# questions.
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
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    27
default: all
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    28
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    29
include $(SPEC)
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    30
include MakeBase.gmk
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    31
include JavaCompilation.gmk
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    32
include NativeCompilation.gmk
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    33
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    34
# Setup the java compilers for the JDK build.
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    35
include Setup.gmk
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    36
15126
bceb690ccf35 8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents: 14596
diff changeset
    37
# Prepare the find cache. Only used if running on windows.
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
    38
$(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
    39
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    40
# Append demo goals to this variable.
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
    41
BUILD_DEMOS =
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    42
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    43
# The demo structure and contents should really be cleaned up.
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    44
# Now every other demo has its own quirks where to put the
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    45
# READMEs and other files.
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    46
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    47
##################################################################################################
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    48
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    49
define SetupAppletDemo
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
    50
  $$(eval $$(call SetupJavaCompilation,BUILD_DEMO_APPLET_$1, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
    51
      SETUP := GENERATE_USINGJDKBYTECODE, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
    52
      SRC := $(JDK_TOPDIR)/src/$3share/demo/applets/$1, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
    53
      BIN := $(JDK_OUTPUTDIR)/demo/applets/$1, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
    54
      COPY := .html .java .xyz .obj .au .gif, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
    55
      DISABLE_SJAVAC := $2))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
    56
      BUILD_DEMOS += $$(BUILD_DEMO_APPLET_$1)
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    57
endef
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    58
21742
e61b55843e88 8028645: [infra] purge applet demos from the Solaris distros
ksrini
parents: 21535
diff changeset
    59
ifneq ($(OPENJDK_TARGET_OS), solaris)
e61b55843e88 8028645: [infra] purge applet demos from the Solaris distros
ksrini
parents: 21535
diff changeset
    60
  $(eval $(call SetupAppletDemo,ArcTest))
e61b55843e88 8028645: [infra] purge applet demos from the Solaris distros
ksrini
parents: 21535
diff changeset
    61
  $(eval $(call SetupAppletDemo,BarChart))
e61b55843e88 8028645: [infra] purge applet demos from the Solaris distros
ksrini
parents: 21535
diff changeset
    62
  $(eval $(call SetupAppletDemo,Blink))
e61b55843e88 8028645: [infra] purge applet demos from the Solaris distros
ksrini
parents: 21535
diff changeset
    63
  $(eval $(call SetupAppletDemo,CardTest))
e61b55843e88 8028645: [infra] purge applet demos from the Solaris distros
ksrini
parents: 21535
diff changeset
    64
  $(eval $(call SetupAppletDemo,Clock))
e61b55843e88 8028645: [infra] purge applet demos from the Solaris distros
ksrini
parents: 21535
diff changeset
    65
  $(eval $(call SetupAppletDemo,DitherTest))
e61b55843e88 8028645: [infra] purge applet demos from the Solaris distros
ksrini
parents: 21535
diff changeset
    66
  $(eval $(call SetupAppletDemo,DrawTest))
e61b55843e88 8028645: [infra] purge applet demos from the Solaris distros
ksrini
parents: 21535
diff changeset
    67
  $(eval $(call SetupAppletDemo,Fractal))
e61b55843e88 8028645: [infra] purge applet demos from the Solaris distros
ksrini
parents: 21535
diff changeset
    68
  $(eval $(call SetupAppletDemo,GraphicsTest))
e61b55843e88 8028645: [infra] purge applet demos from the Solaris distros
ksrini
parents: 21535
diff changeset
    69
  $(eval $(call SetupAppletDemo,NervousText))
e61b55843e88 8028645: [infra] purge applet demos from the Solaris distros
ksrini
parents: 21535
diff changeset
    70
  $(eval $(call SetupAppletDemo,SimpleGraph))
e61b55843e88 8028645: [infra] purge applet demos from the Solaris distros
ksrini
parents: 21535
diff changeset
    71
  $(eval $(call SetupAppletDemo,SortDemo))
e61b55843e88 8028645: [infra] purge applet demos from the Solaris distros
ksrini
parents: 21535
diff changeset
    72
  $(eval $(call SetupAppletDemo,SpreadSheet))
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    73
21742
e61b55843e88 8028645: [infra] purge applet demos from the Solaris distros
ksrini
parents: 21535
diff changeset
    74
  ifndef OPENJDK
e61b55843e88 8028645: [infra] purge applet demos from the Solaris distros
ksrini
parents: 21535
diff changeset
    75
    $(eval $(call SetupAppletDemo,Animator,,closed/))
e61b55843e88 8028645: [infra] purge applet demos from the Solaris distros
ksrini
parents: 21535
diff changeset
    76
    $(eval $(call SetupAppletDemo,GraphLayout,true,closed/))
e61b55843e88 8028645: [infra] purge applet demos from the Solaris distros
ksrini
parents: 21535
diff changeset
    77
    $(eval $(call SetupAppletDemo,JumpingBox,,closed/))
e61b55843e88 8028645: [infra] purge applet demos from the Solaris distros
ksrini
parents: 21535
diff changeset
    78
    $(eval $(call SetupAppletDemo,TicTacToe,,closed/))
e61b55843e88 8028645: [infra] purge applet demos from the Solaris distros
ksrini
parents: 21535
diff changeset
    79
  endif
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    80
endif
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    81
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    82
##################################################################################################
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    83
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
    84
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
    85
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    86
define SetupDemo
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
    87
  # Param 1 = Name of the demo
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
    88
  # Param 2 = Subdirectory of the demo below the demo directory.
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
    89
  # Param 3 = Additional javac flags.
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
    90
  # Param 4 = The main class for the jar.
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
    91
  # Param 5 = Additional source directory.
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
    92
  # Param 6 = Extra dir below $(JDK_TOPDIR)/src (closed)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
    93
  # Param 7 = List of files to copy
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
    94
  # Param 8 = Base name of jar file. Defaults to $1
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
    95
  # Param 9 = Exclude list
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
    96
  # Param 10 = Extra copy patterns
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
    97
  # Param 11 = Extra manifest attribute
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
    98
  # Param 12 = Suffix for compiler setup name
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    99
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   100
  # In some demos the source is found in a subdir called src.
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   101
  $1_MAIN_SRC := $$(wildcard $(JDK_TOPDIR)/src/$6share/demo/$2/$1/src)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   102
  ifeq ($$($1_MAIN_SRC), )
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   103
    $1_MAIN_SRC := $(JDK_TOPDIR)/src/$6share/demo/$2/$1
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   104
  endif
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   105
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   106
  ifneq ($8, )
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   107
    $1_JARFILE := $8.jar
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   108
  else
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   109
    $1_JARFILE := $1.jar
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   110
  endif
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   111
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   112
  ifeq ($(findstring $1,Laffy SwingSet3), )
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   113
    $$(eval $$(call SetupJavaCompilation,BUILD_DEMO_$1, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   114
        SETUP := GENERATE_USINGJDKBYTECODE, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   115
        ADD_JAVAC_FLAGS := $3, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   116
        SRC := $$($1_MAIN_SRC) $5, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   117
        BIN := $(JDK_OUTPUTDIR)/democlasses/$2/$1, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   118
        COPY := $(PATTERNS_TO_COPY) $(10), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   119
        JAR := $(JDK_OUTPUTDIR)/demo/$2/$1/$$($1_JARFILE), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   120
        JARMAIN := $4, \
21805
c7d7946239de 8027566: Remove the old build system
ihse
parents: 20547
diff changeset
   121
        MANIFEST := $(JDK_TOPDIR)/make/data/mainmanifest/manifest.mf, \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   122
        EXTRA_MANIFEST_ATTR := $(11), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   123
        SRCZIP := $(JDK_OUTPUTDIR)/demo/$2/$1/src.zip, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   124
        EXCLUDE_FILES := $9, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   125
        DISABLE_SJAVAC := $(12)))
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   126
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   127
    BUILD_DEMOS += $$(BUILD_DEMO_$1) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   128
        $(JDK_OUTPUTDIR)/demo/$2/$1/$$($1_JARFILE) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   129
        $(JDK_OUTPUTDIR)/demo/$2/$1/src.zip
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   130
  endif
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   131
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   132
  # Copy files.
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   133
  $1_COPY_TARGETS := $$(patsubst $(JDK_TOPDIR)/src/$6share/demo/$2/$1/%, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   134
      $(JDK_OUTPUTDIR)/demo/$2/$1/%, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   135
      $$(wildcard $$(addprefix $(JDK_TOPDIR)/src/$6share/demo/$2/$1/, $7)))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   136
  ifneq ($7, )
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   137
    $(JDK_OUTPUTDIR)/demo/$2/$1/%: $(JDK_TOPDIR)/src/$6share/demo/$2/$1/%
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   138
	$$(call install-file)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   139
	$(CHMOD) -f ug+w $$@
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   140
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   141
    BUILD_DEMOS += $$($1_COPY_TARGETS)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   142
  endif
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   143
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   144
endef
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   145
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   146
$(eval $(call SetupDemo,CodePointIM,jfc,,CodePointIM,,,*.html))
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   147
$(JDK_OUTPUTDIR)/demo/jfc/CodePointIM/_the.services: \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   148
    $(JDK_OUTPUTDIR)/demo/jfc/CodePointIM/CodePointIM.jar \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   149
    $(JDK_TOPDIR)/src/share/demo/jfc/CodePointIM/java.awt.im.spi.InputMethodDescriptor
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   150
	(cd $(JDK_OUTPUTDIR)/demo/jfc/CodePointIM && \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   151
	$(MKDIR) -p _the.tmp/META-INF/services && \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   152
	$(CP) $(JDK_TOPDIR)/src/share/demo/jfc/CodePointIM/java.awt.im.spi.InputMethodDescriptor _the.tmp/META-INF/services && \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   153
	cd _the.tmp && \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   154
	$(JAR) uf $(JDK_OUTPUTDIR)/demo/jfc/CodePointIM/CodePointIM.jar META-INF/services/java.awt.im.spi.InputMethodDescriptor && \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   155
	cd META-INF/services && \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   156
	$(JAR) uf $(JDK_OUTPUTDIR)/demo/jfc/CodePointIM/CodePointIM.jar java.awt.im.spi.InputMethodDescriptor)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   157
	$(RM) -r $(JDK_OUTPUTDIR)/demo/jfc/CodePointIM/_the.tmp
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   158
	$(TOUCH) $@
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   159
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   160
BUILD_DEMOS += $(JDK_OUTPUTDIR)/demo/jfc/CodePointIM/_the.services
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   161
21742
e61b55843e88 8028645: [infra] purge applet demos from the Solaris distros
ksrini
parents: 21535
diff changeset
   162
ifneq ($(OPENJDK_TARGET_OS), solaris)
e61b55843e88 8028645: [infra] purge applet demos from the Solaris distros
ksrini
parents: 21535
diff changeset
   163
  $(eval $(call SetupDemo,MoleculeViewer,applets,,XYZChemModel,,,example*.html *.java))
e61b55843e88 8028645: [infra] purge applet demos from the Solaris distros
ksrini
parents: 21535
diff changeset
   164
  $(eval $(call SetupDemo,WireFrame,applets,,ThreeD,,,example*.html *.java))
e61b55843e88 8028645: [infra] purge applet demos from the Solaris distros
ksrini
parents: 21535
diff changeset
   165
  $(eval $(call SetupDemo,SwingApplet,jfc,,SwingApplet,,,README* *.html))
e61b55843e88 8028645: [infra] purge applet demos from the Solaris distros
ksrini
parents: 21535
diff changeset
   166
endif
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   167
$(eval $(call SetupDemo,FileChooserDemo,jfc,,FileChooserDemo,,,README*))
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   168
$(eval $(call SetupDemo,Font2DTest,jfc,,Font2DTest,,,*.html *.txt))
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   169
$(eval $(call SetupDemo,Metalworks,jfc,,Metalworks,,,README*))
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   170
$(eval $(call SetupDemo,Notepad,jfc,,Notepad,,,README*))
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   171
$(eval $(call SetupDemo,SampleTree,jfc,,SampleTree,,,README*))
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   172
$(eval $(call SetupDemo,TableExample,jfc,,TableExample,,,README*))
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   173
$(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
   174
$(eval $(call SetupDemo,jconsole-plugin,scripting,,,,,*.xml *.txt,,,,Main-Class: \n))
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   175
$(eval $(call SetupDemo,FullThreadDump,management,,FullThreadDump,,,README*))
14521
6196ce8b0c33 8001906: build-infra: warning: [path] bad path element on Solaris
tbell
parents: 14231
diff changeset
   176
$(eval $(call SetupDemo,JTop,management,,JTop,,,README*))
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   177
$(eval $(call SetupDemo,MemoryMonitor,management,,MemoryMonitor,,,README*))
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   178
$(eval $(call SetupDemo,VerboseGC,management,,VerboseGC,,,README*))
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   179
$(eval $(call SetupDemo,zipfs,nio,,,,,README* *.java,,,,Main-Class: \n))
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   180
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   181
ifndef OPENJDK
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   182
  $(eval $(call SetupDemo,Laffy,jfc,,,,closed/,*))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   183
  $(eval $(call SetupDemo,SwingSet3,jfc,,,,closed/,*))
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   184
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   185
  $(eval $(call SetupDemo,Java2D,jfc,,java2d.Java2Demo,,closed/,*.html README*,Java2Demo))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   186
  $(eval $(call SetupDemo,Stylepad,jfc,,Stylepad, \
21742
e61b55843e88 8028645: [infra] purge applet demos from the Solaris distros
ksrini
parents: 21535
diff changeset
   187
  $(JDK_TOPDIR)/src/share/demo/jfc/Notepad,closed/,*.txt,,$(JDK_TOPDIR)/src/share/demo/jfc/Notepad/README.txt))
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   188
  $(eval $(call SetupDemo,SwingSet2,jfc,,SwingSet2,,closed/,README* *.html,,,.java COPYRIGHT, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   189
      SplashScreen-Image: resources/images/splash.png,true))
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   190
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   191
  BUILD_DEMOS += $(patsubst $(JDK_TOPDIR)/src/closed/share/demo/nbproject/%, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   192
      $(JDK_OUTPUTDIR)/demo/nbproject/%, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   193
      $(call CacheFind, $(JDK_TOPDIR)/src/closed/share/demo/nbproject))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   194
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   195
  $(JDK_OUTPUTDIR)/demo/nbproject/%: $(JDK_TOPDIR)/src/closed/share/demo/nbproject/%
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   196
	$(call install-file)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   197
	$(CHMOD) -f ug+w $@
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   198
endif
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   199
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   200
##################################################################################################
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   201
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   202
# In the old makefiles, j2dbench was not compiled.
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   203
#$(eval $(call SetupDemo,J2DBench, java2d, /src, , j2dbench/J2DBench))
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   204
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   205
# JVMTI demos are a bit strange and share some files, but be careful the
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   206
# shared files are just the *.c and *.h files, not the README or sample
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   207
# makefiles. So we always exclude the README.txt and sample.makefile.txt
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   208
# from the extra sources.
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   209
define SetupJVMTIDemo
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   210
  # Param 1 = Name of the demo
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   211
  # Param 2 = add these directories to the includes, default is agent_util
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   212
  # Param 3 = extra CFLAGS
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   213
  # Param 4 = C or C++ (defaults to C)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   214
  # Param 5 = libs for posix
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   215
  # Param 6 = libs for windows
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   216
  # Param 7 = libs for solaris
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   217
  BUILD_DEMO_JVMTI_$1_EXTRA_SRC := \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   218
      $$(wildcard $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/demo/jvmti/$1) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   219
      $$(wildcard $$(addprefix $(JDK_TOPDIR)/src/share/demo/jvmti/, $2))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   220
  BUILD_DEMO_JVMTI_$1_EXTRA_SRC_EXCLUDE := \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   221
      $$(wildcard $$(addprefix $(JDK_TOPDIR)/src/share/demo/jvmti/, $2)/README.txt) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   222
      $$(wildcard $$(addprefix $(JDK_TOPDIR)/src/share/demo/jvmti/, $2)/sample.makefile.txt)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   223
  BUILD_DEMO_JVMTI_$1_EXTRA_INC := $$(addprefix -I, $$(BUILD_DEMO_JVMTI_$1_EXTRA_SRC))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   224
  BUILD_DEMO_JVMTI_$1_LANG := C
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   225
  ifneq (, $4)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   226
    BUILD_DEMO_JVMTI_$1_LANG := $4
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   227
  endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   228
  ifeq (C++, $4)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   229
    $1_EXTRA_CXX := $(LDFLAGS_CXX_JDK) $(LIBCXX)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   230
  endif
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   231
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   232
  $1_CXXFLAGS := $(CXXFLAGS_JDKLIB) -I$(JDK_TOPDIR)/src/share/demo/jvmti/$1 \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   233
      $$(BUILD_DEMO_JVMTI_$1_EXTRA_INC) $3 \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   234
      $(CXXFLAGS_DEBUG_SYMBOLS)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   235
  ifeq ($1-$(OPENJDK_TARGET_CPU_ARCH), waiters-sparc)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   236
    $1_FILTER := -xregs=no%appl
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   237
    $1_CXXFLAGS := $$(filter-out $$($1_FILTER), $$($1_CXXFLAGS))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   238
  endif
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   239
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   240
  # Workaround for CFLAGS_JDKLIB containing ',' on solaris. If this is added as 'CFLAGS' to the
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   241
  # eval call below, the comma gets expanded too early.
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   242
  BUILD_DEMO_JVMTI_$1_CFLAGS := $(CFLAGS_JDKLIB) $(CFLAGS_DEBUG_SYMBOLS) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   243
      -I$(JDK_TOPDIR)/src/share/demo/jvmti/$1 $$(BUILD_DEMO_JVMTI_$1_EXTRA_INC) $3
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   244
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   245
  # Remove the -incremental:no setting to get .ilk-files like in the old build.
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   246
  $$(eval $$(call SetupNativeCompilation,BUILD_DEMO_JVMTI_$1, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   247
      SRC := $(JDK_TOPDIR)/src/share/demo/jvmti/$1 $$(BUILD_DEMO_JVMTI_$1_EXTRA_SRC), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   248
      LANG := $$(BUILD_DEMO_JVMTI_$1_LANG), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   249
      OPTIMIZATION := LOW, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   250
      CXXFLAGS := $$($1_CXXFLAGS), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   251
      LDFLAGS := $(filter-out -incremental:no -opt:ref, $(LDFLAGS_JDKLIB)), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   252
      LDFLAGS_macosx := $(call SET_EXECUTABLE_ORIGIN), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   253
      LDFLAGS_SUFFIX := $$($1_EXTRA_CXX), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   254
      LDFLAGS_SUFFIX_posix := $5, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   255
      LDFLAGS_SUFFIX_windows := $6, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   256
      LDFLAGS_SUFFIX_solaris := $7 -lc, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   257
      LDFLAGS_SUFFIX_linux := $8, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   258
      VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   259
      RC_FLAGS := $$(RC_FLAGS) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   260
          -D "JDK_FNAME=$1.dll" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   261
          -D "JDK_INTERNAL_NAME=$1" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   262
          -D "JDK_FTYPE=0x2L", \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   263
      OBJECT_DIR := $(JDK_OUTPUTDIR)/demoobjs/jvmti/$1, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   264
      OUTPUT_DIR := $(JDK_OUTPUTDIR)/demo/jvmti/$1/lib, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   265
      LIBRARY := $1))
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   266
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   267
  $$(eval $$(call SetupZipArchive,BUILD_DEMO_JVMTI_SRC_$1, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   268
      SRC := $(JDK_TOPDIR)/src/share/demo/jvmti/$1 $$(BUILD_DEMO_JVMTI_$1_EXTRA_SRC), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   269
      EXCLUDE_FILES := $$(BUILD_DEMO_JVMTI_$1_EXTRA_SRC_EXCLUDE), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   270
      ZIP := $(JDK_OUTPUTDIR)/demo/jvmti/$1/src.zip))
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   271
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   272
  $(JDK_OUTPUTDIR)/demo/jvmti/$1/README.txt: $(JDK_TOPDIR)/src/share/demo/jvmti/$1/README.txt
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   273
	$$(call install-file)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   274
	$(CHMOD) -f ug+w $$@
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   275
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   276
  ifneq (, $$(wildcard $(JDK_TOPDIR)/src/share/demo/jvmti/$1/*.java))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   277
    $$(eval $$(call SetupJavaCompilation,BUILD_DEMO_JVMTI_$1_JAVA, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   278
        SETUP := GENERATE_USINGJDKBYTECODE, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   279
        SRC := $(JDK_TOPDIR)/src/share/demo/jvmti/$1, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   280
        BIN := $(JDK_OUTPUTDIR)/democlasses/jvmti/$1, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   281
        COPY := $(PATTERNS_TO_COPY), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   282
        JAR := $(JDK_OUTPUTDIR)/demo/jvmti/$1/$1.jar, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   283
        EXTRA_MANIFEST_ATTR := Main-Class: \n, \
21805
c7d7946239de 8027566: Remove the old build system
ihse
parents: 20547
diff changeset
   284
        MANIFEST := $(JDK_TOPDIR)/make/data/mainmanifest/manifest.mf))
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   285
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   286
    BUILD_DEMOS += $(JDK_OUTPUTDIR)/demo/jvmti/$1/$1.jar
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   287
  endif
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   288
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   289
  BUILD_DEMOS += $$(BUILD_DEMO_JVMTI_$1) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   290
      $(JDK_OUTPUTDIR)/demo/jvmti/$1/src.zip \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   291
      $(JDK_OUTPUTDIR)/demo/jvmti/$1/README.txt
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   292
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   293
  ifeq ($(OPENJDK_TARGET_OS), windows)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   294
    # These files normally end up in OBJECT_DIR but for demos they
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   295
    # are supposed to be included in the distro.
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   296
    $(JDK_OUTPUTDIR)/demo/jvmti/$1/lib/$1.lib: $$(BUILD_DEMO_JVMTI_$1)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   297
	$(CP) $(JDK_OUTPUTDIR)/demoobjs/jvmti/$1/$1.lib $$@
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   298
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   299
    $(JDK_OUTPUTDIR)/demo/jvmti/$1/lib/$1.exp: $$(BUILD_DEMO_JVMTI_$1)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   300
	$(CP) $(JDK_OUTPUTDIR)/demoobjs/jvmti/$1/$1.exp $$@
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   301
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   302
    BUILD_DEMOS += $(JDK_OUTPUTDIR)/demo/jvmti/$1/lib/$1.lib \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   303
        $(JDK_OUTPUTDIR)/demo/jvmti/$1/lib/$1.exp
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   304
  endif
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   305
endef
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   306
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   307
$(eval $(call SetupJVMTIDemo,compiledMethodLoad, agent_util))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   308
$(eval $(call SetupJVMTIDemo,gctest, agent_util))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   309
$(eval $(call SetupJVMTIDemo,heapTracker, agent_util java_crw_demo))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   310
$(eval $(call SetupJVMTIDemo,heapViewer, agent_util))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   311
$(eval $(call SetupJVMTIDemo,hprof, java_crw_demo, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   312
    -I$(JDK_TOPDIR)/src/share/npt -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/npt, C, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   313
    -ldl, ws2_32.lib winmm.lib, -lsocket -lnsl, -lpthread))
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   314
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   315
$(eval $(call SetupJVMTIDemo,minst, agent_util java_crw_demo))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   316
$(eval $(call SetupJVMTIDemo,mtrace, agent_util java_crw_demo))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   317
$(eval $(call SetupJVMTIDemo,waiters, agent_util, , C++))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   318
$(eval $(call SetupJVMTIDemo,versionCheck, agent_util))
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   319
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   320
##################################################################################################
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   321
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   322
# The jpda demo (com/sun/tools/example) is oddly enough stored in src/share/classes.
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   323
# At least, we do not need to compile the jpda demo, just jar/zip up the sources.
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   324
JPDA_SOURCES := $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/com/sun/tools/example)
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   325
# The number of files are few enough so that we can use echo safely below to list them.
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   326
JPDA_FILES := $(subst $(JDK_TOPDIR)/src/share/classes/,,$(JPDA_SOURCES))
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   327
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   328
$(JDK_OUTPUTDIR)/demo/jpda/src.zip: $(JPDA_SOURCES)
16636
1cc691bcfe50 8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents: 15676
diff changeset
   329
	$(MKDIR) -p $(@D)
1cc691bcfe50 8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents: 15676
diff changeset
   330
	(cd $(JDK_TOPDIR)/src/share/classes && $(ZIP) -qru $@ com -i "com/sun/tools/example/*")
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   331
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   332
$(JDK_OUTPUTDIR)/demo/jpda/examples.jar: $(JPDA_SOURCES)
16636
1cc691bcfe50 8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents: 15676
diff changeset
   333
	$(MKDIR) -p $(@D)
1cc691bcfe50 8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents: 15676
diff changeset
   334
	$(RM) $(@D)/_the.sources
1cc691bcfe50 8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents: 15676
diff changeset
   335
	$(call ListPathsSafely,JPDA_FILES,\n, >> $(@D)/_the.sources)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   336
	$(SED) -e "s#@@RELEASE@@#$(RELEASE)#" \
21805
c7d7946239de 8027566: Remove the old build system
ihse
parents: 20547
diff changeset
   337
	    -e "s#@@COMPANY_NAME@@#$(COMPANY_NAME)#" $(JDK_TOPDIR)/make/data/mainmanifest/manifest.mf > $(@D)/_the.manifest
16636
1cc691bcfe50 8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents: 15676
diff changeset
   338
	$(ECHO) "Main-Class: " >> $(@D)/_the.manifest
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   339
	(cd $(JDK_TOPDIR)/src/share/classes && $(JAR) cfm $@ $(@D)/_the.manifest @$(@D)/_the.sources)
16636
1cc691bcfe50 8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents: 15676
diff changeset
   340
	(cd $(JDK_TOPDIR)/src/share/classes/com/sun/tools/example && $(JAR) uf $@ README)
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   341
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   342
$(JDK_OUTPUTDIR)/demo/jpda/com/sun/tools/example/README: $(JDK_TOPDIR)/src/share/classes/com/sun/tools/example/README
16636
1cc691bcfe50 8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents: 15676
diff changeset
   343
	$(call install-file)
1cc691bcfe50 8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents: 15676
diff changeset
   344
	$(CHMOD) -f ug+w $@
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   345
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   346
BUILD_DEMOS += $(JDK_OUTPUTDIR)/demo/jpda/src.zip $(JDK_OUTPUTDIR)/demo/jpda/examples.jar \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   347
    $(JDK_OUTPUTDIR)/demo/jpda/com/sun/tools/example/README
12317
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
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   351
$(JDK_OUTPUTDIR)/demo/management/index.html: $(JDK_TOPDIR)/src/share/demo/management/index.html
16636
1cc691bcfe50 8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents: 15676
diff changeset
   352
	$(call install-file)
1cc691bcfe50 8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents: 15676
diff changeset
   353
	$(CHMOD) -f ug+w $@
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   354
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   355
$(JDK_OUTPUTDIR)/demo/jvmti/index.html: $(JDK_TOPDIR)/src/share/demo/jvmti/index.html
16636
1cc691bcfe50 8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents: 15676
diff changeset
   356
	$(call install-file)
1cc691bcfe50 8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents: 15676
diff changeset
   357
	$(CHMOD) -f ug+w $@
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   358
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   359
BUILD_DEMOS += $(JDK_OUTPUTDIR)/demo/management/index.html \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   360
    $(JDK_OUTPUTDIR)/demo/jvmti/index.html
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   361
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
# 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
   365
ifeq ($(OPENJDK_TARGET_OS), solaris)
3623b46a325d 8029513: SwingApplet demo files still found in JDK 8 on Solaris
ksrini
parents: 21854
diff changeset
   366
  BUILD_DEMOS += $(patsubst $(JDK_TOPDIR)/src/share/demo/nbproject/%, \
3623b46a325d 8029513: SwingApplet demo files still found in JDK 8 on Solaris
ksrini
parents: 21854
diff changeset
   367
    $(JDK_OUTPUTDIR)/demo/nbproject/%, \
3623b46a325d 8029513: SwingApplet demo files still found in JDK 8 on Solaris
ksrini
parents: 21854
diff changeset
   368
    $(filter-out $(JDK_TOPDIR)/src/share/demo/nbproject/jfc/SwingApplet%, \
3623b46a325d 8029513: SwingApplet demo files still found in JDK 8 on Solaris
ksrini
parents: 21854
diff changeset
   369
    $(call CacheFind, $(JDK_TOPDIR)/src/share/demo/nbproject)))
3623b46a325d 8029513: SwingApplet demo files still found in JDK 8 on Solaris
ksrini
parents: 21854
diff changeset
   370
else
3623b46a325d 8029513: SwingApplet demo files still found in JDK 8 on Solaris
ksrini
parents: 21854
diff changeset
   371
  BUILD_DEMOS += $(patsubst $(JDK_TOPDIR)/src/share/demo/nbproject/%, \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   372
    $(JDK_OUTPUTDIR)/demo/nbproject/%, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   373
    $(call CacheFind, $(JDK_TOPDIR)/src/share/demo/nbproject))
22067
3623b46a325d 8029513: SwingApplet demo files still found in JDK 8 on Solaris
ksrini
parents: 21854
diff changeset
   374
endif
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   375
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   376
$(JDK_OUTPUTDIR)/demo/nbproject/%: $(JDK_TOPDIR)/src/share/demo/nbproject/%
16636
1cc691bcfe50 8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents: 15676
diff changeset
   377
	$(call install-file)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   378
	$(CHMOD) -f ug+w $@
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   379
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   380
##################################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   381
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   382
$(JDK_OUTPUTDIR)/demo/README: $(JDK_TOPDIR)/src/share/demo/README
16636
1cc691bcfe50 8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents: 15676
diff changeset
   383
	$(call install-file)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   384
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   385
BUILD_DEMOS += $(JDK_OUTPUTDIR)/demo/README
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   386
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   387
##################################################################################################
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   388
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   389
ifeq ($(OPENJDK_TARGET_OS), solaris)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   390
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   391
  $(JDK_OUTPUTDIR)/democlasses/jni/Poller/%: $(JDK_TOPDIR)/src/solaris/demo/jni/Poller/%
16636
1cc691bcfe50 8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents: 15676
diff changeset
   392
	$(call install-file)
1cc691bcfe50 8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents: 15676
diff changeset
   393
	$(CHMOD) -f ug+w $@
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   394
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   395
  $(JDK_OUTPUTDIR)/demo/jni/Poller/README.txt: $(JDK_TOPDIR)/src/solaris/demo/jni/Poller/README.txt
16636
1cc691bcfe50 8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents: 15676
diff changeset
   396
	$(call install-file)
1cc691bcfe50 8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents: 15676
diff changeset
   397
	$(CHMOD) -f ug+w $@
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   398
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   399
  $(JDK_OUTPUTDIR)/demo/jni/Poller/Poller.jar: \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   400
      $(JDK_OUTPUTDIR)/democlasses/jni/Poller/README.txt $(JDK_OUTPUTDIR)/democlasses/jni/Poller/Poller.c
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   401
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   402
  $(eval $(call SetupJavaCompilation,BUILD_DEMO_POLLER_JAR, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   403
      SETUP := GENERATE_USINGJDKBYTECODE, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   404
      SRC := $(JDK_TOPDIR)/src/solaris/demo/jni/Poller, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   405
      BIN := $(JDK_OUTPUTDIR)/democlasses/jni/Poller, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   406
      HEADERS := $(JDK_OUTPUTDIR)/democlasses/jni/Poller, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   407
      JAR := $(JDK_OUTPUTDIR)/demo/jni/Poller/Poller.jar, \
21805
c7d7946239de 8027566: Remove the old build system
ihse
parents: 20547
diff changeset
   408
      MANIFEST := $(JDK_TOPDIR)/make/data/mainmanifest/manifest.mf, \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   409
      SRCZIP := $(JDK_OUTPUTDIR)/demo/jni/Poller/src.zip, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   410
      COPY := README.txt Poller.c, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   411
      JARMAIN := Client))
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   412
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   413
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   414
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   415
  BUILD_DEMOS += $(JDK_OUTPUTDIR)/demo/jni/Poller/Poller.jar $(JDK_OUTPUTDIR)/demo/jni/Poller/src.zip \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   416
      $(JDK_OUTPUTDIR)/demo/jni/Poller/README.txt
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   417
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   418
  $(eval $(call SetupNativeCompilation,BUILD_LIBPOLLER, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   419
      SRC := $(JDK_TOPDIR)/src/solaris/demo/jni/Poller, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   420
      LANG := C, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   421
      OPTIMIZATION := LOW, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   422
      CFLAGS := $(CFLAGS_JDKLIB) $(SHARED_LIBRARY_FLAGS) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   423
          -I$(JDK_OUTPUTDIR)/democlasses/jni/Poller, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   424
      LDFLAGS := $(LDFLAGS_JDKLIB), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   425
      LDFLAGS_SUFFIX_solaris := -lc, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   426
      OBJECT_DIR := $(JDK_OUTPUTDIR)/demoobjs/jni/Poller, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   427
      OUTPUT_DIR := $(JDK_OUTPUTDIR)/demoobjs, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   428
      LIBRARY := Poller))
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   429
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   430
  #
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   431
  # We can only compile native code after jar has been build (since we depend on generated .h files)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   432
  #
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   433
  $(JDK_OUTPUTDIR)/demoobjs/jni/Poller/Poller.o: $(JDK_OUTPUTDIR)/demo/jni/Poller/Poller.jar
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   434
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   435
  $(JDK_OUTPUTDIR)/demo/jni/Poller/lib/$(LIBRARY_PREFIX)Poller$(SHARED_LIBRARY_SUFFIX): \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   436
      $(JDK_OUTPUTDIR)/demoobjs/$(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
   437
	$(call install-file)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   438
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   439
  BUILD_DEMOS += $(JDK_OUTPUTDIR)/demo/jni/Poller/lib/$(LIBRARY_PREFIX)Poller$(SHARED_LIBRARY_SUFFIX)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   440
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   441
endif
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   442
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   443
##################################################################################################
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   444
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   445
ifndef OPENJDK
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   446
  DB_DEMO_ZIPFILE := $(wildcard $(JDK_TOPDIR)/src/closed/share/db/*.zip)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   447
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   448
  $(JDK_OUTPUTDIR)/demo/_the.db.unzipped: $(DB_DEMO_ZIPFILE)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   449
	$(MKDIR) -p $(@D)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   450
	$(RM) -r $(JDK_OUTPUTDIR)/demo/db $(JDK_OUTPUTDIR)/demo/demo
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   451
	$(CD) $(JDK_OUTPUTDIR)/demo && $(UNZIP) -q -o $<
17428
5c68e5cbfde0 8013403: Update JDK8 with Java DB 10.10.1.1.
dwanvik
parents: 16636
diff changeset
   452
	$(MV) $(JDK_OUTPUTDIR)/demo/db-derby-*-bin/demo $(JDK_OUTPUTDIR)/demo/db
5c68e5cbfde0 8013403: Update JDK8 with Java DB 10.10.1.1.
dwanvik
parents: 16636
diff changeset
   453
	$(CD) $(JDK_OUTPUTDIR)/demo && $(RM) -r db-derby-*-bin
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   454
	$(TOUCH) $@
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   455
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   456
  # Copy this after the unzip above to avoid race with directory creation and mv command.
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   457
  $(JDK_OUTPUTDIR)/demo/db/README-JDK-DEMOS.html: \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   458
      $(JDK_TOPDIR)/src/closed/share/db/README-JDK-DEMOS.html \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   459
      | $(JDK_OUTPUTDIR)/demo/_the.db.unzipped
17428
5c68e5cbfde0 8013403: Update JDK8 with Java DB 10.10.1.1.
dwanvik
parents: 16636
diff changeset
   460
	$(MKDIR) -p $(@D)
5c68e5cbfde0 8013403: Update JDK8 with Java DB 10.10.1.1.
dwanvik
parents: 16636
diff changeset
   461
	$(CAT) $< | $(SED) "s/XXXX/$(shell cat $(JDK_TOPDIR)/src/closed/share/db/COPYRIGHTYEAR)/" > $@
16636
1cc691bcfe50 8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents: 15676
diff changeset
   462
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20116
diff changeset
   463
  BUILD_DEMOS += $(JDK_OUTPUTDIR)/demo/_the.db.unzipped $(JDK_OUTPUTDIR)/demo/db/README-JDK-DEMOS.html
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   464
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   465
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   466
##################################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   467
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   468
all: $(BUILD_DEMOS)
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   469
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   470
.PHONY: all