Skip to content
Permalink
Browse files

8234542: code removal of Pack200 Tools and API

Reviewed-by: alanb, mchung, erikj
  • Loading branch information
slowhog committed Dec 10, 2019
1 parent c198b4d commit 9ac2f8b6543b99ff361501361bcbac55c7579485
Showing with 4 additions and 46,217 deletions.
  1. +0 −1 make/autoconf/compare.sh.in
  2. +0 −2 make/common/Modules.gmk
  3. +0 −102 make/launcher/Launcher-jdk.pack.gmk
  4. +0 −53 make/lib/Lib-jdk.pack.gmk
  5. +0 −1 make/nashorn/element-list
  6. +0 −25 make/scripts/compare.sh
  7. +0 −2 make/scripts/compare_exceptions.sh.incl
  8. +0 −298 src/java.base/share/classes/com/sun/java/util/jar/pack/AdaptiveCoding.java
  9. +0 −1,699 src/java.base/share/classes/com/sun/java/util/jar/pack/Attribute.java
  10. +0 −2,762 src/java.base/share/classes/com/sun/java/util/jar/pack/BandStructure.java
  11. +0 −619 src/java.base/share/classes/com/sun/java/util/jar/pack/ClassReader.java
  12. +0 −317 src/java.base/share/classes/com/sun/java/util/jar/pack/ClassWriter.java
  13. +0 −398 src/java.base/share/classes/com/sun/java/util/jar/pack/Code.java
  14. +0 −906 src/java.base/share/classes/com/sun/java/util/jar/pack/Coding.java
  15. +0 −1,489 src/java.base/share/classes/com/sun/java/util/jar/pack/CodingChooser.java
  16. +0 −43 src/java.base/share/classes/com/sun/java/util/jar/pack/CodingMethod.java
  17. +0 −1,658 src/java.base/share/classes/com/sun/java/util/jar/pack/ConstantPool.java
  18. +0 −515 src/java.base/share/classes/com/sun/java/util/jar/pack/Constants.java
  19. +0 −750 src/java.base/share/classes/com/sun/java/util/jar/pack/Driver.java
  20. +0 −136 src/java.base/share/classes/com/sun/java/util/jar/pack/DriverResource.java
  21. +0 −136 src/java.base/share/classes/com/sun/java/util/jar/pack/DriverResource_ja.java
  22. +0 −136 src/java.base/share/classes/com/sun/java/util/jar/pack/DriverResource_zh_CN.java
  23. +0 −174 src/java.base/share/classes/com/sun/java/util/jar/pack/FixedList.java
  24. +0 −570 src/java.base/share/classes/com/sun/java/util/jar/pack/Fixups.java
  25. +0 −818 src/java.base/share/classes/com/sun/java/util/jar/pack/Histogram.java
  26. +0 −689 src/java.base/share/classes/com/sun/java/util/jar/pack/Instruction.java
  27. +0 −332 src/java.base/share/classes/com/sun/java/util/jar/pack/NativeUnpack.java
  28. +0 −1,377 src/java.base/share/classes/com/sun/java/util/jar/pack/Package.java
  29. +0 −2,376 src/java.base/share/classes/com/sun/java/util/jar/pack/PackageReader.java
  30. +0 −1,743 src/java.base/share/classes/com/sun/java/util/jar/pack/PackageWriter.java
  31. +0 −611 src/java.base/share/classes/com/sun/java/util/jar/pack/PackerImpl.java
  32. +0 −500 src/java.base/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java
  33. +0 −332 src/java.base/share/classes/com/sun/java/util/jar/pack/PropMap.java
  34. +0 −125 src/java.base/share/classes/com/sun/java/util/jar/pack/TLGlobals.java
  35. +0 −263 src/java.base/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java
  36. +0 −320 src/java.base/share/classes/com/sun/java/util/jar/pack/Utils.java
  37. +0 −48 src/java.base/share/classes/com/sun/java/util/jar/pack/intrinsic.properties
  38. +0 −101 src/java.base/share/classes/com/sun/java/util/jar/pack/package-info.java
  39. +0 −733 src/java.base/share/classes/java/util/jar/Pack200.java
  40. +0 −6 src/jdk.jartool/share/classes/sun/tools/jar/GNUStyleOptions.java
  41. +1 −32 src/jdk.jartool/share/classes/sun/tools/jar/Main.java
  42. +0 −2 src/jdk.jartool/share/classes/sun/tools/jar/resources/jar.properties
  43. +0 −42 src/jdk.pack/share/classes/module-info.java
  44. +0 −357 src/jdk.pack/share/man/pack200.1
  45. +0 −126 src/jdk.pack/share/man/unpack200.1
  46. +0 −486 src/jdk.pack/share/native/common-unpack/bands.cpp
  47. +0 −481 src/jdk.pack/share/native/common-unpack/bands.h
  48. +0 −193 src/jdk.pack/share/native/common-unpack/bytes.cpp
  49. +0 −144 src/jdk.pack/share/native/common-unpack/bytes.h
  50. +0 −989 src/jdk.pack/share/native/common-unpack/coding.cpp
  51. +0 −226 src/jdk.pack/share/native/common-unpack/coding.h
  52. +0 −497 src/jdk.pack/share/native/common-unpack/constants.h
  53. +0 −178 src/jdk.pack/share/native/common-unpack/defines.h
  54. +0 −5,250 src/jdk.pack/share/native/common-unpack/unpack.cpp
  55. +0 −509 src/jdk.pack/share/native/common-unpack/unpack.h
  56. +0 −183 src/jdk.pack/share/native/common-unpack/utils.cpp
  57. +0 −67 src/jdk.pack/share/native/common-unpack/utils.h
  58. +0 −708 src/jdk.pack/share/native/common-unpack/zip.cpp
  59. +0 −118 src/jdk.pack/share/native/common-unpack/zip.h
  60. +0 −351 src/jdk.pack/share/native/libunpack/jni.cpp
  61. +0 −469 src/jdk.pack/share/native/unpack200/main.cpp
  62. +0 −20 src/jdk.pack/windows/native/unpack200/unpack200_proto.exe.manifest
  63. +0 −1 src/utils/IdealGraphVisualizer/nbproject/project.properties
  64. +0 −9 test/jdk/ProblemList.txt
  65. +1 −3 test/jdk/TEST.groups
  66. +0 −39 test/jdk/java/util/jar/Pack200/SecurityTest.java
  67. +0 −96 test/jdk/tools/jar/DeprecateOptionN.java
  68. +0 −2 test/jdk/tools/launcher/HelpFlagsTest.java
  69. +2 −5 test/jdk/tools/launcher/VersionCheck.java
  70. +0 −126 test/jdk/tools/pack200/AttributeTests.java
  71. +0 −62 test/jdk/tools/pack200/BandIntegrity.java
  72. +0 −185 test/jdk/tools/pack200/CommandLineTests.java
  73. +0 −75 test/jdk/tools/pack200/DeprecatePack200.java
  74. +0 −76 test/jdk/tools/pack200/InstructionTests.java
  75. +0 −50 test/jdk/tools/pack200/ModuleAttributes.java
  76. +0 −258 test/jdk/tools/pack200/MultiRelease.java
  77. +0 −139 test/jdk/tools/pack200/Pack200Props.java
  78. +0 −142 test/jdk/tools/pack200/Pack200Test.java
  79. +0 −178 test/jdk/tools/pack200/PackChecksum.java
  80. +0 −160 test/jdk/tools/pack200/PackTestZip64.java
  81. +0 −33 test/jdk/tools/pack200/PackTestZip64Manual.java
  82. +0 −156 test/jdk/tools/pack200/PackageVersionTest.java
  83. +0 −75 test/jdk/tools/pack200/RepackTest.java
  84. +0 −69 test/jdk/tools/pack200/T7007157.java
  85. +0 −341 test/jdk/tools/pack200/TestExceptions.java
  86. +0 −61 test/jdk/tools/pack200/TestNormal.java
  87. +0 −157 test/jdk/tools/pack200/TimeStamp.java
  88. +0 −87 test/jdk/tools/pack200/UnpackerMemoryTest.java
  89. +0 −670 test/jdk/tools/pack200/Utils.java
  90. BIN test/jdk/tools/pack200/badattr.jar
  91. +0 −46 test/jdk/tools/pack200/pack200-verifier/data/README
  92. BIN test/jdk/tools/pack200/pack200-verifier/data/golden.jar
  93. +0 −64 test/jdk/tools/pack200/pack200-verifier/make/build.xml
  94. +0 −160 test/jdk/tools/pack200/pack200-verifier/src/sun/tools/pack/verify/ClassCompare.java
  95. +0 −309 test/jdk/tools/pack200/pack200-verifier/src/sun/tools/pack/verify/Globals.java
  96. +0 −199 test/jdk/tools/pack200/pack200-verifier/src/sun/tools/pack/verify/JarFileCompare.java
  97. +0 −171 test/jdk/tools/pack200/pack200-verifier/src/sun/tools/pack/verify/Main.java
  98. +0 −46 test/jdk/tools/pack200/pack200-verifier/src/sun/tools/pack/verify/VerifyTreeSet.java
  99. +0 −1,911 test/jdk/tools/pack200/pack200-verifier/src/xmlkit/ClassReader.java
  100. +0 −282 test/jdk/tools/pack200/pack200-verifier/src/xmlkit/CommandLineParser.java
  101. +0 −447 test/jdk/tools/pack200/pack200-verifier/src/xmlkit/TokenList.java
  102. +0 −4,328 test/jdk/tools/pack200/pack200-verifier/src/xmlkit/XMLKit.java
  103. +0 −59 test/jdk/tools/pack200/typeannos/Lambda.java
  104. +0 −11 test/jdk/tools/pack200/typeannos/Readme.txt
  105. +0 −227 test/jdk/tools/pack200/typeannos/TargetTypes.java
  106. +0 −46 test/jdk/tools/pack200/typeannos/TestTypeAnnotations.java
  107. +0 −62 test/jdk/tools/pack200/typeannos/TypeUseTarget.java
