--- a/jdk/makefiles/GensrcCharacterData.gmk Wed Jul 05 18:26:51 2017 +0200
+++ b/jdk/makefiles/GensrcCharacterData.gmk Fri Oct 26 14:23:29 2012 -0700
@@ -24,7 +24,7 @@
#
#
-# Rules to create $(JDK_OUTPUTDIR)/gensrc_characterdata/sun/lang/CharacterData*.java
+# Rules to create $(JDK_OUTPUTDIR)/gensrc/sun/lang/CharacterData*.java
#
GENSRC_CHARACTERDATA:=
@@ -33,18 +33,18 @@
UNICODEDATA = $(JDK_TOPDIR)/make/tools/UnicodeData
define SetupCharacterData
- $(JDK_OUTPUTDIR)/gensrc_characterdata/java/lang/$1.java : $(CHARACTERDATA)/$1.java.template $(BUILD_TOOLS)
+ $(JDK_OUTPUTDIR)/gensrc/java/lang/$1.java : $(CHARACTERDATA)/$1.java.template $(BUILD_TOOLS)
$(MKDIR) -p $$(@D)
- $(ECHO) Generating $1.java
+ $(ECHO) $(LOG_INFO) Generating $1.java
$(TOOL_GENERATECHARACTER) $2 \
-template $(CHARACTERDATA)/$1.java.template \
-spec $(UNICODEDATA)/UnicodeData.txt \
-specialcasing $(UNICODEDATA)/SpecialCasing.txt \
-proplist $(UNICODEDATA)/PropList.txt \
- -o $(JDK_OUTPUTDIR)/gensrc_characterdata/java/lang/$1.java -string \
+ -o $(JDK_OUTPUTDIR)/gensrc/java/lang/$1.java -string \
-usecharforbyte $3
- GENSRC_CHARACTERDATA += $(JDK_OUTPUTDIR)/gensrc_characterdata/java/lang/$1.java
+ GENSRC_CHARACTERDATA += $(JDK_OUTPUTDIR)/gensrc/java/lang/$1.java
endef
$(eval $(call SetupCharacterData,CharacterDataLatin1,,-latin1 8))
@@ -54,12 +54,12 @@
$(eval $(call SetupCharacterData,CharacterData0E,-plane 14,11 4 1))
# Copy two Java files that need no preprocessing.
-$(JDK_OUTPUTDIR)/gensrc_characterdata/java/lang/%.java : $(CHARACTERDATA)/%.java.template
+$(JDK_OUTPUTDIR)/gensrc/java/lang/%.java : $(CHARACTERDATA)/%.java.template
$(MKDIR) -p $(@D)
- $(ECHO) Generating $(@F)
+ $(ECHO) $(LOG_INFO) Generating $(@F)
$(CP) -f $< $@
-GENSRC_CHARACTERDATA += $(JDK_OUTPUTDIR)/gensrc_characterdata/java/lang/CharacterDataUndefined.java \
- $(JDK_OUTPUTDIR)/gensrc_characterdata/java/lang/CharacterDataPrivateUse.java
+GENSRC_CHARACTERDATA += $(JDK_OUTPUTDIR)/gensrc/java/lang/CharacterDataUndefined.java \
+ $(JDK_OUTPUTDIR)/gensrc/java/lang/CharacterDataPrivateUse.java
$(GENSRC_CHARACTERDATA) : $(BUILD_TOOLS)