jdk/make/gensrc/GensrcIcons.gmk
author ihse
Tue, 11 Oct 2016 09:50:04 +0200
changeset 41472 ca054ba21d38
parent 39504 96c700e62710
permissions -rw-r--r--
8167424: Various trivial fixes in build system Reviewed-by: erikj, tbell
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
     1
#
41472
ca054ba21d38 8167424: Various trivial fixes in build system
ihse
parents: 39504
diff changeset
     2
# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
     3
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
     4
#
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
     5
# This code is free software; you can redistribute it and/or modify it
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
     6
# under the terms of the GNU General Public License version 2 only, as
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
     7
# published by the Free Software Foundation.  Oracle designates this
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
     8
# particular file as subject to the "Classpath" exception as provided
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
     9
# by Oracle in the LICENSE file that accompanied this code.
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    10
#
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    11
# This code is distributed in the hope that it will be useful, but WITHOUT
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    12
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    13
# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    14
# version 2 for more details (a copy is included in the LICENSE file that
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    15
# accompanied this code).
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    16
#
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    17
# You should have received a copy of the GNU General Public License version
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    18
# 2 along with this work; if not, write to the Free Software Foundation,
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    19
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    20
#
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    21
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    22
# or visit www.oracle.com if you need additional information or have any
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    23
# questions.
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    24
#
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    25
39504
96c700e62710 8003593: build-infra: Paths to optional platform-specific files should not be hardwired to src/closed
erikj
parents: 35241
diff changeset
    26
$(eval $(call IncludeCustomExtension, jdk, gensrc/GensrcIcons.gmk))
96c700e62710 8003593: build-infra: Paths to optional platform-specific files should not be hardwired to src/closed
erikj
parents: 35241
diff changeset
    27
18241
3e009b5be123 8003559: Update display of applet windows
leonidr
parents: 14429
diff changeset
    28
GENSRC_AWT_ICONS :=
3e009b5be123 8003559: Update display of applet windows
leonidr
parents: 14429
diff changeset
    29
GENSRC_AWT_ICONS_SRC :=
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 25859
diff changeset
    30
GENSRC_AWT_ICONS_TMP := $(SUPPORT_OUTPUTDIR)/gensrc/java.desktop
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 25859
diff changeset
    31
GENSRC_AWT_ICONS_DST := $(GENSRC_AWT_ICONS_TMP)/sun/awt/
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    32
39504
96c700e62710 8003593: build-infra: Paths to optional platform-specific files should not be hardwired to src/closed
erikj
parents: 35241
diff changeset
    33
# Allow this to be overridden from a custom makefile
96c700e62710 8003593: build-infra: Paths to optional platform-specific files should not be hardwired to src/closed
erikj
parents: 35241
diff changeset
    34
X11_ICONS_PATH_PREFIX ?= $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    35
18241
3e009b5be123 8003559: Update display of applet windows
leonidr
parents: 14429
diff changeset
    36
