/hg/icedtea8-forest/jdk: 7 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Oct 14 02:38:59 UTC 2020
changeset 3f870a4292ed in /hg/icedtea8-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea8-forest/jdk?cmd=changeset;node=3f870a4292ed
author: stooke
date: Wed Sep 23 17:59:08 2020 +0100
8152545, PR3804: Use preprocessor instead of compiling a program to generate native nio constants
Reviewed-by: andrew
changeset 6c07d272de96 in /hg/icedtea8-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea8-forest/jdk?cmd=changeset;node=6c07d272de96
author: igerasim
date: Wed Jun 03 19:26:58 2015 +0300
8058779, PR3805: Faster implementation of String.replace(CharSequence, CharSequence)
Reviewed-by: sherman, plevart, forax, psandoz
changeset cb7dd048cbd2 in /hg/icedtea8-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea8-forest/jdk?cmd=changeset;node=cb7dd048cbd2
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Oct 02 20:27:15 2020 +0100
8144015, PR3806: [PIT] failures of text layout font tests
8144023, PR3806: [PIT] failure of text measurements in javax/swing/text/html/parser/Parser/6836089/bug6836089.java
8145542, PR3806: The case failed automatically and thrown java.lang.ArrayIndexOutOfBoundsException exception
8151725, PR3806: [macosx] ArrayIndexOOB exception when displaying Devanagari text in JEditorPane
8144240, PR3806: [macosx][PIT] AIOOB in closed/javax/swing/text/GlyphPainter2/6427244/bug6427244.java
8152680, PR3806: Regression in GlyphVector.getGlyphCharIndex behaviour
8158924, PR3806: Incorrect i18n text document layout
8041480, PR3806: ArrayIndexOutOfBoundsException when JTable contains certain string
8166068, PR3806: test/java/awt/font/GlyphVector/GetGlyphCharIndexTest.java does not compile
8166003, PR3806: [PIT][TEST_BUG] missing helper for javax/swing/text/GlyphPainter2/6427244/bug6427244.java
8169879, PR3806: [TEST_BUG] javax/swing/text/GlyphPainter2/6427244/bug6427244.java - compilation failed
Reviewed-by: serb, srl
changeset 893fe8725d48 in /hg/icedtea8-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea8-forest/jdk?cmd=changeset;node=893fe8725d48
author: yan
date: Fri Jul 03 17:37:40 2015 +0300
8130125, PR3806: [TEST_BUG] add @modules to the several client tests unaffected by the automated bulk update
Reviewed-by: serb, alexsch
changeset a5d77ccaa809 in /hg/icedtea8-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea8-forest/jdk?cmd=changeset;node=a5d77ccaa809
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Sun Oct 11 17:31:45 2020 +0100
8038723, PR3806: Openup some PrinterJob tests
Reviewed-by: jgodinez
changeset a41453a8a36a in /hg/icedtea8-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea8-forest/jdk?cmd=changeset;node=a41453a8a36a
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Wed Oct 14 03:32:32 2020 +0100
8191512, PR3806: T2K font rasterizer code removal
Summary: Includes parts of JDK-8193017 which introduces useJDKScaler
changeset 192857f897ff in /hg/icedtea8-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea8-forest/jdk?cmd=changeset;node=192857f897ff
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Wed Oct 14 03:38:19 2020 +0100
8191522, PR3806: Remove Bigelow&Holmes Lucida fonts from JDK sources
diffstat:
make/gensrc/GensrcMisc.gmk | 135 +-
make/src/native/genconstants/ch/genSocketOptionRegistry.c | 131 --
make/src/native/genconstants/fs/genSolarisConstants.c | 105 --
make/src/native/genconstants/fs/genUnixConstants.c | 141 ---
src/macosx/classes/sun/awt/fontconfigs/macosx.fontconfig.properties | 8 +-
src/macosx/classes/sun/font/CFont.java | 6 +-
src/macosx/classes/sun/font/CFontManager.java | 6 +-
src/share/classes/java/lang/String.java | 25 +-
src/share/classes/sun/awt/FontConfiguration.java | 29 +-
src/share/classes/sun/font/CMap.java | 2 +-
src/share/classes/sun/font/CompositeGlyphMapper.java | 2 +-
src/share/classes/sun/font/ExtendedTextSourceLabel.java | 229 ++--
src/share/classes/sun/font/FileFontStrike.java | 4 +-
src/share/classes/sun/font/FontManagerNativeLibrary.java | 6 +-
src/share/classes/sun/font/FontScaler.java | 42 +-
src/share/classes/sun/font/FontUtilities.java | 28 +-
src/share/classes/sun/font/SunFontManager.java | 177 +---
src/share/classes/sun/font/TrueTypeFont.java | 2 +-
src/share/classes/sun/nio/ch/SocketOptionRegistry.java.template | 137 ++
src/share/demo/java2d/J2DBench/options/default.opt | 2 +-
src/share/native/sun/font/fontscalerdefs.h | 28 -
src/solaris/classes/sun/awt/FcFontManager.java | 16 +-
src/solaris/classes/sun/awt/X11FontManager.java | 49 +-
src/solaris/classes/sun/awt/fontconfigs/solaris.fontconfig.properties | 27 +-
src/solaris/classes/sun/awt/motif/java.fonts.dir | 49 -
src/solaris/classes/sun/awt/motif/java.oblique-fonts.dir | 25 -
src/solaris/classes/sun/font/FontConfigManager.java | 5 +-
src/solaris/classes/sun/nio/fs/SolarisConstants.java.template | 89 +
src/unix/classes/sun/nio/fs/UnixConstants.java.template | 132 ++
src/windows/classes/sun/awt/windows/fontconfig.properties | 7 +-
test/java/awt/EventQueue/6980209/bug6980209.java | 11 +-
test/java/awt/Frame/NonEDT_GUI_DeadlockTest/NonEDT_GUI_Deadlock.html | 44 +
test/java/awt/Frame/NonEDT_GUI_DeadlockTest/NonEDT_GUI_Deadlock.java | 323 +++++++
test/java/awt/JAWT/JAWT.sh | 4 +-
test/java/awt/JAWT/Makefile.unix | 2 +-
test/java/awt/Mixing/AWT_Mixing/JSplitPaneOverlapping.java | 3 +-
test/java/awt/font/GlyphVector/GetGlyphCharIndexTest.java | 44 +
test/java/awt/font/GlyphVector/TestLayoutFlags.java | 209 ++++
test/java/awt/font/LineBreakMeasurer/TestLineBreakWithFontSub.java | 143 +++
test/java/awt/font/StyledMetrics/BoldSpace.java | 1 -
test/java/awt/font/TextLayout/LigatureCaretTest.java | 190 ++++
test/java/awt/font/TextLayout/TestHebrewMark.java | 2 +-
test/java/awt/font/TextLayout/TestJustification.html | 52 +
test/java/awt/font/TextLayout/TestJustification.java | 249 +++++
test/java/awt/font/TextLayout/TestSinhalaChar.java | 2 +-
test/java/awt/font/Underline/UnderlineTest.java | 160 +++
test/java/awt/print/Dialog/DestinationTest.java | 146 +++
test/java/awt/print/Dialog/MediaInPrintable.java | 90 +
test/java/awt/print/Dialog/PrintApplet.html | 29 +
test/java/awt/print/Dialog/PrintApplet.java | 141 +++
test/java/awt/print/Dialog/PrintDialog.java | 44 +
test/java/awt/print/Dialog/PrintDlgApp.java | 98 ++
test/java/awt/print/Dialog/PrintDlgPageable.java | 128 ++
test/java/awt/print/Dialog/RestoreActiveWindowTest/RestoreActiveWindowTest.html | 43 +
test/java/awt/print/Dialog/RestoreActiveWindowTest/RestoreActiveWindowTest.java | 231 +++++
test/java/awt/print/PageFormat/CustomPaper.java | 244 +++++
test/java/awt/print/PageFormat/NullPaper.java | 423 +++++++++
test/java/awt/print/PageFormat/Orient.java | 460 ++++++++++
test/java/awt/print/PageFormat/PDialogTest.java | 44 +
test/java/awt/print/PageFormat/PageSetupDialog.java | 353 +++++++
test/java/awt/print/PageFormat/ReverseLandscapeTest.java | 106 ++
test/java/awt/print/PageFormat/SetOrient.html | 48 +
test/java/awt/print/PageFormat/SetOrient.java | 76 +
test/java/awt/print/PageFormat/SmallPaperPrinting.java | 63 +
test/java/awt/print/PageFormat/ValidateCustom.java | 121 ++
test/java/awt/print/PrinterJob/Cancel/PrinterJobCancel.java | 238 +++++
test/java/awt/print/PrinterJob/CheckAccess.java | 94 ++
test/java/awt/print/PrinterJob/CheckPrivilege.java | 130 ++
test/java/awt/print/PrinterJob/CompareImageable.java | 118 ++
test/java/awt/print/PrinterJob/CustomFont/A.ttf | Bin
test/java/awt/print/PrinterJob/CustomFont/CustomFont.java | 416 +++++++++
test/java/awt/print/PrinterJob/DeviceScale.java | 101 ++
test/java/awt/print/PrinterJob/DrawImage.java | 282 ++++++
test/java/awt/print/PrinterJob/DrawStringMethods.java | 250 +++++
test/java/awt/print/PrinterJob/EmptyFill.java | 83 +
test/java/awt/print/PrinterJob/GlyphPositions.java | 109 ++
test/java/awt/print/PrinterJob/HeadlessPrintingTest.java | 68 +
test/java/awt/print/PrinterJob/InitToBlack.java | 65 +
test/java/awt/print/PrinterJob/InvalidPage.java | 243 +++++
test/java/awt/print/PrinterJob/JobName/PrinterJobName.java | 193 ++++
test/java/awt/print/PrinterJob/Legal/PrintTest.java | 245 +++++
test/java/awt/print/PrinterJob/MultiThread/MultiThreadTest.java | 141 +++
test/java/awt/print/PrinterJob/NullGetName.java | 139 +++
test/java/awt/print/PrinterJob/NumCopies.java | 189 ++++
test/java/awt/print/PrinterJob/PSQuestionMark.java | 89 +
test/java/awt/print/PrinterJob/PSWindingRule.java | 124 ++
test/java/awt/print/PrinterJob/PageDialogTest.java | 177 +++
test/java/awt/print/PrinterJob/PageDlgPrnButton.java | 228 ++++
test/java/awt/print/PrinterJob/PaintText.java | 177 +++
test/java/awt/print/PrinterJob/PrintAllFonts.java | 213 ++++
test/java/awt/print/PrinterJob/PrintBadImage.java | 65 +
test/java/awt/print/PrinterJob/PrintCompoundString.java | 246 +++++
test/java/awt/print/PrinterJob/PrintDialog.java | 390 ++++++++
test/java/awt/print/PrinterJob/PrintDialogCancel.java | 394 ++++++++
test/java/awt/print/PrinterJob/PrintFontStyle.java | 194 ++++
test/java/awt/print/PrinterJob/PrintImage.java | 296 ++++++
test/java/awt/print/PrinterJob/PrintNullString.java | 328 +++++++
test/java/awt/print/PrinterJob/PrintParenString.java | 246 +++++
test/java/awt/print/PrinterJob/PrintRotatedText.java | 204 ++++
test/java/awt/print/PrinterJob/PrintTextLayout.java | 113 ++
test/java/awt/print/PrinterJob/PrintTextPane.java | 158 +++
test/java/awt/print/PrinterJob/PrintTextTest.java | 212 ++++-
test/java/awt/print/PrinterJob/PrintTranslatedFont.java | 257 +++++
test/java/awt/print/PrinterJob/PrintVolatileImage.java | 99 ++
test/java/awt/print/PrinterJob/PrinterDevice.java | 92 ++
test/java/awt/print/PrinterJob/PrinterDialogsModalityTest/PrinterDialogsModalityTest.html | 43 +
test/java/awt/print/PrinterJob/PrinterDialogsModalityTest/PrinterDialogsModalityTest.java | 262 +++++
test/java/awt/print/PrinterJob/PrinterJobDialogBugDemo.java | 101 ++
test/java/awt/print/PrinterJob/RemoveListener.java | 55 +
test/java/awt/print/PrinterJob/ScaledText/ScaledText.java | 438 +++++++++
test/java/awt/print/PrinterJob/SecurityDialogTest.java | 229 ++++
test/java/awt/print/PrinterJob/SetCopies/Test.java | 52 +
test/java/awt/print/PrinterJob/SwingUIText.java | 263 +++++
test/java/awt/print/PrinterJob/ThinLines.java | 429 +++++++++
test/java/awt/print/PrinterJob/XparColor.java | 258 +++++
test/java/awt/print/PrinterJob/raster/RasterTest.java | 268 +++++
test/java/lang/String/LiteralReplace.java | 184 ++++
test/javax/swing/text/DevanagariEditor.java | 36 +
test/javax/swing/text/GlyphPainter2/6427244/bug6427244.java | 207 ++++
119 files changed, 15119 insertions(+), 1083 deletions(-)
diffs (truncated from 17422 to 500 lines):
diff -r ccc017f54531 -r 192857f897ff make/gensrc/GensrcMisc.gmk
--- a/make/gensrc/GensrcMisc.gmk Mon Sep 14 00:48:39 2020 +0100
+++ b/make/gensrc/GensrcMisc.gmk Wed Oct 14 03:38:19 2020 +0100
@@ -25,7 +25,7 @@
include ProfileNames.gmk
-##########################################################################################
+################################################################################
# Install the launcher name, release version string, full version
# string and the runtime name into the Version.java file.
# To be printed by java -version
@@ -64,78 +64,52 @@
GENSRC_MISC += $(JDK_OUTPUTDIR)/gensrc/sun/tools/jconsole/Version.java
-##########################################################################################
-
-GENSRC_MISC += $(JDK_OUTPUTDIR)/gensrc/sun/nio/ch/SocketOptionRegistry.java
-
-GENSRC_SOR_SRC := $(JDK_TOPDIR)/make/src/native/genconstants/ch
-GENSRC_SOR_SRC_FILE := genSocketOptionRegistry.c
-GENSRC_SOR_BIN := $(JDK_OUTPUTDIR)/btnative/genSocketOptionRegistry
-
-SOR_COPYRIGHT_YEARS = $(shell $(CAT) $(GENSRC_SOR_SRC)/$(GENSRC_SOR_SRC_FILE) | \
- $(NAWK) '/^.*Copyright.*Oracle/ { printf "%s %s",$$4,$$5 }')
+################################################################################
-$(eval $(call SetupNativeCompilation,BUILD_GENSRC_SOR_EXE, \
- SRC := $(GENSRC_SOR_SRC), \
- INCLUDE_FILES := $(GENSRC_SOR_SRC_FILE), \
- LANG := C, \
- CC := $(BUILD_CC), \
- LDEXE := $(BUILD_CC), \
- OBJECT_DIR := $(GENSRC_SOR_BIN), \
- OUTPUT_DIR := $(GENSRC_SOR_BIN), \
- PROGRAM := genSocketOptionRegistry))
-
-SOR_PREGEN_FILE := $(JDK_TOPDIR)/src/closed/solaris/classes/sun/nio/ch/SocketOptionRegistry-$(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH).java.template
-
-ifeq ($(wildcard $(SOR_PREGEN_FILE)), )
- $(JDK_OUTPUTDIR)/gensrc/sun/nio/ch/SocketOptionRegistry.java: $(BUILD_GENSRC_SOR_EXE)
- $(MKDIR) -p $(@D)
- $(RM) $@ $@.tmp
- NAWK="$(NAWK)" SH="$(SH)" $(SH) -e $(JDK_TOPDIR)/make/scripts/addNotices.sh "$(SOR_COPYRIGHT_YEARS)" > $@.tmp
- $(BUILD_GENSRC_SOR_EXE) >> $@.tmp
- $(MV) $@.tmp $@
-else
- $(JDK_OUTPUTDIR)/gensrc/sun/nio/ch/SocketOptionRegistry.java: $(SOR_PREGEN_FILE)
- $(call install-file)
+ifneq ($(filter $(TOOLCHAIN_TYPE), gcc clang), )
+ # Need to specify language since the template file has a non standard
+ # extension.
+ CPP_FLAGS += -x c
+else ifeq ($(TOOLCHAIN_TYPE), microsoft)
+ CPP_FLAGS += -nologo
endif
-##########################################################################################
+# Generate a java source file from a template through the C preprocessor for the
+# target system. First extract the copyright notice at the start of the file.
+# Run the preprocessor. Filter out the default compiler stderr output on
+# Windows. Filter out all the header files output. Remove all "PREFIX_" strings
+# that were added to variable references in the template files to avoid being
+# matched by the preprocessor. Remove any #line directives left by the
+# preprocessor.
+define generate-preproc-src
+ $(eval $(call MakeDir, $(@D)))
+ ( $(NAWK) '/@@END_COPYRIGHT@@/{exit}1' $< && \
+ $(CPP) $(CPP_FLAGS) $(SYSROOT_CFLAGS) $< \
+ | $(GREP) -v '^$(<F)$$' \
+ | $(NAWK) '/@@START_HERE@@/,0' \
+ | $(SED) -e 's/@@START_HERE@@/\/\/ AUTOMATICALLY GENERATED FILE - DO NOT EDIT/' \
+ -e 's/PREFIX_//' -e 's/^#.*//' \
+ ) > $@
+endef
+
+GENSRC_SOR_FILE += $(JDK_OUTPUTDIR)/gensrc/sun/nio/ch/SocketOptionRegistry.java
+
+$(GENSRC_SOR_FILE): \
+ $(JDK_TOPDIR)/src/share/classes/sun/nio/ch/SocketOptionRegistry.java.template
+ $(generate-preproc-src)
+
+GENSRC_MISC += $(GENSRC_SOR_FILE)
+
+################################################################################
ifneq ($(OPENJDK_TARGET_OS), windows)
- GENSRC_MISC += $(JDK_OUTPUTDIR)/gensrc/sun/nio/fs/UnixConstants.java
-
- GENSRC_UC_SRC := $(JDK_TOPDIR)/make/src/native/genconstants/fs
- GENSRC_UC_SRC_FILE := genUnixConstants.c
- GENSRC_UC_BIN := $(JDK_OUTPUTDIR)/btnative/genUnixConstants
-
- UC_COPYRIGHT_YEARS = $(shell $(CAT) $(GENSRC_UC_SRC)/$(GENSRC_UC_SRC_FILE) | \
- $(NAWK) '/^.*Copyright.*Oracle/ { printf "%s %s",$$4,$$5 }')
+ GENSRC_UC_FILE := $(JDK_OUTPUTDIR)/gensrc/sun/nio/fs/UnixConstants.java
+ $(GENSRC_UC_FILE): \
+ $(JDK_TOPDIR)/src/unix/classes/sun/nio/fs/UnixConstants.java.template
+ $(generate-preproc-src)
- $(eval $(call SetupNativeCompilation,BUILD_GENSRC_UC_EXE, \
- SRC := $(GENSRC_UC_SRC), \
- INCLUDE_FILES := $(GENSRC_UC_SRC_FILE), \
- LANG := C, \
- CC := $(BUILD_CC), \
- LDEXE := $(BUILD_CC), \
- CFLAGS := $(filter -D%, $(CFLAGS_JDKEXE)), \
- OBJECT_DIR := $(GENSRC_UC_BIN), \
- OUTPUT_DIR := $(GENSRC_UC_BIN), \
- PROGRAM := genUnixConstants))
-
- UC_PREGEN_FILE := $(JDK_TOPDIR)/src/closed/solaris/classes/sun/nio/fs/UnixConstants-$(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH).java.template
-
- ifeq ($(wildcard $(UC_PREGEN_FILE)), )
- $(JDK_OUTPUTDIR)/gensrc/sun/nio/fs/UnixConstants.java: $(BUILD_GENSRC_UC_EXE)
- $(MKDIR) -p $(@D)
- $(RM) $@ $@.tmp
- NAWK="$(NAWK)" SH="$(SH)" $(SH) -e $(JDK_TOPDIR)/make/scripts/addNotices.sh "$(UC_COPYRIGHT_YEARS)" > $@.tmp
- $(BUILD_GENSRC_UC_EXE) >> $@.tmp
- $(MV) $@.tmp $@
- else
- $(JDK_OUTPUTDIR)/gensrc/sun/nio/fs/UnixConstants.java: $(UC_PREGEN_FILE)
- $(call install-file)
- endif
+ GENSRC_MISC += $(GENSRC_UC_FILE)
endif
@@ -143,32 +117,13 @@
ifeq ($(OPENJDK_TARGET_OS), solaris)
- GENSRC_MISC += $(JDK_OUTPUTDIR)/gensrc/sun/nio/fs/SolarisConstants.java
-
- GENSRC_SOL_SRC := $(JDK_TOPDIR)/make/src/native/genconstants/fs
- GENSRC_SOL_SRC_FILE := genSolarisConstants.c
- GENSRC_SOL_BIN := $(JDK_OUTPUTDIR)/btnative/genSolarisConstants
-
- SOL_COPYRIGHT_YEARS = $(shell $(CAT) $(GENSRC_SOL_SRC)/$(GENSRC_SOL_SRC_FILE) | \
- $(NAWK) '/^.*Copyright.*Oracle/ { printf "%s %s",$$4,$$5 }')
+ GENSRC_SC_FILE := $(JDK_OUTPUTDIR)/gensrc/sun/nio/fs/SolarisConstants.java
- $(eval $(call SetupNativeCompilation,BUILD_GENSRC_SOL_EXE, \
- SRC := $(GENSRC_SOL_SRC), \
- INCLUDE_FILES := $(GENSRC_SOL_SRC_FILE), \
- LANG := C, \
- CC := $(BUILD_CC), \
- LDEXE := $(BUILD_CC), \
- OBJECT_DIR := $(GENSRC_SOL_BIN), \
- OUTPUT_DIR := $(GENSRC_SOL_BIN), \
- PROGRAM := genSolarisConstants))
+ $(GENSRC_SC_FILE): \
+ $(JDK_TOPDIR)/src/solaris/classes/sun/nio/fs/SolarisConstants.java.template
+ $(generate-preproc-src)
- $(JDK_OUTPUTDIR)/gensrc/sun/nio/fs/SolarisConstants.java: $(BUILD_GENSRC_SOL_EXE)
- $(MKDIR) -p $(@D)
- $(RM) $@ $@.tmp
- NAWK="$(NAWK)" SH="$(SH)" $(SH) -e $(JDK_TOPDIR)/make/scripts/addNotices.sh "$(SOL_COPYRIGHT_YEARS)" > $@.tmp
- $(BUILD_GENSRC_SOL_EXE) >> $@.tmp
- $(MV) $@.tmp $@
-
+ GENSRC_MISC += $(GENSRC_SC_FILE)
endif
diff -r ccc017f54531 -r 192857f897ff make/src/native/genconstants/ch/genSocketOptionRegistry.c
--- a/make/src/native/genconstants/ch/genSocketOptionRegistry.c Mon Sep 14 00:48:39 2020 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,131 +0,0 @@
-/*
- * Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-#include <stdio.h>
-#ifdef _WIN32
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#else
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-#endif
-
-/**
- * Generates sun.nio.ch.SocketOptionRegistry, a class that maps Java-level
- * socket options to the platform specific level and option.
- */
-
-static void out(char* s) {
- printf("%s\n", s);
-}
-
-static void emit(const char *name, char * family, int level, int optname) {
- printf(" map.put(new RegistryKey(%s, %s),", name, family);
- printf(" new OptionKey(%d, %d));\n", level, optname);
-}
-
-static void emit_unspec(const char *name, int level, int optname) {
- emit(name, "Net.UNSPEC", level, optname);
-}
-
-static void emit_inet(const char *name, int level, int optname) {
- emit(name, "StandardProtocolFamily.INET", level, optname);
-}
-
-static void emit_inet6(const char *name, int level, int optname) {
- emit(name, "StandardProtocolFamily.INET6", level, optname);
-}
-
-int main(int argc, const char* argv[]) {
- out("// AUTOMATICALLY GENERATED FILE - DO NOT EDIT ");
- out("package sun.nio.ch; ");
- out("import java.net.SocketOption; ");
- out("import java.net.StandardSocketOptions; ");
- out("import java.net.ProtocolFamily; ");
- out("import java.net.StandardProtocolFamily; ");
- out("import java.util.Map; ");
- out("import java.util.HashMap; ");
- out("class SocketOptionRegistry { ");
- out(" private SocketOptionRegistry() { } ");
- out(" private static class RegistryKey { ");
- out(" private final SocketOption<?> name; ");
- out(" private final ProtocolFamily family; ");
- out(" RegistryKey(SocketOption<?> name, ProtocolFamily family) { ");
- out(" this.name = name; ");
- out(" this.family = family; ");
- out(" } ");
- out(" public int hashCode() { ");
- out(" return name.hashCode() + family.hashCode(); ");
- out(" } ");
- out(" public boolean equals(Object ob) { ");
- out(" if (ob == null) return false; ");
- out(" if (!(ob instanceof RegistryKey)) return false; ");
- out(" RegistryKey other = (RegistryKey)ob; ");
- out(" if (this.name != other.name) return false; ");
- out(" if (this.family != other.family) return false; ");
- out(" return true; ");
- out(" } ");
- out(" } ");
- out(" private static class LazyInitialization { ");
- out(" static final Map<RegistryKey,OptionKey> options = options(); ");
- out(" private static Map<RegistryKey,OptionKey> options() { ");
- out(" Map<RegistryKey,OptionKey> map = ");
- out(" new HashMap<RegistryKey,OptionKey>(); ");
-
- emit_unspec("StandardSocketOptions.SO_BROADCAST", SOL_SOCKET, SO_BROADCAST);
- emit_unspec("StandardSocketOptions.SO_KEEPALIVE", SOL_SOCKET, SO_KEEPALIVE);
- emit_unspec("StandardSocketOptions.SO_LINGER", SOL_SOCKET, SO_LINGER);
- emit_unspec("StandardSocketOptions.SO_SNDBUF", SOL_SOCKET, SO_SNDBUF);
- emit_unspec("StandardSocketOptions.SO_RCVBUF", SOL_SOCKET, SO_RCVBUF);
- emit_unspec("StandardSocketOptions.SO_REUSEADDR", SOL_SOCKET, SO_REUSEADDR);
- emit_unspec("StandardSocketOptions.TCP_NODELAY", IPPROTO_TCP, TCP_NODELAY);
-
- emit_inet("StandardSocketOptions.IP_TOS", IPPROTO_IP, IP_TOS);
- emit_inet("StandardSocketOptions.IP_MULTICAST_IF", IPPROTO_IP, IP_MULTICAST_IF);
- emit_inet("StandardSocketOptions.IP_MULTICAST_TTL", IPPROTO_IP, IP_MULTICAST_TTL);
- emit_inet("StandardSocketOptions.IP_MULTICAST_LOOP", IPPROTO_IP, IP_MULTICAST_LOOP);
-
-#ifdef AF_INET6
- emit_inet6("StandardSocketOptions.IP_TOS", IPPROTO_IPV6, IPV6_TCLASS);
- emit_inet6("StandardSocketOptions.IP_MULTICAST_IF", IPPROTO_IPV6, IPV6_MULTICAST_IF);
- emit_inet6("StandardSocketOptions.IP_MULTICAST_TTL", IPPROTO_IPV6, IPV6_MULTICAST_HOPS);
- emit_inet6("StandardSocketOptions.IP_MULTICAST_LOOP", IPPROTO_IPV6, IPV6_MULTICAST_LOOP);
-#endif
-
- emit_unspec("ExtendedSocketOption.SO_OOBINLINE", SOL_SOCKET, SO_OOBINLINE);
-
- out(" return map; ");
- out(" } ");
- out(" } ");
- out(" public static OptionKey findOption(SocketOption<?> name, ProtocolFamily family) { ");
- out(" RegistryKey key = new RegistryKey(name, family); ");
- out(" return LazyInitialization.options.get(key); ");
- out(" } ");
- out("} ");
-
- return 0;
-}
diff -r ccc017f54531 -r 192857f897ff make/src/native/genconstants/fs/genSolarisConstants.c
--- a/make/src/native/genconstants/fs/genSolarisConstants.c Mon Sep 14 00:48:39 2020 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,105 +0,0 @@
-/*
- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-#include <stdio.h>
-#include <errno.h>
-#include <unistd.h>
-#include <sys/acl.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-
-/**
- * Generates sun.nio.fs.SolarisConstants
- */
-
-static void out(char* s) {
- printf("%s\n", s);
-}
-
-static void emit(char* name, int value) {
- printf(" static final int %s = %d;\n", name, value);
-}
-
-static void emitX(char* name, int value) {
- printf(" static final int %s = 0x%x;\n", name, value);
-}
-
-#define DEF(X) emit(#X, X);
-#define DEFX(X) emitX(#X, X);
-
-int main(int argc, const char* argv[]) {
- out("// AUTOMATICALLY GENERATED FILE - DO NOT EDIT ");
- out("package sun.nio.fs; ");
- out("class SolarisConstants { ");
- out(" private SolarisConstants() { } ");
-
- // extended attributes
- DEFX(O_XATTR);
- DEF(_PC_XATTR_ENABLED);
-
- // ACL configuration
- DEF(_PC_ACL_ENABLED);
- DEFX(_ACL_ACE_ENABLED);
-
- // ACL commands
- DEFX(ACE_GETACL);
- DEFX(ACE_SETACL);
-
- // ACL mask/flags/types
- emitX("ACE_ACCESS_ALLOWED_ACE_TYPE", 0x0000);
- emitX("ACE_ACCESS_DENIED_ACE_TYPE", 0x0001);
- emitX("ACE_SYSTEM_AUDIT_ACE_TYPE", 0x0002);
- emitX("ACE_SYSTEM_ALARM_ACE_TYPE", 0x0003);
- emitX("ACE_READ_DATA", 0x00000001);
- emitX("ACE_LIST_DIRECTORY", 0x00000001);
- emitX("ACE_WRITE_DATA", 0x00000002);
- emitX("ACE_ADD_FILE", 0x00000002);
- emitX("ACE_APPEND_DATA", 0x00000004);
- emitX("ACE_ADD_SUBDIRECTORY", 0x00000004);
- emitX("ACE_READ_NAMED_ATTRS", 0x00000008);
- emitX("ACE_WRITE_NAMED_ATTRS", 0x00000010);
- emitX("ACE_EXECUTE", 0x00000020);
- emitX("ACE_DELETE_CHILD", 0x00000040);
- emitX("ACE_READ_ATTRIBUTES", 0x00000080);
- emitX("ACE_WRITE_ATTRIBUTES", 0x00000100);
- emitX("ACE_DELETE", 0x00010000);
- emitX("ACE_READ_ACL", 0x00020000);
- emitX("ACE_WRITE_ACL", 0x00040000);
- emitX("ACE_WRITE_OWNER", 0x00080000);
- emitX("ACE_SYNCHRONIZE", 0x00100000);
- emitX("ACE_FILE_INHERIT_ACE", 0x0001);
- emitX("ACE_DIRECTORY_INHERIT_ACE", 0x0002);
- emitX("ACE_NO_PROPAGATE_INHERIT_ACE", 0x0004);
- emitX("ACE_INHERIT_ONLY_ACE", 0x0008);
- emitX("ACE_SUCCESSFUL_ACCESS_ACE_FLAG", 0x0010);
- emitX("ACE_FAILED_ACCESS_ACE_FLAG", 0x0020);
- emitX("ACE_IDENTIFIER_GROUP", 0x0040);
- emitX("ACE_OWNER", 0x1000);
- emitX("ACE_GROUP", 0x2000);
- emitX("ACE_EVERYONE", 0x4000);
-
- out("} ");
- return 0;
-}
diff -r ccc017f54531 -r 192857f897ff make/src/native/genconstants/fs/genUnixConstants.c
--- a/make/src/native/genconstants/fs/genUnixConstants.c Mon Sep 14 00:48:39 2020 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,141 +0,0 @@
-/*
- * Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-#include <stdio.h>
-#include <errno.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-
-/**
- * Generates sun.nio.fs.UnixConstants
- */
-
-static void out(char* s) {
- printf("%s\n", s);
-}
-
-static void emit(char* name, int value) {
- printf(" static final int %s = %d;\n", name, value);
-}
-
-static void emitX(char* name, int value) {
- printf(" static final int %s = 0x%x;\n", name, value);
-}
-
-#define DEF(X) emit(#X, X);
-#define DEFX(X) emitX(#X, X);
-
-int main(int argc, const char* argv[]) {
- out("// AUTOMATICALLY GENERATED FILE - DO NOT EDIT ");
- out("package sun.nio.fs; ");
- out("class UnixConstants { ");
- out(" private UnixConstants() { } ");
-
- // open flags
- DEF(O_RDONLY);
- DEF(O_WRONLY);
- DEF(O_RDWR);
- DEFX(O_APPEND);
- DEFX(O_CREAT);
- DEFX(O_EXCL);
- DEFX(O_TRUNC);
- DEFX(O_SYNC);
-#ifndef O_DSYNC
- // At least FreeBSD doesn't define O_DSYNC
- emit("O_DSYNC", O_SYNC);
-#else
- DEFX(O_DSYNC);
-#endif
-#ifdef O_NOFOLLOW
- DEFX(O_NOFOLLOW);
-#else
- // not supported (dummy values will not be used at runtime).
- emitX("O_NOFOLLOW", 0x0);
-#endif
-
- // mode masks
- emitX("S_IAMB",
- (S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IWGRP|S_IXGRP|S_IROTH|S_IWOTH|S_IXOTH));
- DEF(S_IRUSR);
- DEF(S_IWUSR);
- DEF(S_IXUSR);
More information about the distro-pkg-dev
mailing list