Mercurial > hg > release > icedtea7-2.4
changeset 2613:7d1c8d7548ac
Remove EC source code prior to build (already disabled during build using DISABLE_INTREE_EC=true) and make all removals verbose.
2013-01-14 Andrew John Hughes <gnu_andrew@member.fsf.org>
* fsg.sh:
Remove source code for the EC provider which
isn't built. Make the removals verbose so
they appear in logs as with
remove-intree-libraries.sh.
author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
---|---|
date | Mon, 14 Jan 2013 18:54:27 +0000 |
parents | 2836b3c6739b |
children | c2c1c1c2d74b |
files | ChangeLog fsg.sh |
diffstat | 2 files changed, 32 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Jan 04 14:59:32 2013 +0100 +++ b/ChangeLog Mon Jan 14 18:54:27 2013 +0000 @@ -1,3 +1,11 @@ +2013-01-14 Andrew John Hughes <gnu_andrew@member.fsf.org> + + * fsg.sh: + Remove source code for the EC provider which + isn't built. Make the removals verbose so + they appear in logs as with + remove-intree-libraries.sh. + 2013-01-04 Pavel Tisnovsky <ptisnovs@redhat.com> * patches/boot/use_target_6_for_bootstrap_classes.patch:
--- a/fsg.sh Fri Jan 04 14:59:32 2013 +0100 +++ b/fsg.sh Mon Jan 14 18:54:27 2013 +0000 @@ -7,13 +7,13 @@ # PR146/S6713083 # Remove binaries -rm -f \ +rm -vf \ openjdk/jdk/test/sun/management/windows/revokeall.exe \ openjdk/jdk/test/sun/management/jmxremote/bootstrap/linux-i586/launcher \ openjdk/jdk/test/sun/management/jmxremote/bootstrap/solaris-sparc/launcher \ openjdk/jdk/test/sun/management/jmxremote/bootstrap/solaris-i586/launcher -rm -f \ +rm -vf \ openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/linux-i586/libLauncher.so \ openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-i586/libLauncher.so \ openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-sparc/libLauncher.so \ @@ -25,7 +25,7 @@ openjdk/jdk/test/tools/launcher/lib/sparc/lib64/lib64/liblibrary.so \ openjdk/jdk/test/tools/launcher/lib/sparc/lib64/liblibrary.so -rm -f \ +rm -vf \ openjdk/jdk/test/java/util/Locale/data/deflocale.exe \ openjdk/jdk/test/java/util/Locale/data/deflocale.jds3 \ openjdk/jdk/test/java/util/Locale/data/deflocale.rhel4 \ @@ -35,7 +35,7 @@ openjdk/jdk/test/java/util/Locale/data/deflocale.winxp \ # Remove test sources with questionable license headers. -rm -f \ +rm -vf \ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3.java \ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_IE.java \ openjdk/jdk/test/java/util/ResourceBundle/Bug4165815Test.java \ @@ -73,13 +73,13 @@ # Remove J2DBench sources, some of which have questionable license # headers. -rm -rf \ +rm -rvf \ openjdk/jdk/src/share/demo/java2d/J2DBench # BEGIN Debian/Ubuntu additions # binary files -rm -f \ +rm -vf \ openjdk/jdk/test/sun/net/idn/nfscis.spp # TODO @@ -87,20 +87,29 @@ # PR140, S6695776 # Also see patches/icedtea-jscheme.patch -rm -rf openjdk/corba/src/share/classes/com/sun/tools/corba/se/logutil/lib -rm -rf openjdk/corba/src/share/classes/com/sun/tools/corba/se/logutil/scripts +rm -rvf openjdk/corba/src/share/classes/com/sun/tools/corba/se/logutil/lib +rm -rvf openjdk/corba/src/share/classes/com/sun/tools/corba/se/logutil/scripts # PR139, S6710791 -rm -f \ +rm -vf \ openjdk/hotspot/agent/kk/src/share/lib/maf-1_0.jar \ openjdk/hotspot/agent/kk/src/share/lib/jlfgr-1_0.jar \ # END Debian/Ubuntu additions -# Remove support for proprietary SNMP plug -rm -rf openjdk/jdk/src/share/classes/sun/management/snmp -rm -rf openjdk/jdk/src/share/classes/com/sun/jmx/snmp -rm -rf openjdk/jdk/test/com/sun/jmx/snmp +echo "Removing support for proprietary SNMP plug" +rm -rvf openjdk/jdk/src/share/classes/sun/management/snmp +rm -rvf openjdk/jdk/src/share/classes/com/sun/jmx/snmp +rm -rvf openjdk/jdk/test/com/sun/jmx/snmp + +echo "Removing registration tests" +rm -rvf openjdk/jdk/test/com/sun/servicetag -# Remove registration tests -rm -rf openjdk/jdk/test/com/sun/servicetag +echo "Removing EC source code we don't build" +rm -vf openjdk/jdk/src/share/classes/sun/security/ec/ECDHKeyAgreement.java +rm -vf openjdk/jdk/src/share/classes/sun/security/ec/ECDSASignature.java +rm -vf openjdk/jdk/src/share/classes/sun/security/ec/ECKeyPairGenerator.java +rm -vf openjdk/jdk/src/share/classes/sun/security/ec/SunEC.java +rm -vf openjdk/jdk/src/share/classes/sun/security/ec/SunECEntries.java +rm -rvf openjdk/jdk/src/share/native/sun/security/ec +rm -rvf openjdk/jdk/make/sun/security/ec