Fooling around...
--- a/make/RunTestsPrebuilt.gmk Fri Feb 01 10:38:00 2019 +0100
+++ b/make/RunTestsPrebuilt.gmk Fri Feb 01 10:38:57 2019 +0100
@@ -258,7 +258,7 @@
LIBRARY_PREFIX :=
SHARED_LIBRARY_SUFFIX := .dll
else ifeq ($(OPENJDK_TARGET_OS), linux)
- LD_JAOTC := $(DEVKIT_HOME)/bin/ld
+ LD_JAOTC := $(firstword $(wildcard $(DEVKIT_HOME)/*/bin/ld))
LIBRARY_PREFIX := lib
SHARED_LIBRARY_SUFFIX := .so
else ifeq ($(OPENJDK_TARGET_OS), macosx)
--- a/make/gensrc/Gensrc-jdk.charsets.gmk Fri Feb 01 10:38:00 2019 +0100
+++ b/make/gensrc/Gensrc-jdk.charsets.gmk Fri Feb 01 10:38:57 2019 +0100
@@ -42,39 +42,51 @@
CHARSET_EXTENDED_JAVA_DIR := $(TOPDIR)/src/jdk.charsets/share/classes/sun/nio/cs/ext
CHARSET_STANDARD_OS := stdcs-$(OPENJDK_TARGET_OS)
+# TODO: Lots of files in jdk/make/tools/CharsetMapping dir
+# FIXME: copy from Tools.gmk!!!
+TOOL_CHARSETMAPPING = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
+ build.tools.charsetmapping.Main $(LOG_INFO)
+
$(CHARSET_DONE_CS)-extcs: $(CHARSET_DATA_DIR)/charsets \
$(wildcard $(CHARSET_DATA_DIR)/$(CHARSET_STANDARD_OS)) \
$(CHARSET_TEMPLATES) $(CHARSET_EXTENDED_JAVA_TEMPLATES) \
$(BUILD_TOOLS_JDK)
$(call LogInfo, Generating jdk.charsets extcs)
$(call MakeDir, $(@D))
- $(TOOL_CHARSETMAPPING) $(CHARSET_DATA_DIR) $(CHARSET_GENSRC_JAVA_DIR_CS) \
+ $(call ExecuteWithLog, $@, $(TOOL_CHARSETMAPPING) $(CHARSET_DATA_DIR) $(CHARSET_GENSRC_JAVA_DIR_CS) \
extcs charsets $(CHARSET_STANDARD_OS) \
$(CHARSET_EXTENDED_JAVA_TEMPLATES) \
$(CHARSET_EXTENDED_JAVA_DIR) \
$(CHARSET_COPYRIGHT_HEADER) \
- $(LOG_DEBUG)
+ )
$(TOUCH) '$@'
+TOOL_CHARSETMAPPING_HKSCS := $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
+ build.tools.charsetmapping.HKSCS
+
$(CHARSET_DONE_CS)-hkscs: $(CHARSET_COPYRIGHT_HEADER)/HKSCS.java \
$(BUILD_TOOLS_JDK)
$(call LogInfo, Generating jdk.charsets hkscs)
$(call MakeDir, $(@D))
- $(TOOL_CHARSETMAPPING) $(CHARSET_DATA_DIR) $(CHARSET_GENSRC_JAVA_DIR_CS) hkscs '$<'
+ $(call ExecuteWithLog, $@, $(TOOL_CHARSETMAPPING_HKSCS) $(CHARSET_DATA_DIR) $(CHARSET_GENSRC_JAVA_DIR_CS) IGNORED_REMOVE '$<')
$(TOUCH) '$@'
+## THIS IS JUST A NO-OP! This does not do anything!!! Since JDK-8073893.
$(CHARSET_DONE_CS)-euctw: $(CHARSET_COPYRIGHT_HEADER)/EUC_TW.java \
$(BUILD_TOOLS_JDK)
$(call LogInfo, Generating jdk.charsets euctw)
$(call MakeDir, $(@D))
- $(TOOL_CHARSETMAPPING) $(CHARSET_DATA_DIR) $(CHARSET_GENSRC_JAVA_DIR_CS) euctw '$<'
+ # $(call ExecuteWithLog, $@, $(TOOL_CHARSETMAPPING) $(CHARSET_DATA_DIR) $(CHARSET_GENSRC_JAVA_DIR_CS) euctw '$<')
$(TOUCH) '$@'
+TOOL_CHARSETMAPPING_SJIS := $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
+ build.tools.charsetmapping.JIS0213
+
$(CHARSET_GENSRC_JAVA_DIR_CS)/sjis0213.dat: $(CHARSET_DATA_DIR)/sjis0213.map \
$(BUILD_TOOLS_JDK)
$(call LogInfo, Generating $(patsubst $(OUTPUTDIR)/%, %, $@))
$(call MakeDir, $(@D))
- $(TOOL_CHARSETMAPPING) '$<' '$@' sjis0213
+ $(call ExecuteWithLog, $@, $(TOOL_CHARSETMAPPING_SJIS) '$<' '$@')
GENSRC_JDK_CHARSETS += \
$(CHARSET_DONE_CS)-extcs \
--- a/make/gensrc/GensrcCLDR.gmk Fri Feb 01 10:38:00 2019 +0100
+++ b/make/gensrc/GensrcCLDR.gmk Fri Feb 01 10:38:57 2019 +0100
@@ -24,6 +24,7 @@
#
CLDRVERSION := 33
+# This should move to like make/data/localedata...
CLDRSRCDIR := $(TOPDIR)/src/jdk.localedata/share/classes/sun/util/cldr/resources/common
GENSRC_BASEDIR := $(SUPPORT_OUTPUTDIR)/gensrc/java.base
@@ -35,6 +36,8 @@
CLDR_BASE_LOCALES := "en-US"
ZONENAME_TEMPLATE := $(TOPDIR)/src/java.base/share/classes/java/time/format/ZoneName.java.template
+
+# tzdata needed to extract tzdata links
TZDATA_DIR := $(TOPDIR)/make/data/tzdata
# tzmappings generation for Windows.
--- a/make/gensrc/GensrcCharsetMapping.gmk Fri Feb 01 10:38:00 2019 +0100
+++ b/make/gensrc/GensrcCharsetMapping.gmk Fri Feb 01 10:38:57 2019 +0100
@@ -46,11 +46,12 @@
$(BUILD_TOOLS_JDK)
$(call LogInfo, Generating java.base charset mapping)
$(call MakeDir, $(@D))
- $(TOOL_CHARSETMAPPING) $(CHARSET_DATA_DIR) $(CHARSET_GENSRC_JAVA_DIR_BASE) \
+ $(call ExecuteWithLog, $@, \
+ $(TOOL_CHARSETMAPPING) $(CHARSET_DATA_DIR) $(CHARSET_GENSRC_JAVA_DIR_BASE) \
stdcs charsets $(CHARSET_STANDARD_OS) \
$(CHARSET_STANDARD_JAVA_TEMPLATES) $(CHARSET_EXTSRC_DIR) \
$(CHARSET_COPYRIGHT_HEADER) \
- $(LOG_DEBUG)
+ )
$(TOUCH) '$@'
GENSRC_JAVA_BASE += $(CHARSET_DONE_BASE)-stdcs
--- a/make/jdk/src/classes/build/tools/charsetmapping/HKSCS.java Fri Feb 01 10:38:00 2019 +0100
+++ b/make/jdk/src/classes/build/tools/charsetmapping/HKSCS.java Fri Feb 01 10:38:57 2019 +0100
@@ -204,4 +204,8 @@
x.printStackTrace();
}
}
+
+ public static void main(String args[]) throws Throwable {
+ HKSCS.genClass2001(args);
+ }
}
--- a/make/jdk/src/classes/build/tools/charsetmapping/JIS0213.java Fri Feb 01 10:38:00 2019 +0100
+++ b/make/jdk/src/classes/build/tools/charsetmapping/JIS0213.java Fri Feb 01 10:38:57 2019 +0100
@@ -241,4 +241,7 @@
writeShort(out, (char)comp[i].cp2);
}
}
+ public static void main(String args[]) throws Throwable {
+ JIS0213.genClass(args);
+ }
}
--- a/make/jdk/src/classes/build/tools/charsetmapping/Main.java Fri Feb 01 10:38:00 2019 +0100
+++ b/make/jdk/src/classes/build/tools/charsetmapping/Main.java Fri Feb 01 10:38:57 2019 +0100
@@ -44,7 +44,7 @@
int COPYRIGHT_SRC = 7;
if (args.length < 3 ) {
- System.out.println("Usage: java -jar charsetmapping.jar src dst spiType charsets os [template]");
+ System.out.println("Usage: java -jar charsetmapping.jar src dst spiType charsets os [template] ext-src copyright-src");
System.exit(1);
}
boolean isStandard = "stdcs".equals(args[TYPE]);
@@ -121,10 +121,6 @@
if (!isStandard && !hasEUC_TW) {
EUC_TW.genClass("sun.nio.cs.ext", args);
}
- } else if ("sjis0213".equals(args[TYPE])) {
- JIS0213.genClass(args);
- } else if ("hkscs".equals(args[TYPE])) {
- HKSCS.genClass2001(args);
}
}