jdk/make/CompileLaunchers.gmk
author coleenp
Wed, 21 May 2014 14:36:18 -0400
changeset 24658 e41df2fc6e87
parent 23679 525f54159d22
child 24686 611fe7d9ba10
permissions -rw-r--r--
8042727: nsk/jdb/unwatch/unwatch001 crash in InstanceKlass::methods_do(void (*)(Method*)) Summary: Only walk methods in instanceklass if the class is loaded Reviewed-by: dholmes, fparain
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
     1
#
23607
e019220f8ee8 8032443: Java Access Bridge version strings need to be fixed
ptbrunet
parents: 22993
diff changeset
     2
# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
     3
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
     4
#
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
     5
# This code is free software; you can redistribute it and/or modify it
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
     6
# under the terms of the GNU General Public License version 2 only, as
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
     7
# published by the Free Software Foundation.  Oracle designates this
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
     8
# particular file as subject to the "Classpath" exception as provided
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
     9
# by Oracle in the LICENSE file that accompanied this code.
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    10
#
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    11
# This code is distributed in the hope that it will be useful, but WITHOUT
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    12
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    13
# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    14
# version 2 for more details (a copy is included in the LICENSE file that
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    15
# accompanied this code).
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    16
#
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    17
# You should have received a copy of the GNU General Public License version
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    18
# 2 along with this work; if not, write to the Free Software Foundation,
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    19
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    20
#
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    21
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    22
# or visit www.oracle.com if you need additional information or have any
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    23
# questions.
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    24
#
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    25
20203
2e0b3aab117a 8019219: Fix typo in jdk/makefiles "default" targets
ihse
parents: 19399
diff changeset
    26
default: all
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    27
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    28
include $(SPEC)
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    29
include MakeBase.gmk
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    30
include NativeCompilation.gmk
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    31
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    32
# Setup the java compilers for the JDK build.
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    33
include Setup.gmk
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    34
23347
acb1d044a217 8037281: Improve CacheFind and enable on all platforms
erikj
parents: 22993
diff changeset
    35
# Prepare the find cache.
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    36
$(eval $(call FillCacheFind, $(JDK_TOPDIR)/src/share/bin))
15126
bceb690ccf35 8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents: 14523
diff changeset
    37
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    38
# Build tools
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    39
include Tools.gmk
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    40
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    41
BUILD_LAUNCHERS =
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    42
19399
e2e5122cd62e 5049299: (process) Use posix_spawn, not fork, on S10 to avoid swap exhaustion
robm
parents: 17732
diff changeset
    43
# When building a legacy overlay image (on solaris 64 bit), the launchers
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    44
# need to be built with a different rpath and a different output dir.
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    45
ifeq ($(OVERLAY_IMAGES), true)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    46
  ORIGIN_ROOT := /../..
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    47
  OUTPUT_SUBDIR := $(OPENJDK_TARGET_CPU_ISADIR)
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    48
else
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    49
  ORIGIN_ROOT := /..
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    50
endif
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    51
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    52
ifeq ($(OPENJDK_TARGET_OS), macosx)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    53
  ORIGIN_ARG := $(call SET_EXECUTABLE_ORIGIN)
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    54
else
20884
lana
parents: 20851 20547
diff changeset
    55
  ORIGIN_ARG := $(call SET_EXECUTABLE_ORIGIN,$(ORIGIN_ROOT)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli)
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    56
endif
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    57
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    58
#
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    59
# Applications expect to be able to link against libjawt without invoking
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    60
# System.loadLibrary("jawt") first. This was the behaviour described in the
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    61
# devloper documentation of JAWT and what worked with OpenJDK6.
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    62
#
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    63
ifneq ($(findstring $(OPENJDK_TARGET_OS), linux solaris), )
20884
lana
parents: 20851 20547
diff changeset
    64
  ORIGIN_ARG += $(call SET_EXECUTABLE_ORIGIN,$(ORIGIN_ROOT)/lib$(OPENJDK_TARGET_CPU_LIBDIR))
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    65
endif
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    66
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    67
define SetupLauncher
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    68
  # TODO: Fix mapfile on solaris. Won't work with ld as linker.
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    69
  # Parameter 1 is the name of the launcher (java, javac, jar...)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    70
  # Parameter 2 is extra CFLAGS
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    71
  # Parameter 3 is extra LDFLAGS
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    72
  # Parameter 4 is extra LDFLAGS_SUFFIX_posix
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    73
  # Parameter 5 is extra LDFLAGS_SUFFIX_windows
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    74
  # Parameter 6 is optional Windows JLI library (full path)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    75
  # Parameter 7 is optional Windows resource (RC) flags
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    76
  # Parameter 8 is optional Windows version resource file (.rc)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    77
  # Parameter 9 is different output dir
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    78
  # Parameter 10 if set, link statically with c runtime on windows.
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    79
  # Parameter 11 if set, override plist file on macosx.
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    80
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    81
  $1_WINDOWS_JLI_LIB := $(JDK_OUTPUTDIR)/objs/libjli/jli.lib
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    82
  ifneq ($6, )
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    83
    $1_WINDOWS_JLI_LIB := $6
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    84
  endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    85
  $1_VERSION_INFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    86
  ifneq ($8, )
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    87
    $1_VERSION_INFO_RESOURCE := $8
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    88
  endif
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    89
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    90
  $1_LDFLAGS := $3
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    91
  $1_LDFLAGS_SUFFIX :=
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    92
  ifeq ($(OPENJDK_TARGET_OS), macosx)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    93
    $1_PLIST_FILE := Info-cmdline.plist
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    94
    ifneq ($(11), )
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    95
      $1_PLIST_FILE := $(11)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    96
      ifneq ($$(findstring privileged, $$($1_PLIST_FILE)), )
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    97
        $1_CODESIGN := true
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    98
      endif
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    99
    endif
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   100
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   101
    $1_LDFLAGS += -Wl,-all_load $(JDK_OUTPUTDIR)/objs/libjli_static.a \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   102
        -framework Cocoa -framework Security -framework ApplicationServices \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   103
        -sectcreate __TEXT __info_plist $(JDK_TOPDIR)/src/macosx/lib/$$($1_PLIST_FILE)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   104
        $1_LDFLAGS_SUFFIX += -pthread
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   105
  endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   106