GENSRC_AWT_ICONS_SRC += \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    37
    $(X11_ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon16.png \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    38
    $(X11_ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon24.png \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    39
    $(X11_ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon32.png \
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    40
    $(X11_ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon48.png
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    41
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    42
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 22957
diff changeset
    43
AWT_ICONPATH := $(JDK_TOPDIR)/src/java.desktop/share/classes/sun/awt/resources
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    44
18241
3e009b5be123 8003559: Update display of applet windows
leonidr
parents: 14429
diff changeset
    45
GENSRC_AWT_ICONS_SRC += \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 18241
diff changeset
    46
    $(AWT_ICONPATH)/security-icon-bw16.png \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 18241
diff changeset
    47
    $(AWT_ICONPATH)/security-icon-interim16.png \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 18241
diff changeset
    48
    $(AWT_ICONPATH)/security-icon-yellow16.png \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 18241
diff changeset
    49
    $(AWT_ICONPATH)/security-icon-bw24.png \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 18241
diff changeset
    50
    $(AWT_ICONPATH)/security-icon-interim24.png \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 18241
diff changeset
    51
    $(AWT_ICONPATH)/security-icon-yellow24.png \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 18241
diff changeset
    52
    $(AWT_ICONPATH)/security-icon-bw32.png \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 18241
diff changeset
    53
    $(AWT_ICONPATH)/security-icon-interim32.png \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 18241
diff changeset
    54
    $(AWT_ICONPATH)/security-icon-yellow32.png \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 18241
diff changeset
    55
    $(AWT_ICONPATH)/security-icon-bw48.png \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 18241
diff changeset
    56
    $(AWT_ICONPATH)/security-icon-interim48.png \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 18241
diff changeset
    57
    $(AWT_ICONPATH)/security-icon-yellow48.png
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    58
18241
3e009b5be123 8003559: Update display of applet windows
leonidr
parents: 14429
diff changeset
    59
GENSRC_AWT_ICONS_FILES := $(notdir $(GENSRC_AWT_ICONS_SRC))
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    60
18241
3e009b5be123 8003559: Update display of applet windows
leonidr
parents: 14429
diff changeset
    61
GENSRC_AWT_ICONS_SHORT_NAME = $(subst .,_,$(subst -,_,$(1)))
3e009b5be123 8003559: Update display of applet windows
leonidr
parents: 14429
diff changeset
    62
GENSRC_AWT_ICONS_DST_NAME = AWTIcon$(2)_$(subst .,_,$(subst -,_,$(1)))
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    63
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 25859
diff changeset
    64
################################################################################
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    65
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 18241
diff changeset
    66
$(GENSRC_AWT_ICONS_TMP)/_the.icons.dir:
35241
075bbb8f2423 8146403: Windows build can be faster
erikj
parents: 27799
diff changeset
    67
	$(call LogInfo, Generating icon classes)
075bbb8f2423 8146403: Windows build can be faster
erikj
parents: 27799
diff changeset
    68
	$(call MakeDir, $(GENSRC_AWT_ICONS_DST))
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    69
	$(TOUCH) $@
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    70
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 25859
diff changeset
    71
################################################################################
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    72
18241
3e009b5be123 8003559: Update display of applet windows
leonidr
parents: 14429
diff changeset
    73
define SetupGensrcAWTIcon
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 18241
diff changeset
    74
  # param 1 is for src-file
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 18241
diff changeset
    75
  # param 2 is for src-dir
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 18241
diff changeset
    76
  $1_SHORTNAME := $(call GENSRC_AWT_ICONS_SHORT_NAME,$1)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 18241
diff changeset
    77
  $1_NAME32 := $(call GENSRC_AWT_ICONS_DST_NAME,$1,32)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 18241
diff changeset
    78
  $1_TARGET32 := $(GENSRC_AWT_ICONS_DST)/$$($1_NAME32).java
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 18241
diff changeset
    79
  $1_NAME64 := $(call GENSRC_AWT_ICONS_DST_NAME,$1,64)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 18241
diff changeset
    80
  $1_TARGET64 := $(GENSRC_AWT_ICONS_DST)/$$($1_NAME64).java
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    81
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 22957
diff changeset
    82
  $$($1_TARGET32): $2/$1 $(GENSRC_AWT_ICONS_TMP)/_the.icons.dir $(BUILD_TOOLS_JDK)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    83
	$(RM) $$@ $$@.tmp
18241
3e009b5be123 8003559: Update display of applet windows
leonidr
parents: 14429
diff changeset
    84
	$(ECHO) "package sun.awt;" > $$@.tmp
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    85
	$(ECHO) "public class $$($1_NAME32) {" >> $$@.tmp
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    86
	$(ECHO) "public static int[] $$($1_SHORTNAME) = { " >> $$@.tmp
18241
3e009b5be123 8003559: Update display of applet windows
leonidr
parents: 14429
diff changeset
    87
	$(CAT) $$< | $(TOOL_AWT_TOBIN) >> $$@.tmp
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    88
	$(ECHO) "}; }" >> $$@.tmp
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    89
	$(MV) $$@.tmp $$@
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    90
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 18241
diff changeset
    91
  GENSRC_AWT_ICONS += $$($1_TARGET32)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    92
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 22957
diff changeset
    93
  $$($1_TARGET64): $2/$1 $(GENSRC_AWT_ICONS_TMP)/_the.icons.dir $(BUILD_TOOLS_JDK)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    94
	$(RM) $$@ $$@.tmp
18241
3e009b5be123 8003559: Update display of applet windows
leonidr
parents: 14429
diff changeset
    95
	$(ECHO) "package sun.awt;" > $$@.tmp
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    96
	$(ECHO) "public class $$($1_NAME64) {" >> $$@.tmp
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    97
	$(ECHO) "public static long[] $$($1_SHORTNAME) = { " >> $$@.tmp
18241
3e009b5be123 8003559: Update display of applet windows
leonidr
parents: 14429
diff changeset
    98
	$(CAT) $$< | $(TOOL_AWT_TOBIN) >> $$@.tmp
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
    99
	$(ECHO) "}; }" >> $$@.tmp
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   100
	$(MV) $$@.tmp $$@
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   101
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 18241
diff changeset
   102
  GENSRC_AWT_ICONS += $$($1_TARGET64)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   103
endef
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents:
diff changeset
   104
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 18241
diff changeset
   105
$(foreach I, $(GENSRC_AWT_ICONS_SRC), $(eval $(call SetupGensrcAWTIcon,$(notdir $(I)),$(dir $(I)))))
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   106
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 22957
diff changeset
   107
GENSRC_JAVA_DESKTOP += $(GENSRC_AWT_ICONS)
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 22957
diff changeset
   108
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 25859
diff changeset
   109
################################################################################
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   110
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 18241
diff changeset
   111
ifeq ($(OPENJDK_TARGET_OS), macosx)
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   112
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 25859
diff changeset
   113
  GENSRC_OSX_ICONS_DST := $(SUPPORT_OUTPUTDIR)/headers/java.desktop
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 18241
diff changeset
   114
  GENSRC_OSX_ICONS := $(GENSRC_OSX_ICONS_DST)/AWTIconData.h
14429
f930c8da4439 8001965: build-infra: Large compare diffs between new and old on mac
tbell
parents: 14231
diff changeset
   115
39504
96c700e62710 8003593: build-infra: Paths to optional platform-specific files should not be hardwired to src/closed
erikj
parents: 35241
diff changeset
   116
  GENSRC_OSX_ICONS_SRC ?= $(JDK_TOPDIR)/make/data/macosxicons/JavaApp.icns
96c700e62710 8003593: build-infra: Paths to optional platform-specific files should not be hardwired to src/closed
erikj
parents: 35241
diff changeset
   117
14429
f930c8da4439 8001965: build-infra: Large compare diffs between new and old on mac
tbell
parents: 14231
diff changeset
   118
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 22957
diff changeset
   119
  $(GENSRC_OSX_ICONS): $(GENSRC_OSX_ICONS_SRC) $(BUILD_TOOLS_JDK)
35241
075bbb8f2423 8146403: Windows build can be faster
erikj
parents: 27799
diff changeset
   120
	$(call LogInfo, Generating $(patsubst $(OUTPUT_ROOT)/%, %, $@))
075bbb8f2423 8146403: Windows build can be faster
erikj
parents: 27799
diff changeset
   121
	$(call MakeDir, $(@D))
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   122
	$(RM) $@ $@.tmp
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   123
	$(ECHO) "static unsigned char sAWTIconData[] = { " >> $@.tmp
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   124
	$(CAT) $< | $(TOOL_OSX_TOBIN) >> $@.tmp
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   125
	$(ECHO) "};" >> $@.tmp
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   126
	$(MV) $@.tmp $@
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   127
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 22957
diff changeset
   128
  GENSRC_JAVA_DESKTOP += $(GENSRC_OSX_ICONS)
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   129
endif