hg: jdk/sandbox: 2 new changesets
andy.herrick at oracle.com
andy.herrick at oracle.com
Tue Jan 21 19:55:04 UTC 2020
Changeset: 805a456942d5
Author: herrick
Date: 2020-01-21 09:58 -0500
URL: https://hg.openjdk.java.net/jdk/sandbox/rev/805a456942d5
Merge
! make/CompileJavaModules.gmk
! make/common/Modules.gmk
! make/common/NativeCompilation.gmk
- make/launcher/Launcher-jdk.pack.gmk
! make/lib/Lib-jdk.incubator.jpackage.gmk
- make/lib/Lib-jdk.pack.gmk
- src/hotspot/os/bsd/gc/z/zBackingFile_bsd.cpp
- src/hotspot/os/bsd/gc/z/zBackingFile_bsd.hpp
! src/hotspot/os/bsd/gc/z/zPhysicalMemoryBacking_bsd.cpp
! src/hotspot/os/bsd/gc/z/zPhysicalMemoryBacking_bsd.hpp
- src/hotspot/os/linux/gc/z/zBackingFile_linux.cpp
- src/hotspot/os/linux/gc/z/zBackingFile_linux.hpp
- src/hotspot/os/linux/gc/z/zBackingPath_linux.cpp
- src/hotspot/os/linux/gc/z/zBackingPath_linux.hpp
! src/hotspot/os/linux/gc/z/zPhysicalMemoryBacking_linux.cpp
! src/hotspot/os/linux/gc/z/zPhysicalMemoryBacking_linux.hpp
- src/hotspot/os/windows/gc/z/zBackingFile_windows.cpp
- src/hotspot/os/windows/gc/z/zBackingFile_windows.hpp
! src/hotspot/os/windows/gc/z/zPhysicalMemoryBacking_windows.cpp
! src/hotspot/os/windows/gc/z/zPhysicalMemoryBacking_windows.hpp
- src/hotspot/share/gc/parallel/psMarkSweep.cpp
- src/hotspot/share/gc/parallel/psMarkSweep.hpp
- src/hotspot/share/gc/parallel/psMarkSweepDecorator.cpp
- src/hotspot/share/gc/parallel/psMarkSweepDecorator.hpp
- src/hotspot/share/gc/parallel/psMarkSweepProxy.hpp
- src/hotspot/share/jfr/leakprofiler/utilities/unifiedOop.hpp
- src/hotspot/share/runtime/flags/jvmFlagWriteableList.cpp
- src/hotspot/share/runtime/flags/jvmFlagWriteableList.hpp
- src/java.base/share/classes/com/sun/java/util/jar/pack/AdaptiveCoding.java
- src/java.base/share/classes/com/sun/java/util/jar/pack/Attribute.java
- src/java.base/share/classes/com/sun/java/util/jar/pack/BandStructure.java
- src/java.base/share/classes/com/sun/java/util/jar/pack/ClassReader.java
- src/java.base/share/classes/com/sun/java/util/jar/pack/ClassWriter.java
- src/java.base/share/classes/com/sun/java/util/jar/pack/Code.java
- src/java.base/share/classes/com/sun/java/util/jar/pack/Coding.java
- src/java.base/share/classes/com/sun/java/util/jar/pack/CodingChooser.java
- src/java.base/share/classes/com/sun/java/util/jar/pack/CodingMethod.java
- src/java.base/share/classes/com/sun/java/util/jar/pack/ConstantPool.java
- src/java.base/share/classes/com/sun/java/util/jar/pack/Constants.java
- src/java.base/share/classes/com/sun/java/util/jar/pack/Driver.java
- src/java.base/share/classes/com/sun/java/util/jar/pack/DriverResource.java
- src/java.base/share/classes/com/sun/java/util/jar/pack/DriverResource_ja.java
- src/java.base/share/classes/com/sun/java/util/jar/pack/DriverResource_zh_CN.java
- src/java.base/share/classes/com/sun/java/util/jar/pack/FixedList.java
- src/java.base/share/classes/com/sun/java/util/jar/pack/Fixups.java
- src/java.base/share/classes/com/sun/java/util/jar/pack/Histogram.java
- src/java.base/share/classes/com/sun/java/util/jar/pack/Instruction.java
- src/java.base/share/classes/com/sun/java/util/jar/pack/NativeUnpack.java
- src/java.base/share/classes/com/sun/java/util/jar/pack/Package.java
- src/java.base/share/classes/com/sun/java/util/jar/pack/PackageReader.java
- src/java.base/share/classes/com/sun/java/util/jar/pack/PackageWriter.java
- src/java.base/share/classes/com/sun/java/util/jar/pack/PackerImpl.java
- src/java.base/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java
- src/java.base/share/classes/com/sun/java/util/jar/pack/PropMap.java
- src/java.base/share/classes/com/sun/java/util/jar/pack/TLGlobals.java
- src/java.base/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java
- src/java.base/share/classes/com/sun/java/util/jar/pack/Utils.java
- src/java.base/share/classes/com/sun/java/util/jar/pack/intrinsic.properties
- src/java.base/share/classes/com/sun/java/util/jar/pack/package-info.java
- src/java.base/share/classes/java/util/jar/Pack200.java
! src/java.base/share/classes/module-info.java
- src/java.base/share/classes/sun/net/idn/Punycode.java
- src/java.base/share/classes/sun/net/idn/StringPrep.java
- src/java.base/share/classes/sun/net/idn/StringPrepDataReader.java
- src/java.base/share/classes/sun/net/idn/UCharacterDirection.java
- src/java.base/share/classes/sun/net/idn/UCharacterEnums.java
- src/java.base/share/classes/sun/security/util/math/intpoly/FieldGen.jsh
- src/java.base/share/classes/sun/security/util/math/intpoly/IntegerPolynomialP256.java
- src/java.base/share/classes/sun/security/util/math/intpoly/IntegerPolynomialP384.java
- src/java.base/share/classes/sun/security/util/math/intpoly/IntegerPolynomialP521.java
- src/java.base/share/classes/sun/security/util/math/intpoly/P256OrderField.java
- src/java.base/share/classes/sun/security/util/math/intpoly/P384OrderField.java
- src/java.base/share/classes/sun/security/util/math/intpoly/P521OrderField.java
- src/java.base/share/classes/sun/security/util/math/intpoly/header.txt
- src/java.base/share/classes/sun/text/bidi/BidiBase.java
- src/java.base/share/classes/sun/text/bidi/BidiLine.java
- src/java.base/share/classes/sun/text/bidi/BidiRun.java
- src/java.base/share/classes/sun/text/bidi/BidiWriter.java
- src/java.base/share/classes/sun/text/normalizer/BMPSet.java
- src/java.base/share/classes/sun/text/normalizer/CharTrie.java
- src/java.base/share/classes/sun/text/normalizer/CharacterIteratorWrapper.java
- src/java.base/share/classes/sun/text/normalizer/CodePointMap.java
- src/java.base/share/classes/sun/text/normalizer/CodePointTrie.java
- src/java.base/share/classes/sun/text/normalizer/FilteredNormalizer2.java
- src/java.base/share/classes/sun/text/normalizer/ICUBinary.java
- src/java.base/share/classes/sun/text/normalizer/Norm2AllModes.java
- src/java.base/share/classes/sun/text/normalizer/Normalizer2.java
- src/java.base/share/classes/sun/text/normalizer/NormalizerBase.java
- src/java.base/share/classes/sun/text/normalizer/NormalizerImpl.java
- src/java.base/share/classes/sun/text/normalizer/OutputInt.java
- src/java.base/share/classes/sun/text/normalizer/Replaceable.java
- src/java.base/share/classes/sun/text/normalizer/ReplaceableString.java
- src/java.base/share/classes/sun/text/normalizer/ReplaceableUCharacterIterator.java
- src/java.base/share/classes/sun/text/normalizer/Trie.java
- src/java.base/share/classes/sun/text/normalizer/Trie2.java
- src/java.base/share/classes/sun/text/normalizer/Trie2_16.java
- src/java.base/share/classes/sun/text/normalizer/UBiDiProps.java
- src/java.base/share/classes/sun/text/normalizer/UCharacter.java
- src/java.base/share/classes/sun/text/normalizer/UCharacterIterator.java
- src/java.base/share/classes/sun/text/normalizer/UCharacterProperty.java
- src/java.base/share/classes/sun/text/normalizer/UTF16.java
- src/java.base/share/classes/sun/text/normalizer/UnicodeSet.java
- src/java.base/share/classes/sun/text/normalizer/UnicodeSetStringSpan.java
- src/java.base/share/classes/sun/text/normalizer/Utility.java
- src/java.base/share/classes/sun/text/normalizer/VersionInfo.java
- src/java.base/share/classes/sun/text/resources/nfc.nrm
- src/java.base/share/classes/sun/text/resources/nfkc.nrm
- src/java.base/share/classes/sun/text/resources/ubidi.icu
- src/java.base/share/classes/sun/text/resources/uprops.icu
- src/java.base/share/native/libjava/jdk_util.c
! src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/DesktopIntegration.java
! src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/LinuxAppImageBuilder.java
! src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/LinuxPackageBundler.java
! src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/MacAppBundler.java
! src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/MacDmgBundler.java
! src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/DMGsetup.scpt
- src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/background_dmg.png
! src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/AbstractAppImageBuilder.java
! src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/AddLauncherArguments.java
! src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/Arguments.java
! src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/Executor.java
! src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/IOUtils.java
! src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/OverridableResource.java
! src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/resources/MainResources.properties
! src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/resources/MainResources_ja.properties
! src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/resources/MainResources_zh_CN.properties
! src/jdk.incubator.jpackage/share/native/libapplauncher/IniFile.cpp
! src/jdk.incubator.jpackage/unix/native/libapplauncher/PosixPlatform.cpp
! src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/WinAppBundler.java
! src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/WinMsiBundler.java
! src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/WindowsAppImageBuilder.java
! src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/WixSourcesBuilder.java
! src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/resources/main.wxs
! src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/resources/overrides.wxi
! src/jdk.incubator.jpackage/windows/native/libjpackage/WindowsRegistry.cpp
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/ObjectSubstitutions.java
- src/jdk.pack/share/classes/module-info.java
- src/jdk.pack/share/man/pack200.1
- src/jdk.pack/share/man/unpack200.1
- src/jdk.pack/share/native/common-unpack/bands.cpp
- src/jdk.pack/share/native/common-unpack/bands.h
- src/jdk.pack/share/native/common-unpack/bytes.cpp
- src/jdk.pack/share/native/common-unpack/bytes.h
- src/jdk.pack/share/native/common-unpack/coding.cpp
- src/jdk.pack/share/native/common-unpack/coding.h
- src/jdk.pack/share/native/common-unpack/constants.h
- src/jdk.pack/share/native/common-unpack/defines.h
- src/jdk.pack/share/native/common-unpack/unpack.cpp
- src/jdk.pack/share/native/common-unpack/unpack.h
- src/jdk.pack/share/native/common-unpack/utils.cpp
- src/jdk.pack/share/native/common-unpack/utils.h
- src/jdk.pack/share/native/common-unpack/zip.cpp
- src/jdk.pack/share/native/common-unpack/zip.h
- src/jdk.pack/share/native/libunpack/jni.cpp
- src/jdk.pack/share/native/unpack200/main.cpp
- src/jdk.pack/windows/native/unpack200/unpack200_proto.exe.manifest
- test/hotspot/jtreg/gc/startup_warnings/TestParallelScavengeSerialOld.java
- test/hotspot/jtreg/runtime/handshake/HandshakeWalkStackFallbackTest.java
- test/hotspot/jtreg/runtime/records/TEST.properties
- test/jdk/java/io/Serializable/records/TEST.properties
- test/jdk/java/lang/instrument/TEST.properties
- test/jdk/java/lang/reflect/records/TEST.properties
- test/jdk/java/lang/runtime/TEST.properties
- test/jdk/java/net/NetworkInterface/NoSetNetworkInterface.java
- test/jdk/java/util/jar/Pack200/SecurityTest.java
- test/jdk/javax/net/ssl/compatibility/JdkRelease.java
- test/jdk/jdk/jfr/api/consumer/recordingstream/TestSetFlushInterval.java
- test/jdk/jdk/jfr/api/recording/time/TestSetFlushInterval.java
- test/jdk/jdk/jfr/event/gc/collection/TestGCCauseWithPSMarkSweep.java
- test/jdk/jdk/jfr/event/gc/collection/TestGCEventMixedWithPSMarkSweep.java
- test/jdk/jdk/jfr/event/gc/heapsummary/TestHeapSummaryEventPSSerial.java
- test/jdk/jdk/jfr/event/gc/objectcount/TestObjectCountAfterGCEventWithPSMarkSweep.java
- test/jdk/jdk/jfr/event/gc/refstat/TestRefStatEventWithPSMarkSweep.java
- test/jdk/jdk/jfr/event/oldobject/TestParallelOld.java
- test/jdk/sun/security/krb5/auto/SaslGSS.java
- test/jdk/tools/jar/DeprecateOptionN.java
- test/jdk/tools/jpackage/apps/com.other/com/other/Other.java
- test/jdk/tools/jpackage/apps/com.other/module-info.java
! test/jdk/tools/jpackage/helpers/JPackageHelper.java
! test/jdk/tools/jpackage/helpers/jdk/jpackage/test/Executor.java
! test/jdk/tools/jpackage/helpers/jdk/jpackage/test/Functional.java
! test/jdk/tools/jpackage/helpers/jdk/jpackage/test/HelloApp.java
! test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageCommand.java
! test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JarBuilder.java
! test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JavaAppDesc.java
! test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JavaTool.java
! test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LinuxHelper.java
! test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacHelper.java
! test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PackageTest.java
! test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PackageType.java
! test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TKit.java
! test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TestBuilder.java
! test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TestInstance.java
! test/jdk/tools/jpackage/helpers/jdk/jpackage/test/WindowsHelper.java
! test/jdk/tools/jpackage/linux/MaintainerTest.java
! test/jdk/tools/jpackage/linux/PackageDepsTest.java
! test/jdk/tools/jpackage/linux/ReleaseTest.java
! test/jdk/tools/jpackage/linux/ShortcutHintTest.java
! test/jdk/tools/jpackage/macosx/base/SigningBase.java
- test/jdk/tools/jpackage/manage_packages.sh
! test/jdk/tools/jpackage/resources/icon.png
! test/jdk/tools/jpackage/run_tests.sh
- test/jdk/tools/jpackage/share/AddLauncherBase.java
- test/jdk/tools/jpackage/share/AddLauncherModuleTest.java
- test/jdk/tools/jpackage/share/AddLauncherTest.java
- test/jdk/tools/jpackage/share/AddLaunchersTest.java
! test/jdk/tools/jpackage/share/AdditionalLaunchersTest.java
! test/jdk/tools/jpackage/share/AppImagePackageTest.java
! test/jdk/tools/jpackage/share/ArgumentsTest.java
! test/jdk/tools/jpackage/share/IconTest.java
! test/jdk/tools/jpackage/share/InstallDirTest.java
! test/jdk/tools/jpackage/share/JavaOptionsEqualsTest.java
! test/jdk/tools/jpackage/share/LicenseTest.java
! test/jdk/tools/jpackage/share/jdk/jpackage/tests/BasicTest.java
! test/jdk/tools/jpackage/share/jdk/jpackage/tests/MainClassTest.java
! test/jdk/tools/jpackage/share/jdk/jpackage/tests/ModulePathTest.java
! test/jdk/tools/jpackage/windows/WinConsoleTest.java
! test/jdk/tools/jpackage/windows/WinScriptTest.java
! test/jdk/tools/jpackage/windows/WinUpgradeUUIDTest.java
! test/jdk/tools/launcher/HelpFlagsTest.java
! test/jdk/tools/launcher/VersionCheck.java
- test/jdk/tools/pack200/AttributeTests.java
- test/jdk/tools/pack200/BandIntegrity.java
- test/jdk/tools/pack200/CommandLineTests.java
- test/jdk/tools/pack200/DeprecatePack200.java
- test/jdk/tools/pack200/InstructionTests.java
- test/jdk/tools/pack200/ModuleAttributes.java
- test/jdk/tools/pack200/MultiRelease.java
- test/jdk/tools/pack200/Pack200Props.java
- test/jdk/tools/pack200/Pack200Test.java
- test/jdk/tools/pack200/PackChecksum.java
- test/jdk/tools/pack200/PackTestZip64.java
- test/jdk/tools/pack200/PackTestZip64Manual.java
- test/jdk/tools/pack200/PackageVersionTest.java
- test/jdk/tools/pack200/RepackTest.java
- test/jdk/tools/pack200/T7007157.java
- test/jdk/tools/pack200/TestExceptions.java
- test/jdk/tools/pack200/TestNormal.java
- test/jdk/tools/pack200/TimeStamp.java
- test/jdk/tools/pack200/UnpackerMemoryTest.java
- test/jdk/tools/pack200/Utils.java
- test/jdk/tools/pack200/badattr.jar
- test/jdk/tools/pack200/pack200-verifier/data/README
- test/jdk/tools/pack200/pack200-verifier/data/golden.jar
- test/jdk/tools/pack200/pack200-verifier/make/build.xml
- test/jdk/tools/pack200/pack200-verifier/src/sun/tools/pack/verify/ClassCompare.java
- test/jdk/tools/pack200/pack200-verifier/src/sun/tools/pack/verify/Globals.java
- test/jdk/tools/pack200/pack200-verifier/src/sun/tools/pack/verify/JarFileCompare.java
- test/jdk/tools/pack200/pack200-verifier/src/sun/tools/pack/verify/Main.java
- test/jdk/tools/pack200/pack200-verifier/src/sun/tools/pack/verify/VerifyTreeSet.java
- test/jdk/tools/pack200/pack200-verifier/src/xmlkit/ClassReader.java
- test/jdk/tools/pack200/pack200-verifier/src/xmlkit/CommandLineParser.java
- test/jdk/tools/pack200/pack200-verifier/src/xmlkit/TokenList.java
- test/jdk/tools/pack200/pack200-verifier/src/xmlkit/XMLKit.java
- test/jdk/tools/pack200/typeannos/Lambda.java
- test/jdk/tools/pack200/typeannos/Readme.txt
- test/jdk/tools/pack200/typeannos/TargetTypes.java
- test/jdk/tools/pack200/typeannos/TestTypeAnnotations.java
- test/jdk/tools/pack200/typeannos/TypeUseTarget.java
Changeset: 18bd7e53be24
Author: almatvee
Date: 2020-01-21 14:53 -0500
URL: https://hg.openjdk.java.net/jdk/sandbox/rev/18bd7e53be24
8234112: Update JNLPConvertor to latest jpackage changes
Reviewed-by: herrick
! src/demo/share/jpackage/JNLPConverter/README.txt
! src/demo/share/jpackage/JNLPConverter/src/jnlp/converter/JNLPConverter.java
! src/demo/share/jpackage/JNLPConverter/src/jnlp/converter/Options.java
! src/demo/share/jpackage/JNLPConverter/src/jnlp/converter/Platform.java
More information about the jdk-sandbox-changes
mailing list