22594
kvn
parents: 22593 21399
diff changeset
   107
  ifeq ($(OPENJDK_TARGET_OS), aix)
kvn
parents: 22593 21399
diff changeset
   108
    $1_LDFLAGS_SUFFIX += -L$(JDK_OUTPUTDIR)/objs -ljli_static
kvn
parents: 22593 21399
diff changeset
   109
  endif
kvn
parents: 22593 21399
diff changeset
   110
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   111
  ifeq ($(USE_EXTERNAL_LIBZ), true)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   112
    $1_LDFLAGS_SUFFIX += -lz
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   113
  endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   114
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   115
  $1_OUTPUT_DIR_ARG := $9
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   116
  ifeq (, $$($1_OUTPUT_DIR_ARG))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   117
    $1_OUTPUT_DIR_ARG := $(JDK_OUTPUTDIR)/bin
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   118
  endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   119
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   120
  # TODO: maybe it's better to move this if-statement out of this function
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   121
  ifeq ($1, java)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   122
    $1_OPTIMIZATION_ARG := HIGH
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   123
    $1_LDFLAGS_solaris := -R$(OPENWIN_HOME)/lib$(OPENJDK_TARGET_CPU_ISADIR)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   124
  else
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   125
  $1_OPTIMIZATION_ARG := LOW
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   126
  endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   127
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   128
  $1_CFLAGS := $(CFLAGS_JDKEXE)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   129
  ifeq ($(10), true)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   130
    $1_CFLAGS := $(filter-out -MD, $(CFLAGS_JDKEXE))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   131
  endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   132
22594
kvn
parents: 22593 21399
diff changeset
   133
  # The linker on older SuSE distros (e.g. on SLES 10) complains with:
kvn
parents: 22593 21399
diff changeset
   134
  # "Invalid version tag `SUNWprivate_1.1'. Only anonymous version tag is allowed in executable."
kvn
parents: 22593 21399
diff changeset
   135
  # if feeded with a version script which contains named tags.
kvn
parents: 22593 21399
diff changeset
   136
  ifeq ($(USING_BROKEN_SUSE_LD),yes)
22598
kvn
parents: 22596 21820
diff changeset
   137
    ifneq ($(wildcard $(JDK_TOPDIR)/make/mapfiles/launchers/mapfile-$(OPENJDK_TARGET_CPU).anonymous), )
kvn
parents: 22596 21820
diff changeset
   138
      $1_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/launchers/mapfile-$(OPENJDK_TARGET_CPU).anonymous
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   139
    else
22594
kvn
parents: 22593 21399
diff changeset
   140
      $1_MAPFILE :=
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   141
    endif
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   142
  else
22598
kvn
parents: 22596 21820
diff changeset
   143
    ifneq ($(wildcard $(JDK_TOPDIR)/make/mapfiles/launchers/mapfile-$(OPENJDK_TARGET_CPU)), )
kvn
parents: 22596 21820
diff changeset
   144
      $1_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/launchers/mapfile-$(OPENJDK_TARGET_CPU)
22594
kvn
parents: 22593 21399
diff changeset
   145
    else
kvn
parents: 22593 21399
diff changeset
   146
      $1_MAPFILE :=
kvn
parents: 22593 21399
diff changeset
   147
    endif
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   148
  endif
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   149
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   150
  $(call SetupNativeCompilation,BUILD_LAUNCHER_$1, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   151
      SRC := $(JDK_TOPDIR)/src/share/bin, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   152
      INCLUDE_FILES := main.c, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   153
      LANG := C, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   154
      OPTIMIZATION := $$($1_OPTIMIZATION_ARG), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   155
      CFLAGS := $$($1_CFLAGS) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   156
          -I$(JDK_TOPDIR)/src/share/bin \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   157
          -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/bin \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   158
          -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS)/bin \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   159
          -DFULL_VERSION='"$(FULL_VERSION)"' \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   160
          -DJDK_MAJOR_VERSION='"$(JDK_MAJOR_VERSION)"' \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   161
          -DJDK_MINOR_VERSION='"$(JDK_MINOR_VERSION)"' \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   162
          -DLAUNCHER_NAME='"$(LAUNCHER_NAME)"' \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   163
          -DPROGNAME='"$1"' $(DPACKAGEPATH) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   164
          $2, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   165
      CFLAGS_linux := -fPIC, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   166
      CFLAGS_solaris := -KPIC -DHAVE_GETHRTIME, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   167
      LDFLAGS := $(LDFLAGS_JDKEXE) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   168
          $(ORIGIN_ARG) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   169
          $$($1_LDFLAGS), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   170
      LDFLAGS_macosx := $(call SET_SHARED_LIBRARY_NAME,$1), \