@@ -67,7 +67,6 @@ export STRIP="@STRIP@ @STRIPFLAGS@"
export TAR="@TAR@"
export TEE="@TEE@"
export UNIQ="@UNIQ@"
export UNPACK200="@FIXPATH@ @BOOT_JDK@/bin/unpack200"
export UNARCHIVE="@UNZIP@ -q -o"

export TOPDIR="@TOPDIR@"
@@ -129,7 +129,6 @@ endif
JRE_TOOL_MODULES += \
jdk.jdwp.agent \
jdk.incubator.jpackage \
jdk.pack \
jdk.scripting.nashorn.shell \
#

@@ -170,7 +169,6 @@ DOCS_MODULES += \
jdk.naming.dns \
jdk.naming.rmi \
jdk.net \
jdk.pack \
jdk.rmic \
jdk.scripting.nashorn \
jdk.sctp \

This file was deleted.

This file was deleted.

@@ -260,7 +260,6 @@ module:jdk.naming.rmi
module:jdk.net
jdk.net
jdk.nio
module:jdk.pack
module:jdk.rmic
module:jdk.scripting.nashorn
jdk.nashorn.api.scripting
@@ -529,31 +529,6 @@ compare_zip_file() {
(cd $OTHER_UNZIPDIR && $JIMAGE extract $OTHER_ZIP)
fi

# Find all archives inside and unzip them as well to compare the contents rather than
# the archives. pie.jar.pack.gz i app3.war is corrupt, skip it.
EXCEPTIONS="pie.jar.pack.gz jdk.pack"
for pack in $($FIND $THIS_UNZIPDIR \( -name "*.pack" -o -name "*.pack.gz" \) -a \
! -name pie.jar.pack.gz -a ! -name jdk.pack); do
($UNPACK200 $pack $pack.jar)
# Filter out the unzipped archives from the diff below.
EXCEPTIONS="$EXCEPTIONS $pack $pack.jar"
done
for pack in $($FIND $OTHER_UNZIPDIR \( -name "*.pack" -o -name "*.pack.gz" \) -a \
! -name pie.jar.pack.gz -a ! -name jdk.pack); do
($UNPACK200 $pack $pack.jar)
EXCEPTIONS="$EXCEPTIONS $pack $pack.jar"
done
for zip in $($FIND $THIS_UNZIPDIR -name "*.jar" -o -name "*.zip"); do
$MKDIR $zip.unzip
(cd $zip.unzip && $UNARCHIVE $zip)
EXCEPTIONS="$EXCEPTIONS $zip"
done
for zip in $($FIND $OTHER_UNZIPDIR -name "*.jar" -o -name "*.zip"); do
$MKDIR $zip.unzip
(cd $zip.unzip && $UNARCHIVE $zip)
EXCEPTIONS="$EXCEPTIONS $zip"
done

CONTENTS_DIFF_FILE=$WORK_DIR/$ZIP_FILE.diff
# On solaris, there is no -q option.
if [ "$OPENJDK_TARGET_OS" = "solaris" ]; then
@@ -50,9 +50,7 @@ elif [ "$OPENJDK_TARGET_OS" = "solaris" ]; then
SORT_SYMBOLS="
./lib/libfontmanager.so
./lib/libjimage.so
./lib/libunpack.so
./lib/server/libjvm.so
./bin/unpack200
./hotspot/gtest/server/libjvm.so
"
KNOWN_DIS_DIFF="

0 comments on commit 9ac2f8b

Please sign in to comment.
You can’t perform that action at this time.