From 0ce0cb0d532fa5782d04084183bf9fa5fc4b178e Mon Sep 17 00:00:00 2001 From: Erik Joelsson Date: Wed, 26 Feb 2014 10:37:23 +0100 Subject: [PATCH] 8035187: Move fontconfig src files to make/data Reviewed-by: tbell, ihse --- .../fontconfig}/aix.fontconfig.properties | 0 .../fontconfig}/bsd.fontconfig.properties | 0 .../fontconfig}/macosx.fontconfig.properties | 0 .../fontconfig}/solaris.fontconfig.properties | 0 .../fontconfig/windows.fontconfig.properties} | 0 jdk/make/gendata/GendataFontConfig.gmk | 64 ++++--------------- 6 files changed, 13 insertions(+), 51 deletions(-) rename jdk/{src/aix/classes/sun/awt/fontconfigs => make/data/fontconfig}/aix.fontconfig.properties (100%) rename jdk/{src/solaris/classes/sun/awt/fontconfigs => make/data/fontconfig}/bsd.fontconfig.properties (100%) rename jdk/{src/macosx/classes/sun/awt/fontconfigs => make/data/fontconfig}/macosx.fontconfig.properties (100%) rename jdk/{src/solaris/classes/sun/awt/fontconfigs => make/data/fontconfig}/solaris.fontconfig.properties (100%) rename jdk/{src/windows/classes/sun/awt/windows/fontconfig.properties => make/data/fontconfig/windows.fontconfig.properties} (100%) diff --git a/jdk/src/aix/classes/sun/awt/fontconfigs/aix.fontconfig.properties b/jdk/make/data/fontconfig/aix.fontconfig.properties similarity index 100% rename from jdk/src/aix/classes/sun/awt/fontconfigs/aix.fontconfig.properties rename to jdk/make/data/fontconfig/aix.fontconfig.properties diff --git a/jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties b/jdk/make/data/fontconfig/bsd.fontconfig.properties similarity index 100% rename from jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties rename to jdk/make/data/fontconfig/bsd.fontconfig.properties diff --git a/jdk/src/macosx/classes/sun/awt/fontconfigs/macosx.fontconfig.properties b/jdk/make/data/fontconfig/macosx.fontconfig.properties similarity index 100% rename from jdk/src/macosx/classes/sun/awt/fontconfigs/macosx.fontconfig.properties rename to jdk/make/data/fontconfig/macosx.fontconfig.properties diff --git a/jdk/src/solaris/classes/sun/awt/fontconfigs/solaris.fontconfig.properties b/jdk/make/data/fontconfig/solaris.fontconfig.properties similarity index 100% rename from jdk/src/solaris/classes/sun/awt/fontconfigs/solaris.fontconfig.properties rename to jdk/make/data/fontconfig/solaris.fontconfig.properties diff --git a/jdk/src/windows/classes/sun/awt/windows/fontconfig.properties b/jdk/make/data/fontconfig/windows.fontconfig.properties similarity index 100% rename from jdk/src/windows/classes/sun/awt/windows/fontconfig.properties rename to jdk/make/data/fontconfig/windows.fontconfig.properties diff --git a/jdk/make/gendata/GendataFontConfig.gmk b/jdk/make/gendata/GendataFontConfig.gmk index 35b502d1c36..5c85e7712e6 100644 --- a/jdk/make/gendata/GendataFontConfig.gmk +++ b/jdk/make/gendata/GendataFontConfig.gmk @@ -25,72 +25,34 @@ GENDATA_FONT_CONFIG_DST := $(JDK_OUTPUTDIR)/lib -ifeq ($(OPENJDK_TARGET_OS), windows) - GENDATA_FONT_CONFIG_SRC_DIR := $(JDK_TOPDIR)/src/windows/classes/sun/awt/windows - GENDATA_FONT_CONFIG_SRC_FILES := fontconfig.properties - GENDATA_FONT_CONFIG_SRC_PREFIX := -endif - -ifeq ($(OPENJDK_TARGET_OS), linux) - GENDATA_FONT_CONFIG_SRC_PREFIX := linux. - ifdef OPENJDK - GENDATA_FONT_CONFIG_SRC_DIR := \ - $(JDK_TOPDIR)/src/solaris/classes/sun/awt/fontconfigs - # This is placeholder for possible fonconfig files which may - # useful for some highly specialized Linux distributions - GENDATA_FONT_CONFIG_SRC_FILES := - else - GENDATA_FONT_CONFIG_SRC_DIR := \ - $(JDK_TOPDIR)/src/closed/solaris/classes/sun/awt/fontconfigs - GENDATA_FONT_CONFIG_SRC_FILES := \ - fontconfig.properties \ - fontconfig.RedHat.5.properties \ - fontconfig.RedHat.6.properties \ - fontconfig.Turbo.properties \ - fontconfig.SuSE.10.properties \ - fontconfig.SuSE.11.properties +GENDATA_FONT_CONFIG_DATA_DIR := $(JDK_TOPDIR)/make/data/fontconfig +ifndef OPENJDK + ifeq ($(OPENJDK_TARGET_OS), linux) + GENDATA_FONT_CONFIG_DATA_DIR := $(JDK_TOPDIR)/make/closed/data/fontconfig endif endif -ifeq ($(OPENJDK_TARGET_OS), solaris) - GENDATA_FONT_CONFIG_SRC_DIR := \ - $(JDK_TOPDIR)/src/solaris/classes/sun/awt/fontconfigs - GENDATA_FONT_CONFIG_SRC_FILES := fontconfig.properties - GENDATA_FONT_CONFIG_SRC_PREFIX := solaris. -endif +GENDATA_FONT_CONFIG_SRC_FILES := \ + $(wildcard $(GENDATA_FONT_CONFIG_DATA_DIR)/$(OPENJDK_TARGET_OS).*) -ifeq ($(OPENJDK_TARGET_OS), macosx) - GENDATA_FONT_CONFIG_SRC_DIR := \ - $(JDK_TOPDIR)/src/macosx/classes/sun/awt/fontconfigs - GENDATA_FONT_CONFIG_SRC_FILES := fontconfig.properties - GENDATA_FONT_CONFIG_SRC_PREFIX := macosx. -endif - -ifeq ($(OPENJDK_TARGET_OS), aix) - GENDATA_FONT_CONFIG_SRC_DIR := \ - $(JDK_TOPDIR)/src/aix/classes/sun/awt/fontconfigs - GENDATA_FONT_CONFIG_SRC_FILES := fontconfig.properties - GENDATA_FONT_CONFIG_SRC_PREFIX := aix. -endif - -### $(GENDATA_FONT_CONFIG_DST)/%.src: \ - $(GENDATA_FONT_CONFIG_SRC_DIR)/$(GENDATA_FONT_CONFIG_SRC_PREFIX)% + $(GENDATA_FONT_CONFIG_DATA_DIR)/$(OPENJDK_TARGET_OS).% $(call install-file) $(GENDATA_FONT_CONFIG_DST)/%.bfc: \ - $(GENDATA_FONT_CONFIG_SRC_DIR)/$(GENDATA_FONT_CONFIG_SRC_PREFIX)%.properties + $(GENDATA_FONT_CONFIG_DATA_DIR)/$(OPENJDK_TARGET_OS).%.properties \ + $(BUILD_TOOLS) $(MKDIR) -p $(@D) $(RM) $@ $(TOOL_COMPILEFONTCONFIG) $< $@ $(CHMOD) 444 $@ -### -GENDATA_FONT_CONFIGS := $(GENDATA_FONT_CONFIG_SRC_FILES:%=$(GENDATA_FONT_CONFIG_DST)/%.src) -GENDATA_BFONT_CONFIGS := $(GENDATA_FONT_CONFIG_SRC_FILES:%.properties=$(GENDATA_FONT_CONFIG_DST)/%.bfc) +GENDATA_FONT_CONFIGS := $(patsubst $(GENDATA_FONT_CONFIG_DATA_DIR)/$(OPENJDK_TARGET_OS).%, \ + $(GENDATA_FONT_CONFIG_DST)/%.src, $(GENDATA_FONT_CONFIG_SRC_FILES)) +GENDATA_BFONT_CONFIGS := $(patsubst $(GENDATA_FONT_CONFIG_DATA_DIR)/$(OPENJDK_TARGET_OS).%.properties, \ + $(GENDATA_FONT_CONFIG_DST)/%.bfc, $(GENDATA_FONT_CONFIG_SRC_FILES)) GENDATA_FONT_CONFIG := $(GENDATA_FONT_CONFIGS) $(GENDATA_BFONT_CONFIGS) -###