21606
1984e107a4b3 8027755: Anti-delta incorrect push for 8025198
dholmes
parents: 21605
diff changeset
   171
      LDFLAGS_linux := -lpthread \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   172
          $(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)$(SHARED_LIBRARY_SUFFIX)), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   173
      LDFLAGS_solaris := $$($1_LDFLAGS_solaris) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   174
          $(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)$(SHARED_LIBRARY_SUFFIX)), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   175
      MAPFILE := $$($1_MAPFILE), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   176
      LDFLAGS_SUFFIX := $(LDFLAGS_JDKEXE_SUFFIX) $$($1_LDFLAGS_SUFFIX), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   177
      LDFLAGS_SUFFIX_posix := $4, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   178
      LDFLAGS_SUFFIX_windows := $$($1_WINDOWS_JLI_LIB) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   179
          $(JDK_OUTPUTDIR)/objs/libjava/java.lib advapi32.lib $5, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   180
      LDFLAGS_SUFFIX_linux := -L$(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli -ljli $(LIBDL) -lc, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   181
      LDFLAGS_SUFFIX_solaris := -L$(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli -ljli -lthread $(LIBDL) -lc, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   182
      OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/$1_objs$(OUTPUT_SUBDIR), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   183
      OUTPUT_DIR := $$($1_OUTPUT_DIR_ARG)$(OUTPUT_SUBDIR), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   184
      PROGRAM := $1, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   185
      DEBUG_SYMBOLS := true, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   186
      VERSIONINFO_RESOURCE := $$($1_VERSION_INFO_RESOURCE), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   187
      RC_FLAGS := $(RC_FLAGS) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   188
          -D "JDK_FNAME=$1$(EXE_SUFFIX)" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   189
          -D "JDK_INTERNAL_NAME=$1" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   190
          -D "JDK_FTYPE=0x1L" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   191
          $7, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   192
      MANIFEST := $(JDK_TOPDIR)/src/windows/resource/java.manifest, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   193
      CODESIGN := $$($1_CODESIGN))
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   194
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   195
  BUILD_LAUNCHERS += $$(BUILD_LAUNCHER_$1)
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   196
22594
kvn
parents: 22593 21399
diff changeset
   197
  ifneq (,$(filter $(OPENJDK_TARGET_OS), macosx aix))
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   198
    $$(BUILD_LAUNCHER_$1): $(JDK_OUTPUTDIR)/objs/libjli_static.a
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   199
  endif
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   200
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   201
  ifeq ($(OPENJDK_TARGET_OS), windows)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   202
    $$(BUILD_LAUNCHER_$1): $(JDK_OUTPUTDIR)/objs/libjava/java.lib \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   203
        $$($1_WINDOWS_JLI_LIB)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   204
  endif
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   205
endef
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   206
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   207
##########################################################################################
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   208
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   209
XLIBS := $(X_LIBS) -lX11
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   210
ifeq ($(OPENJDK_TARGET_OS), macosx)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   211
  DPACKAGEPATH := -DPACKAGE_PATH='"$(PACKAGE_PATH)"'
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   212
  XLIBS :=
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   213
endif
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   214
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   215
ifdef OPENJDK
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   216
  JAVA_RC_FLAGS += -i "$(JDK_TOPDIR)/src/windows/resource/icons"
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   217
else
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   218
  JAVA_RC_FLAGS += -i "$(JDK_TOPDIR)/src/closed/windows/native/sun/windows"
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   219
endif
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   220
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   221
# On windows, the debuginfo files get the same name as for java.dll. Build
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   222
# into another dir and copy selectively so debuginfo for java.dll isn't
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   223
# overwritten.
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   224
$(eval $(call SetupLauncher,java, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   225
    -DEXPAND_CLASSPATH_WILDCARDS,,,user32.lib comctl32.lib, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   226
    $(JDK_OUTPUTDIR)/objs/jli_static.lib, $(JAVA_RC_FLAGS), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   227
    $(JDK_TOPDIR)/src/windows/resource/java.rc, $(JDK_OUTPUTDIR)/objs/java_objs,true))
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   228
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   229
$(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/java$(EXE_SUFFIX): $(BUILD_LAUNCHER_java)
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   230
	$(MKDIR) -p $(@D)
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   231
	$(RM) $@
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   232
	$(CP) $(JDK_OUTPUTDIR)/objs/java_objs$(OUTPUT_SUBDIR)/java$(EXE_SUFFIX) $@
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   233
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   234
BUILD_LAUNCHERS += $(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/java$(EXE_SUFFIX)
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   235
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   236
ifeq ($(OPENJDK_TARGET_OS), windows)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   237
  $(eval $(call SetupLauncher,javaw, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   238
      -DJAVAW -DEXPAND_CLASSPATH_WILDCARDS,,,user32.lib comctl32.lib, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   239
      $(JDK_OUTPUTDIR)/objs/jli_static.lib, $(JAVA_RC_FLAGS), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   240
      $(JDK_TOPDIR)/src/windows/resource/java.rc,,true))
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   241
endif
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   242
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   243
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   244
ifndef BUILD_HEADLESS_ONLY
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   245
  $(eval $(call SetupLauncher,appletviewer, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   246
      -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.applet.Main"$(COMMA) }',, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   247
      $(XLIBS)))
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   248
endif
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   249
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   250
$(eval $(call SetupLauncher,extcheck, \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   251
    -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.extcheck.Main"$(COMMA) }'))
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   252
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   253
$(eval $(call SetupLauncher,idlj, \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   254
    -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.corba.se.idl.toJavaPortable.Compile"$(COMMA) }'))
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   255
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   256
$(eval $(call SetupLauncher,jar, \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   257
    -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.tools.jar.Main"$(COMMA) }'))
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   258
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   259
$(eval $(call SetupLauncher,jarsigner, \
14523
643702cd3aa8 8003960: build-infra: Jarsigner launcher has wrong classname
erikj
parents: 14235
diff changeset
   260
    -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.security.tools.jarsigner.Main"$(COMMA) }'))
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   261
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   262
$(eval $(call SetupLauncher,javac, \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   263
    -DEXPAND_CLASSPATH_WILDCARDS \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   264
    -DNEVER_ACT_AS_SERVER_CLASS_MACHINE \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   265
    -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.javac.Main"$(COMMA) }'))
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   266
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   267
ifeq ($(ENABLE_SJAVAC), yes)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   268
  $(eval $(call SetupLauncher,sjavac, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   269
      -DEXPAND_CLASSPATH_WILDCARDS \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   270
      -DNEVER_ACT_AS_SERVER_CLASS_MACHINE \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   271
      -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.sjavac.Main"$(COMMA) }'))
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   272
endif
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   273
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   274
$(eval $(call SetupLauncher,javadoc, \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   275
    -DEXPAND_CLASSPATH_WILDCARDS \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   276
    -DNEVER_ACT_AS_SERVER_CLASS_MACHINE \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   277
    -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.javadoc.Main"$(COMMA) }'))
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   278
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   279
$(eval $(call SetupLauncher,javah, \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   280
    -DEXPAND_CLASSPATH_WILDCARDS \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   281
    -DNEVER_ACT_AS_SERVER_CLASS_MACHINE \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   282
    -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.javah.Main"$(COMMA) }'))
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   283
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   284
$(eval $(call SetupLauncher,javap, \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   285
    -DEXPAND_CLASSPATH_WILDCARDS \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   286
    -DNEVER_ACT_AS_SERVER_CLASS_MACHINE \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   287
    -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.javap.Main"$(COMMA) }'))
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   288
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   289
$(eval $(call SetupLauncher,jdeps, \
14994
a544909d1d1c 8003562: Provide a CLI tool to analyze class dependencies
mchung
parents: 14523
diff changeset
   290
    -DEXPAND_CLASSPATH_WILDCARDS \
a544909d1d1c 8003562: Provide a CLI tool to analyze class dependencies
mchung
parents: 14523
diff changeset
   291
    -DNEVER_ACT_AS_SERVER_CLASS_MACHINE \
a544909d1d1c 8003562: Provide a CLI tool to analyze class dependencies
mchung
parents: 14523
diff changeset
   292
    -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.jdeps.Main"$(COMMA) }'))
a544909d1d1c 8003562: Provide a CLI tool to analyze class dependencies
mchung
parents: 14523
diff changeset
   293
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   294
BUILD_LAUNCHER_jconsole_CFLAGS_windows := -DJAVAW
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   295
BUILD_LAUNCHER_jconsole_LDFLAGS_windows := user32.lib
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   296
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   297
$(eval $(call SetupLauncher,jconsole, \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   298
    -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "-J-Djconsole.showOutputViewer"$(COMMA) "sun.tools.jconsole.JConsole"$(COMMA) }' \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   299
    -DAPP_CLASSPATH='{ "/lib/jconsole.jar"$(COMMA) "/lib/tools.jar"$(COMMA) "/classes" }'))
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   300
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   301
$(eval $(call SetupLauncher,jdb, \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   302
    -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.example.debug.tty.TTY"$(COMMA) }' \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   303
    -DAPP_CLASSPATH='{ "/lib/tools.jar"$(COMMA) "/lib/sa-jdi.jar"$(COMMA) "/classes" }'))
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   304
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   305
$(eval $(call SetupLauncher,jhat, \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   306
    -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.hat.Main"$(COMMA) }'))
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   307
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   308
$(eval $(call SetupLauncher,jinfo, \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   309
    -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   310
        "-J-Dsun.jvm.hotspot.debugger.useProcDebugger"$(COMMA) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   311
        "-J-Dsun.jvm.hotspot.debugger.useWindbgDebugger"$(COMMA) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   312
        "sun.tools.jinfo.JInfo"$(COMMA) }' \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   313
    -DAPP_CLASSPATH='{ "/lib/tools.jar"$(COMMA) "/lib/sa-jdi.jar"$(COMMA) "/classes" }' \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   314
    ,,,,,,,,,Info-privileged.plist))
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   315
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   316
$(eval $(call SetupLauncher,jmap, \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   317
    -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   318
        "-J-Dsun.jvm.hotspot.debugger.useProcDebugger"$(COMMA) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   319
        "-J-Dsun.jvm.hotspot.debugger.useWindbgDebugger"$(COMMA) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   320
        "sun.tools.jmap.JMap"$(COMMA) }' \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   321
    -DAPP_CLASSPATH='{ "/lib/tools.jar"$(COMMA) "/lib/sa-jdi.jar"$(COMMA) "/classes" }' \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   322
    ,,,,,,,,,Info-privileged.plist))
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   323
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   324
$(eval $(call SetupLauncher,jps, \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   325
    -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.tools.jps.Jps"$(COMMA) }'))
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   326
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   327
$(eval $(call SetupLauncher,jrunscript, \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   328
    -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.script.shell.Main"$(COMMA) }'))
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   329
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   330
$(eval $(call SetupLauncher,jjs, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   331
    -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "jdk.nashorn.tools.Shell"$(COMMA) }'))
16029
4e88242da117 8008914: Add nashorn to the tl build
jjg
parents: 15334
diff changeset
   332
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   333
$(eval $(call SetupLauncher,jsadebugd, \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   334
    -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.jvm.hotspot.jdi.SADebugServer"$(COMMA) }' \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   335
    -DAPP_CLASSPATH='{ "/lib/tools.jar"$(COMMA) "/lib/sa-jdi.jar"$(COMMA) "/classes" }' \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   336
    ,,,,,,,,,Info-privileged.plist))
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   337
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   338
$(eval $(call SetupLauncher,jstack, \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   339
    -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   340
        "-J-Dsun.jvm.hotspot.debugger.useProcDebugger"$(COMMA) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   341
        "-J-Dsun.jvm.hotspot.debugger.useWindbgDebugger"$(COMMA) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   342
        "sun.tools.jstack.JStack"$(COMMA) }' \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   343
    -DAPP_CLASSPATH='{ "/lib/tools.jar"$(COMMA) "/lib/sa-jdi.jar"$(COMMA) "/classes" }' \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   344
    ,,,,,,,,,Info-privileged.plist))
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   345
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   346
$(eval $(call SetupLauncher,jstat, \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   347
    -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.tools.jstat.Jstat"$(COMMA) }'))
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   348
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   349
$(eval $(call SetupLauncher,jstatd, \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   350
    -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.tools.jstatd.Jstatd"$(COMMA) }'))
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   351
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   352
$(eval $(call SetupLauncher,keytool, \
14235
katleman
parents: 14182 14231
diff changeset
   353
    -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.security.tools.keytool.Main"$(COMMA) }'))
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   354
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   355
$(eval $(call SetupLauncher,native2ascii, \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   356
    -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.tools.native2ascii.Main"$(COMMA) }'))
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   357
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   358
ifndef BUILD_HEADLESS_ONLY
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   359
  $(eval $(call SetupLauncher,policytool, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   360
      -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.security.tools.policytool.PolicyTool"$(COMMA) }',, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   361
      $(XLIBS)))
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   362
endif
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   363
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   364
$(eval $(call SetupLauncher,rmic, \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   365
    -DEXPAND_CLASSPATH_WILDCARDS \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   366
    -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.rmi.rmic.Main"$(COMMA) }'))
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   367
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   368
$(eval $(call SetupLauncher,schemagen, \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   369
    -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.internal.jxc.SchemaGenerator"$(COMMA) }'))
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   370
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   371
$(eval $(call SetupLauncher,serialver, \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   372
    -DEXPAND_CLASSPATH_WILDCARDS \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   373
    -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.tools.serialver.SerialVer"$(COMMA) }'))
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   374
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   375
$(eval $(call SetupLauncher,xjc, \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   376
    -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.internal.xjc.Driver"$(COMMA) }'))
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   377
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   378
$(eval $(call SetupLauncher,wsgen, \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   379
    -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.internal.ws.WsGen"$(COMMA) }'))
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   380
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   381
$(eval $(call SetupLauncher,wsimport, \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   382
    -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.internal.ws.WsImport"$(COMMA) }'))
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   383
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   384
$(eval $(call SetupLauncher,orbd, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   385
    -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   386
        "-J-Dcom.sun.CORBA.activation.DbDir=./orb.db"$(COMMA) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   387
        "-J-Dcom.sun.CORBA.activation.Port=1049"$(COMMA) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   388
        "-J-Dcom.sun.CORBA.POA.ORBServerId=1"$(COMMA) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   389
        "com.sun.corba.se.impl.activation.ORBD"$(COMMA) }'))
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   390
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   391
$(eval $(call SetupLauncher,servertool, \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   392
    -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.corba.se.impl.activation.ServerTool"$(COMMA) }'))
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   393
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   394
$(eval $(call SetupLauncher,tnameserv, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   395
    -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   396
        "-J-Dcom.sun.CORBA.activation.DbDir=./orb.db"$(COMMA) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   397
        "-J-Djava.util.logging.LoggingPermission=contol"$(COMMA) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   398
        "-J-Dcom.sun.CORBA.POA.ORBServerId=1"$(COMMA) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   399
        "com.sun.corba.se.impl.naming.cosnaming.TransientNameServer"$(COMMA) }'))
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   400
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   401
$(eval $(call SetupLauncher,pack200, \
21820
701e0b95a267 8027900: pack200 option is broken due to the incorrect makefile definition for its driver
kizune
parents: 21805
diff changeset
   402
    -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.java.util.jar.pack.Driver"$(COMMA) }'))
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   403
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   404
$(eval $(call SetupLauncher,rmid, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   405
    -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.rmi.server.Activation"$(COMMA) }'))
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   406
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   407
$(eval $(call SetupLauncher,rmiregistry, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   408
    -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.rmi.registry.RegistryImpl"$(COMMA) }'))
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   409
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   410
$(eval $(call SetupLauncher,jcmd, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   411
    -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.tools.jcmd.JCmd"$(COMMA) }'))
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   412
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   413
ifeq ($(OPENJDK_TARGET_OS), windows)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   414
  $(eval $(call SetupLauncher,kinit, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   415
      -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.security.krb5.internal.tools.Kinit"$(COMMA) }'))
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   416
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   417
  $(eval $(call SetupLauncher,klist, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   418
      -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.security.krb5.internal.tools.Klist"$(COMMA) }'))
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   419
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   420
  $(eval $(call SetupLauncher,ktab, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   421
      -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.security.krb5.internal.tools.Ktab"$(COMMA) }'))
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   422
endif
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   423
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   424
##########################################################################################
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   425
# The order of the object files on the link command line affects the size of the resulting
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   426
# binary (at least on linux) which causes the size to differ between old and new build.
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   427
ifeq ($(USE_EXTERNAL_LIBZ), true)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   428
  UNPACKEXE_CFLAGS := -DSYSTEM_ZLIB
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   429
  UNPACKEXE_ZIPOBJS := -lz
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   430
else
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   431
  UNPACKEXE_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/java/util/zip/zlib-1.2.5
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   432
  UNPACKEXE_ZIPOBJS := $(JDK_OUTPUTDIR)/objs/libzip/zcrc32$(OBJ_SUFFIX) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   433
      $(JDK_OUTPUTDIR)/objs/libzip/deflate$(OBJ_SUFFIX) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   434
      $(JDK_OUTPUTDIR)/objs/libzip/trees$(OBJ_SUFFIX) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   435
      $(JDK_OUTPUTDIR)/objs/libzip/zadler32$(OBJ_SUFFIX) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   436
      $(JDK_OUTPUTDIR)/objs/libzip/compress$(OBJ_SUFFIX) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   437
      $(JDK_OUTPUTDIR)/objs/libzip/zutil$(OBJ_SUFFIX) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   438
      $(JDK_OUTPUTDIR)/objs/libzip/inflate$(OBJ_SUFFIX) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   439
      $(JDK_OUTPUTDIR)/objs/libzip/infback$(OBJ_SUFFIX) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   440
      $(JDK_OUTPUTDIR)/objs/libzip/inftrees$(OBJ_SUFFIX) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   441
      $(JDK_OUTPUTDIR)/objs/libzip/inffast$(OBJ_SUFFIX)
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   442
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   443
endif
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   444
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   445
ifeq ($(OPENJDK_TARGET_CPU_ARCH), sparc)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   446
  UNPACKEXE_CFLAGS += -xregs=no%appl
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   447
  UNPACKEXE_LDFLAGS_solaris += -xmemalign=4s
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   448
endif
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   449
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   450
UNPACKEXE_LANG := C
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   451
ifeq ($(OPENJDK_TARGET_OS), solaris)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   452
  UNPACKEXE_LANG := C++
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   453
endif
22272
4cbb04a368cb 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21820
diff changeset
   454
UNPACKEXE_DEBUG_SYMBOLS := true
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   455
# On windows, unpack200 is linked completely differently to all other
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   456
# executables, using the compiler with the compiler arguments.
19399
e2e5122cd62e 5049299: (process) Use posix_spawn, not fork, on S10 to avoid swap exhaustion
robm
parents: 17732
diff changeset
   457
# It's also linked incrementally, producing a .ilk file that needs to
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   458
# be kept away.
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   459
ifeq ($(OPENJDK_TARGET_OS), windows)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   460
  BUILD_UNPACKEXE_LDEXE := $(CC)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   461
  EXE_OUT_OPTION_save := $(EXE_OUT_OPTION)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   462
  EXE_OUT_OPTION := -Fe
22272
4cbb04a368cb 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21820
diff changeset
   463
  # With the current way unpack200 is built, debug symbols aren't supported
4cbb04a368cb 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21820
diff changeset
   464
  # anyway.
4cbb04a368cb 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21820
diff changeset
   465
  UNPACKEXE_DEBUG_SYMBOLS :=
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   466
endif
22587
28bea2d65a18 8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents: 17732
diff changeset
   467
28bea2d65a18 8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents: 17732
diff changeset
   468
# The linker on older SuSE distros (e.g. on SLES 10) complains with:
28bea2d65a18 8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents: 17732
diff changeset
   469
# "Invalid version tag `SUNWprivate_1.1'. Only anonymous version tag is allowed in executable."
28bea2d65a18 8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents: 17732
diff changeset
   470
# if feeded with a version script which contains named tags.
22594
kvn
parents: 22593 21399
diff changeset
   471
ifeq ($(USING_BROKEN_SUSE_LD), yes)
22598
kvn
parents: 22596 21820
diff changeset
   472
  UNPACK_MAPFILE = $(JDK_TOPDIR)/make/mapfiles/libunpack/mapfile-vers-unpack200.anonymous
22587
28bea2d65a18 8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents: 17732
diff changeset
   473
else
22598
kvn
parents: 22596 21820
diff changeset
   474
  UNPACK_MAPFILE = $(JDK_TOPDIR)/make/mapfiles/libunpack/mapfile-vers-unpack200
22587
28bea2d65a18 8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents: 17732
diff changeset
   475
endif
28bea2d65a18 8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents: 17732
diff changeset
   476
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   477
$(eval $(call SetupNativeCompilation,BUILD_UNPACKEXE, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   478
    SRC := $(JDK_TOPDIR)/src/share/native/com/sun/java/util/jar/pack, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   479
    EXCLUDE_FILES := jni.cpp, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   480
    LANG := $(UNPACKEXE_LANG), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   481
    OPTIMIZATION := LOW, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   482
    CFLAGS := $(UNPACKEXE_CFLAGS) $(CXXFLAGS_JDKEXE) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   483
        -DFULL, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   484
    CFLAGS_release := -DPRODUCT, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   485
    CFLAGS_linux := -fPIC, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   486
    CFLAGS_solaris := -KPIC, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   487
    CFLAGS_macosx := -fPIC, \
22594
kvn
parents: 22593 21399
diff changeset
   488
    MAPFILE := $(UNPACK_MAPFILE),\
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   489
    LDFLAGS := $(UNPACKEXE_ZIPOBJS), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   490
    LDFLAGS_windows := $(CXXFLAGS_JDKEXE), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   491
    LDFLAGS_posix := $(LDFLAGS_JDKEXE) $(LDFLAGS_CXX_JDK) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   492
        $(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)unpack$(SHARED_LIBRARY_SUFFIX)) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   493
        $(call SET_SHARED_LIBRARY_ORIGIN), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   494
    LDFLAGS_linux := -lc, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   495
    LDFLAGS_solaris := $(UNPACKEXE_LDFLAGS_solaris) -lc, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   496
    LDFLAGS_SUFFIX := $(LIBCXX), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   497
    OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/unpackexe$(OUTPUT_SUBDIR), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   498
    OUTPUT_DIR := $(JDK_OUTPUTDIR)/objs/unpackexe$(OUTPUT_SUBDIR), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   499
    PROGRAM := unpack200, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   500
    VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   501
    RC_FLAGS := $(RC_FLAGS) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   502
        -D "JDK_FNAME=unpack200.exe" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   503
        -D "JDK_INTERNAL_NAME=unpack200" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   504
        -D "JDK_FTYPE=0x1L", \
22272
4cbb04a368cb 8025936: Windows .pdb and .map files does not have proper dependencies setup
erikj
parents: 21820
diff changeset
   505
    DEBUG_SYMBOLS := $(UNPACKEXE_DEBUG_SYMBOLS), \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   506
    MANIFEST := $(JDK_TOPDIR)/src/windows/resource/unpack200_proto.exe.manifest))
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   507
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   508
ifeq ($(OPENJDK_TARGET_OS), windows)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   509
  EXE_OUT_OPTION := $(EXE_OUT_OPTION_save)
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   510
endif
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   511
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   512
ifneq ($(USE_EXTERNAL_LIBZ), true)
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   513
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   514
  $(BUILD_UNPACKEXE): $(UNPACKEXE_ZIPOBJS)
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   515
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   516
endif
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   517
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   518
# Build into object dir and copy executable afterwards to avoid .ilk file in
19399
e2e5122cd62e 5049299: (process) Use posix_spawn, not fork, on S10 to avoid swap exhaustion
robm
parents: 17732
diff changeset
   519
# image. The real fix would be clean up linking of unpack200 using
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   520
# -link -incremental:no
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   521
# like all other launchers.
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   522
$(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/unpack200$(EXE_SUFFIX): $(BUILD_UNPACKEXE)
16636
1cc691bcfe50 8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents: 16029
diff changeset
   523
	$(call install-file)
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   524
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   525
BUILD_LAUNCHERS += $(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/unpack200$(EXE_SUFFIX)
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   526
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   527
##########################################################################################
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   528
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   529
19399
e2e5122cd62e 5049299: (process) Use posix_spawn, not fork, on S10 to avoid swap exhaustion
robm
parents: 17732
diff changeset
   530
BUILD_JEXEC :=
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   531
BUILD_JEXEC_SRC :=
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   532
BUILD_JEXEC_INC :=
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   533
BUILD_JEXEC_DST_DIR := $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   534
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   535
#
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   536
# UNHANDLED:
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   537
# - COMPILE_APPROACH = normal
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   538
#
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   539
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   540
#
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   541
# jdk/make/java/Makefile
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   542
#
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   543
ifeq ($(OPENJDK_TARGET_OS), solaris)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   544
  ifeq ($(OPENJDK_TARGET_CPU_BITS), 32)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   545
    BUILD_JEXEC := 1
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   546
  endif
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   547
endif
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   548
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   549
ifeq ($(OPENJDK_TARGET_OS), linux)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   550
  BUILD_JEXEC := 1
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   551
endif # OPENJDK_TARGET_OS
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   552
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   553
#
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   554
# jdk/make/java/jexec/Makefile
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   555
#
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   556
ifeq ($(BUILD_JEXEC), 1)
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   557
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   558
  ifeq ($(OPENJDK_TARGET_OS), windows)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   559
  else ifeq ($(OPENJDK_TARGET_OS), macosx)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   560
    BUILD_JEXEC_SRC := $(JDK_TOPDIR)/src/macosx/bin
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   561
  else
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   562
    BUILD_JEXEC_SRC := $(JDK_TOPDIR)/src/solaris/bin
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   563
  endif
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   564
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   565
  ifeq ($(OPENJDK_TARGET_OS), linux)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   566
    BUILD_JEXEC_DST_DIR := $(JDK_OUTPUTDIR)/lib
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   567
    BUILD_JEXEC_INC += -I$(JDK_TOPDIR)/src/share/bin
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   568
  endif
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   569
endif
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   570
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   571
#
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   572
# Note that the two Makefile's seems to contradict each other,
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   573
# and that src/macosx/bin/jexec.c seems unused
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   574
#
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   575
ifneq ($(BUILD_JEXEC_SRC), )
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   576
  $(eval $(call SetupNativeCompilation,BUILD_JEXEC, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   577
      SRC := $(BUILD_JEXEC_SRC), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   578
      INCLUDE_FILES := jexec.c, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   579
      LANG := C, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   580
      OPTIMIZATION := LOW, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   581
      CFLAGS := $(CFLAGS_JDKEXE) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   582
          $(BUILD_JEXEC_INC), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   583
      CFLAGS_linux := -fPIC, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   584
      CFLAGS_solaris := -KPIC, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   585
      LDFLAGS := $(LDFLAGS_JDKEXE) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   586
          $(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)$(SHARED_LIBRARY_SUFFIX)), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   587
      OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/jexec_obj, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   588
      OUTPUT_DIR := $(BUILD_JEXEC_DST_DIR), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   589
      DEBUG_SYMBOLS := true, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   590
      PROGRAM := jexec))
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   591
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   592
  BUILD_LAUNCHERS += $(BUILD_JEXEC)
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   593
endif
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   594
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   595
##########################################################################################
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   596
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   597
#
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   598
# The java-rmi.cgi script in bin/ only gets delivered in certain situations
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   599
#
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   600
JAVA_RMI_CGI := $(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/java-rmi.cgi
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   601
ifeq ($(OPENJDK_TARGET_OS), linux)
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   602
  BUILD_LAUNCHERS += $(JAVA_RMI_CGI)
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   603
endif
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   604
ifeq ($(OPENJDK_TARGET_OS), solaris)
20894
e76b60e555d7 8026974: solaris build missing java-rmi.cgi
cl
parents: 20547
diff changeset
   605
  BUILD_LAUNCHERS += $(JAVA_RMI_CGI)
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   606
endif
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   607
19399
e2e5122cd62e 5049299: (process) Use posix_spawn, not fork, on S10 to avoid swap exhaustion
robm
parents: 17732
diff changeset
   608
# TODO:
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   609
# On windows java-rmi.cgi shouldn't be bundled since Java 1.2, but has been built all
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   610
# this time anyway. Since jdk6, it has been built from the wrong source and resulted
19399
e2e5122cd62e 5049299: (process) Use posix_spawn, not fork, on S10 to avoid swap exhaustion
robm
parents: 17732
diff changeset
   611
# in a (almost) copy of the standard java launcher named "java-rmi.exe" ending up in
e2e5122cd62e 5049299: (process) Use posix_spawn, not fork, on S10 to avoid swap exhaustion
robm
parents: 17732
diff changeset
   612
# the final images bin dir. This weird behavior is mimicked here in the converted
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   613
# makefiles for now. Should probably just be deleted.
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   614
# http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6512052
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   615
ifeq ($(OPENJDK_TARGET_OS), windows)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   616
  $(eval $(call SetupLauncher,java-rmi, , \
21805
c7d7946239de 8027566: Remove the old build system
ihse
parents: 21606
diff changeset
   617
      $(call SET_SHARED_LIBRARY_MAPFILE,$(JDK_TOPDIR)/make/java/main/java/mapfile-$(OPENJDK_TARGET_CPU))))
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   618
else
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   619
  $(JAVA_RMI_CGI): $(JDK_TOPDIR)/src/solaris/bin/java-rmi.cgi.sh
16636
1cc691bcfe50 8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents: 16029
diff changeset
   620
	$(call install-file)
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   621
	$(CHMOD) a+x $@
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   622
endif
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   623
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   624
##########################################################################################
19399
e2e5122cd62e 5049299: (process) Use posix_spawn, not fork, on S10 to avoid swap exhaustion
robm
parents: 17732
diff changeset
   625
e2e5122cd62e 5049299: (process) Use posix_spawn, not fork, on S10 to avoid swap exhaustion
robm
parents: 17732
diff changeset
   626
BUILD_JSPAWNHELPER :=
e2e5122cd62e 5049299: (process) Use posix_spawn, not fork, on S10 to avoid swap exhaustion
robm
parents: 17732
diff changeset
   627
BUILD_JSPAWNHELPER_SRC := $(JDK_TOPDIR)/src/solaris/native/java/lang
e2e5122cd62e 5049299: (process) Use posix_spawn, not fork, on S10 to avoid swap exhaustion
robm
parents: 17732
diff changeset
   628
BUILD_JSPAWNHELPER_DST_DIR := $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)
e2e5122cd62e 5049299: (process) Use posix_spawn, not fork, on S10 to avoid swap exhaustion
robm
parents: 17732
diff changeset
   629
LINK_JSPAWNHELPER_OBJECTS := $(JDK_OUTPUTDIR)/objs/libjava/childproc.o
e2e5122cd62e 5049299: (process) Use posix_spawn, not fork, on S10 to avoid swap exhaustion
robm
parents: 17732
diff changeset
   630
LINK_JSPAWNHELPER_FLAGS :=
e2e5122cd62e 5049299: (process) Use posix_spawn, not fork, on S10 to avoid swap exhaustion
robm
parents: 17732
diff changeset
   631
22595
aaa6b141196c 8028066: PPC64: 8025715 changes broke AIX build after sync
simonis
parents: 22594
diff changeset
   632
ifneq ($(findstring $(OPENJDK_TARGET_OS), macosx solaris aix), )
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   633
  BUILD_JSPAWNHELPER := 1
19399
e2e5122cd62e 5049299: (process) Use posix_spawn, not fork, on S10 to avoid swap exhaustion
robm
parents: 17732
diff changeset
   634
endif
e2e5122cd62e 5049299: (process) Use posix_spawn, not fork, on S10 to avoid swap exhaustion
robm
parents: 17732
diff changeset
   635
e2e5122cd62e 5049299: (process) Use posix_spawn, not fork, on S10 to avoid swap exhaustion
robm
parents: 17732
diff changeset
   636
ifeq ($(OPENJDK_TARGET_OS), macosx)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   637
  BUILD_JSPAWNHELPER_DST_DIR := $(JDK_OUTPUTDIR)/lib
19399
e2e5122cd62e 5049299: (process) Use posix_spawn, not fork, on S10 to avoid swap exhaustion
robm
parents: 17732
diff changeset
   638
endif
e2e5122cd62e 5049299: (process) Use posix_spawn, not fork, on S10 to avoid swap exhaustion
robm
parents: 17732
diff changeset
   639
e2e5122cd62e 5049299: (process) Use posix_spawn, not fork, on S10 to avoid swap exhaustion
robm
parents: 17732
diff changeset
   640
ifeq ($(OPENJDK_TARGET_CPU_BITS), 64)
22595
aaa6b141196c 8028066: PPC64: 8025715 changes broke AIX build after sync
simonis
parents: 22594
diff changeset
   641
  LINK_JSPAWNHELPER_FLAGS += $(COMPILER_TARGET_BITS_FLAG)64
19399
e2e5122cd62e 5049299: (process) Use posix_spawn, not fork, on S10 to avoid swap exhaustion
robm
parents: 17732
diff changeset
   642
endif
e2e5122cd62e 5049299: (process) Use posix_spawn, not fork, on S10 to avoid swap exhaustion
robm
parents: 17732
diff changeset
   643
e2e5122cd62e 5049299: (process) Use posix_spawn, not fork, on S10 to avoid swap exhaustion
robm
parents: 17732
diff changeset
   644
ifeq ($(BUILD_JSPAWNHELPER), 1)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   645
  $(eval $(call SetupNativeCompilation,BUILD_JSPAWNHELPER, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   646
      SRC := $(BUILD_JSPAWNHELPER_SRC), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   647
      INCLUDE_FILES := jspawnhelper.c, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   648
      LANG := C, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   649
      OPTIMIZATION := LOW, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   650
      CFLAGS := $(CFLAGS_JDKEXE), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   651
      LDFLAGS := $(LDFLAGS_JDKEXE) $(LINK_JSPAWNHELPER_FLAGS), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   652
      LDFLAGS_SUFFIX := $(LINK_JSPAWNHELPER_OBJECTS), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   653
      OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/jspawnhelper, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   654
      OUTPUT_DIR := $(BUILD_JSPAWNHELPER_DST_DIR), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   655
      PROGRAM := jspawnhelper))
19399
e2e5122cd62e 5049299: (process) Use posix_spawn, not fork, on S10 to avoid swap exhaustion
robm
parents: 17732
diff changeset
   656
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   657
  $(BUILD_JSPAWNHELPER): $(LINK_JSPAWNHELPER_OBJECTS)
19399
e2e5122cd62e 5049299: (process) Use posix_spawn, not fork, on S10 to avoid swap exhaustion
robm
parents: 17732
diff changeset
   658
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   659
  BUILD_LAUNCHERS += $(BUILD_JSPAWNHELPER)
19399
e2e5122cd62e 5049299: (process) Use posix_spawn, not fork, on S10 to avoid swap exhaustion
robm
parents: 17732
diff changeset
   660
endif
e2e5122cd62e 5049299: (process) Use posix_spawn, not fork, on S10 to avoid swap exhaustion
robm
parents: 17732
diff changeset
   661
e2e5122cd62e 5049299: (process) Use posix_spawn, not fork, on S10 to avoid swap exhaustion
robm
parents: 17732
diff changeset
   662
##########################################################################################
15324
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14994
diff changeset
   663
# jabswitch
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14994
diff changeset
   664
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14994
diff changeset
   665
ifndef OPENJDK
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   666
  ifeq ($(OPENJDK_TARGET_OS), windows)
15324
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14994
diff changeset
   667
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   668
    $(eval $(call SetupNativeCompilation,BUILD_JABSWITCH, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   669
        SRC := $(JDK_TOPDIR)/src/closed/windows/native/sun/bridge, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   670
        INCLUDE_FILES := jabswitch.cpp, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   671
        LANG := C++, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   672
        CFLAGS := $(filter-out -Zc:wchar_t-, $(CFLAGS_JDKEXE)) -Zc:wchar_t \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   673
            -analyze- -Od -Gd -D_WINDOWS \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   674
            -D_UNICODE -DUNICODE -RTC1 -EHsc, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   675
        LDFLAGS := $(LDFLAGS_JDKEXE) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   676
            Advapi32.lib Version.lib User32.lib, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   677
        OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/jabswitch, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   678
        OUTPUT_DIR := $(JDK_OUTPUTDIR)/bin, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   679
        PROGRAM := jabswitch, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   680
        DEBUG_SYMBOLS := true, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   681
        VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/closed/windows/native/sun/bridge/AccessBridgeStatusWindow.rc, \
23607
e019220f8ee8 8032443: Java Access Bridge version strings need to be fixed
ptbrunet
parents: 22993
diff changeset
   682
        RC_FLAGS := $(RC_FLAGS) \
e019220f8ee8 8032443: Java Access Bridge version strings need to be fixed
ptbrunet
parents: 22993
diff changeset
   683
            -D "JDK_FNAME=jabswitch.exe" \
e019220f8ee8 8032443: Java Access Bridge version strings need to be fixed
ptbrunet
parents: 22993
diff changeset
   684
            -D "JDK_INTERNAL_NAME=jabswitch" \
e019220f8ee8 8032443: Java Access Bridge version strings need to be fixed
ptbrunet
parents: 22993
diff changeset
   685
            -D "JDK_FTYPE=0x01L", \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   686
        MANIFEST := $(JDK_TOPDIR)/src/closed/windows/native/sun/bridge/jabswitch.manifest))
15324
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14994
diff changeset
   687
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14994
diff changeset
   688
    BUILD_LAUNCHERS += $(BUILD_JABSWITCH)
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14994
diff changeset
   689
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   690
  endif
15324
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14994
diff changeset
   691
endif
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14994
diff changeset
   692
74584166bb07 8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents: 14994
diff changeset
   693
##########################################################################################
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   694
21805
c7d7946239de 8027566: Remove the old build system
ihse
parents: 21606
diff changeset
   695
$(BUILD_LAUNCHERS): $(JDK_TOPDIR)/make/CompileLaunchers.gmk
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   696
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   697
all: $(BUILD_LAUNCHERS)
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   698
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   699
.PHONY: all