Mercurial > hg > icedtea10
changeset 2529:a9271fe74b8d
PR1281, RH513605: Updating/Installing OpenJDK should recreate the shared class-data archive
2015-03-02 Andrew John Hughes <gnu.andrew@member.fsf.org>
* Makefile.am:
(add-archive): Change from BUILD_OUTPUT_DIR to
BUILD_IMAGE_DIR.
(clean-add-archive): Likewise.
(add-archive-debug): Change from DEBUG_BUILD_OUTPUT_DIR
to BUILD_DEBUG_IMAGE_DIR.
(clean-add-archive-debug): Likewise.
(add-archive-boot): Change from BOOT_BUILD_OUTPUT_DIR
to BUILD_BOOT_IMAGE_DIR.
(clean-add-archive-boot): Likewise.
2013-06-05 Andrew John Hughes <gnu.andrew@member.fsf.org>
PR1281: Updating/Installing OpenJDK should recreate the
shared class-data archive
* Makefile.am:
(.PHONY): Add clean-add-archive, clean-add-archive-debug
and clean-add-archive-boot.
2013-02-08 Andrew John Hughes <gnu.andrew@redhat.com>
PR1301: PR1171 causes Zero builds to fail
* Makefile.am:
(add-archive): Don't run -Xshare:dump if building
Zero.
(add-archive-debug): Likewise.
(add-archive-boot): Likewise.
2013-01-25 Andrew John Hughes <gnu.andrew@redhat.com>
* Makefile.am:
(clean-add-archive): Delete the archive.
(clean-add-archive-debug): Likewise for debug.
(clean-add-archive-boot): Likewise for bootstrap.
2012-11-28 Andrew John Hughes <gnu.andrew@redhat.com>
* Makefile.am:
(add-archive): Only run -Xshare:dump when java
exists and we aren't building CACAO or JamVM.
(add-archive-debug): Likewise.
(add-archive-boot): Likewise.
2012-11-20 Andrew John Hughes <gnu.andrew@redhat.com>
RH513605: Updating/Installing OpenJDK should recreate
the shared class-data archive
* Makefile.am:
(add-archive): Run -Xshare:dump on the newly built JDK.
(clean-add-archive): Delete stamp.
(add-archive-debug): Same as add-archive for icedtea-debug.
(clean-add-archive-debug): Same as clean-add-archive for icedtea-debug.
(icedtea-stage2): Depend on add-archive.
(clean-icedtea-stage2): Depend on clean-add-archive.
(icedtea-debug-stage2): Depend on add-archive-debug.
(clean-icedtea-debug-stage2): Depend on clean-add-archive-debug.
(add-archive-boot): Same as add-archive for icedtea-boot.
(clean-add-archive-boot): Same as clean-add-archive for icedtea-boot.
(icedtea-stage1): Depend on add-archive-boot.
(clean-icedtea-stage1): Depend on clean-add-archive-boot.
* NEWS: Mention.
author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
---|---|
date | Tue, 03 Mar 2015 00:15:26 +0000 |
parents | d84be26576af |
children | d4b7c0a97901 |
files | ChangeLog Makefile.am NEWS |
diffstat | 3 files changed, 128 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Mar 02 14:56:30 2015 +0000 +++ b/ChangeLog Tue Mar 03 00:15:26 2015 +0000 @@ -1,3 +1,67 @@ +2015-03-02 Andrew John Hughes <gnu.andrew@member.fsf.org> + + * Makefile.am: + (add-archive): Change from BUILD_OUTPUT_DIR to + BUILD_IMAGE_DIR. + (clean-add-archive): Likewise. + (add-archive-debug): Change from DEBUG_BUILD_OUTPUT_DIR + to BUILD_DEBUG_IMAGE_DIR. + (clean-add-archive-debug): Likewise. + (add-archive-boot): Change from BOOT_BUILD_OUTPUT_DIR + to BUILD_BOOT_IMAGE_DIR. + (clean-add-archive-boot): Likewise. + +2013-06-05 Andrew John Hughes <gnu.andrew@member.fsf.org> + + PR1281: Updating/Installing OpenJDK should recreate the + shared class-data archive + * Makefile.am: + (.PHONY): Add clean-add-archive, clean-add-archive-debug + and clean-add-archive-boot. + +2013-02-08 Andrew John Hughes <gnu.andrew@redhat.com> + + PR1301: PR1171 causes Zero builds to fail + * Makefile.am: + (add-archive): Don't run -Xshare:dump if building + Zero. + (add-archive-debug): Likewise. + (add-archive-boot): Likewise. + +2013-01-25 Andrew John Hughes <gnu.andrew@redhat.com> + + * Makefile.am: + (clean-add-archive): Delete the archive. + (clean-add-archive-debug): Likewise for debug. + (clean-add-archive-boot): Likewise for bootstrap. + +2012-11-28 Andrew John Hughes <gnu.andrew@redhat.com> + + * Makefile.am: + (add-archive): Only run -Xshare:dump when java + exists and we aren't building CACAO or JamVM. + (add-archive-debug): Likewise. + (add-archive-boot): Likewise. + +2012-11-20 Andrew John Hughes <gnu.andrew@redhat.com> + + RH513605: Updating/Installing OpenJDK should recreate + the shared class-data archive + * Makefile.am: + (add-archive): Run -Xshare:dump on the newly built JDK. + (clean-add-archive): Delete stamp. + (add-archive-debug): Same as add-archive for icedtea-debug. + (clean-add-archive-debug): Same as clean-add-archive for icedtea-debug. + (icedtea-stage2): Depend on add-archive. + (clean-icedtea-stage2): Depend on clean-add-archive. + (icedtea-debug-stage2): Depend on add-archive-debug. + (clean-icedtea-debug-stage2): Depend on clean-add-archive-debug. + (add-archive-boot): Same as add-archive for icedtea-boot. + (clean-add-archive-boot): Same as clean-add-archive for icedtea-boot. + (icedtea-stage1): Depend on add-archive-boot. + (clean-icedtea-stage1): Depend on clean-add-archive-boot. + * NEWS: Mention. + 2015-03-02 Andrew John Hughes <gnu.andrew@member.fsf.org> * Makefile.am:
--- a/Makefile.am Mon Mar 02 14:56:30 2015 +0000 +++ b/Makefile.am Tue Mar 03 00:15:26 2015 +0000 @@ -533,7 +533,8 @@ jtregcheck clean-remove-intree-libraries \ clean-jamvm clean-extract-jamvm clean-add-jamvm clean-add-jamvm-debug \ clean-extract-hotspot clean-sanitise-openjdk clean-icedtea-debug \ - clean-download-nashorn clean-extract-nashorn clean-download-hotspot + clean-download-nashorn clean-extract-nashorn clean-download-hotspot \ + clean-add-archive clean-add-archive-debug clean-add-archive-boot env: @echo 'unset JAVA_HOME' @@ -1582,20 +1583,53 @@ rm -f stamps/icedtea-debug-configure.stamp rm -f stamps/icedtea-debug.stamp +stamps/add-archive.stamp: stamps/icedtea.stamp +if !ENABLE_JAMVM +if !ENABLE_CACAO +if !ZERO_BUILD + if [ -e $(BUILD_IMAGE_DIR)/j2sdk-image/bin/java ] ; then \ + $(BUILD_IMAGE_DIR)/j2sdk-image/bin/java -Xshare:dump ; \ + fi +endif +endif +endif + touch stamps/add-archive.stamp + +clean-add-archive: + rm -vf $(BUILD_IMAGE_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/*/*.jsa + rm -f stamps/add-archive.stamp + +stamps/add-archive-debug.stamp: stamps/icedtea-debug.stamp +if !ENABLE_JAMVM +if !ENABLE_CACAO +if !ZERO_BUILD + if [ -e $(BUILD_DEBUG_IMAGE_DIR)/j2sdk-image/bin/java ] ; then \ + $(BUILD_DEBUG_IMAGE_DIR)/j2sdk-image/bin/java -Xshare:dump ; \ + fi +endif +endif +endif + touch stamps/add-archive-debug.stamp + +clean-add-archive-debug: + rm -vf $(BUILD_DEBUG_IMAGE_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/*/*.jsa + rm -f stamps/add-archive-debug.stamp + stamps/icedtea-stage2.stamp: stamps/icedtea.stamp stamps/add-cacao.stamp \ - stamps/add-zero.stamp stamps/add-jamvm.stamp + stamps/add-zero.stamp stamps/add-jamvm.stamp stamps/add-archive.stamp mkdir -p stamps touch $@ -clean-icedtea-stage2: clean-add-jamvm +clean-icedtea-stage2: clean-add-jamvm clean-add-archive rm -f stamps/icedtea-stage2.stamp stamps/icedtea-debug-stage2.stamp: stamps/icedtea-debug.stamp \ - stamps/add-cacao-debug.stamp stamps/add-zero-debug.stamp stamps/add-jamvm-debug.stamp + stamps/add-cacao-debug.stamp stamps/add-zero-debug.stamp stamps/add-jamvm-debug.stamp \ + stamps/add-archive-debug.stamp mkdir -p stamps touch $@ -clean-icedtea-debug-stage2: clean-add-jamvm-debug +clean-icedtea-debug-stage2: clean-add-jamvm-debug clean-add-archive-debug rm -f stamps/icedtea-debug-stage2.stamp # OpenJDK boot Targets @@ -1661,11 +1695,27 @@ rm -f stamps/icedtea-boot-configure.stamp rm -f stamps/icedtea-boot.stamp -stamps/icedtea-stage1.stamp: stamps/icedtea-boot.stamp +stamps/add-archive-boot.stamp: stamps/icedtea-boot.stamp +if !ENABLE_JAMVM +if !ENABLE_CACAO +if !ZERO_BUILD + if [ -e $(BUILD_BOOT_IMAGE_DIR)/j2sdk-image/bin/java ] ; then \ + $(BUILD_BOOT_IMAGE_DIR)/j2sdk-image/bin/java -Xshare:dump ; \ + fi +endif +endif +endif + touch $@ + +clean-add-archive-boot: + rm -vf $(BUILD_BOOT_IMAGE_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/*/*.jsa + rm -f stamps/add-archive-boot.stamp + +stamps/icedtea-stage1.stamp: stamps/icedtea-boot.stamp stamps/add-archive-boot.stamp mkdir -p stamps touch $@ -clean-icedtea-stage1: +clean-icedtea-stage1: clean-add-archive-boot rm -f stamps/icedtea-stage1.stamp # PulseAudio based mixer @@ -2171,6 +2221,12 @@ # Target Aliases # =============== +add-archive: stamps/add-archive.stamp + +add-archive-boot: stamps/add-archive-ecj.stamp + +add-archive-debug: stamps/add-archive-debug.stamp + add-zero: stamps/add-zero.stamp add-zero-debug: stamps/add-zero-debug.stamp
--- a/NEWS Mon Mar 02 14:56:30 2015 +0000 +++ b/NEWS Tue Mar 03 00:15:26 2015 +0000 @@ -26,6 +26,7 @@ - PR729: GTKLookAndFeel should be the system look&feel on all GNU/Linux desktops - PR1275: Provide option to turn off downloading of tarballs - PR1279: Synchronise CACAO versions between IcedTea6/7/8 where possible + - PR1281, RH513605: Updating/Installing OpenJDK should recreate the shared class-data archive - PR1325: Only add classes to rt-source-files.txt if actually needed - PR1346: Filter out -j option to make - PR1347: Update list of checked JDKs