/hg/icedtea: 2 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Sat Mar 5 02:08:39 UTC 2016
changeset 6c9c43c172bb in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=6c9c43c172bb
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Mar 04 20:38:10 2016 +0000
PR2865: Handle uninstallation.
2016-03-04 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR2865: Handle uninstallation.
* Makefile.am:
(uninstall-local): Implemented. Deletes files
installed by install-exec-local and install-data-local,
then removes directories created by those targets.
* NEWS: Updated.
* acinclude.m4:
(IT_CHECK_FOR_RMDIR): Check that rmdir is installed
and see if it supports the --ignore-fail-on-empty option.
* configure.ac:
Invoke IT_CHECK_FOR_RMDIR.
changeset db6287c26b47 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=db6287c26b47
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Sat Mar 05 02:06:23 2016 +0000
PR2826: Provide option to disable SystemTap tests
2016-03-04 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR2826: Provide option to disable SystemTap tests
* INSTALL: Document --disable-systemtap-tests.
* Makefile.am:
(SYSTEMTAP_TEST_SUITE): Define if SystemTap tests
are enabled.
(check-local): Use SYSTEMTAP_TEST_SUITE in place
of check-tapset.
(.PHONY): Add check-jdk, check-hotspot, check-langtools,
jtregcheck, check-tapset, check-tapset-probes and
check-tapset-jstack
* NEWS: Updated.
* acinclude.m4:
(IT_DISABLE_SYSTEMTAP_TESTS): Add option to
disable SystemTap tests.
* configure.ac:
Call IT_DISABLE_SYSTEMTAP_TESTS.
diffstat:
ChangeLog | 33 ++++++++++++
INSTALL | 1 +
Makefile.am | 154 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
NEWS | 2 +
acinclude.m4 | 39 ++++++++++++++
configure.ac | 2 +
6 files changed, 229 insertions(+), 2 deletions(-)
diffs (320 lines):
diff -r e5d122ba61c0 -r db6287c26b47 ChangeLog
--- a/ChangeLog Wed Mar 02 17:03:51 2016 +0000
+++ b/ChangeLog Sat Mar 05 02:06:23 2016 +0000
@@ -1,3 +1,36 @@
+2016-03-04 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR2826: Provide option to disable SystemTap tests
+ * INSTALL: Document --disable-systemtap-tests.
+ * Makefile.am:
+ (SYSTEMTAP_TEST_SUITE): Define if SystemTap tests
+ are enabled.
+ (check-local): Use SYSTEMTAP_TEST_SUITE in place
+ of check-tapset.
+ (.PHONY): Add check-jdk, check-hotspot, check-langtools,
+ jtregcheck, check-tapset, check-tapset-probes and
+ check-tapset-jstack
+ * NEWS: Updated.
+ * acinclude.m4:
+ (IT_DISABLE_SYSTEMTAP_TESTS): Add option to
+ disable SystemTap tests.
+ * configure.ac:
+ Call IT_DISABLE_SYSTEMTAP_TESTS.
+
+2016-03-04 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR2865: Handle uninstallation.
+ * Makefile.am:
+ (uninstall-local): Implemented. Deletes files
+ installed by install-exec-local and install-data-local,
+ then removes directories created by those targets.
+ * NEWS: Updated.
+ * acinclude.m4:
+ (IT_CHECK_FOR_RMDIR): Check that rmdir is installed
+ and see if it supports the --ignore-fail-on-empty option.
+ * configure.ac:
+ Invoke IT_CHECK_FOR_RMDIR.
+
2014-06-11 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR1741: Break PulseAudio provider out into IcedTea-Sound
diff -r e5d122ba61c0 -r db6287c26b47 INSTALL
--- a/INSTALL Wed Mar 02 17:03:51 2016 +0000
+++ b/INSTALL Sat Mar 05 02:06:23 2016 +0000
@@ -147,6 +147,7 @@
* --disable-hotspot-tests: Disable the running of the HotSpot JTReg suite.
* --disable-langtools-tests: Disable the running of the langtools JTReg suite.
* --disable-jdk-tests: Disable the running of the jdk JTreg suite.
+* --disable-systemtap-tests: Disable the running of the SystemTap test suite.
* --disable-xrender: Don't include the XRender pipeline.
* --enable-systemtap: Include support for tracing using systemtap.
* --enable-nss: Enable the NSS security provider.
diff -r e5d122ba61c0 -r db6287c26b47 Makefile.am
--- a/Makefile.am Wed Mar 02 17:03:51 2016 +0000
+++ b/Makefile.am Sat Mar 05 02:06:23 2016 +0000
@@ -195,6 +195,10 @@
TESTS_TO_RUN = jtreg $(addprefix check-,$(TEST_SUITES))
endif
+if !DISABLE_SYSTEMTAP_TESTS
+SYSTEMTAP_TEST_SUITE = check-tapset
+endif
+
if ENABLE_SUNEC
ECC_RESULT = yes
else
@@ -589,7 +593,7 @@
all-local: icedtea-stage2
-check-local: jtregcheck check-tapset stamps/check-ecc.stamp
+check-local: jtregcheck $(SYSTEMTAP_TEST_SUITE) stamps/check-ecc.stamp
clean-tests: clean-jtreg clean-tapset-report clean-jtreg-reports clean-check-ecc
if [ $(abs_top_srcdir) != $(abs_top_builddir) ] ; then \
@@ -635,7 +639,9 @@
clean-download-nashorn clean-extract-nashorn clean-download-hotspot \
clean-check-crypto clean-check-crypto-debug clean-check-crypto-boot \
clean-add-archive clean-add-archive-debug clean-add-archive-boot clean-cryptocheck \
- clean-tests clean-tapset-report clean-ecccheck clean-check-ecc
+ clean-tests clean-tapset-report clean-ecccheck clean-check-ecc \
+ check-jdk check-hotspot check-langtools jtregcheck check-tapset check-tapset-probes \
+ check-tapset-jstack
env:
@echo 'unset JAVA_HOME'
@@ -2434,6 +2440,150 @@
$(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/$${vms} ; \
fi ; \
done
+
+uninstall-local:
+ for files in $(BUILD_SDK_DIR)/bin/*; do \
+ rm -vf $(DESTDIR)$(bindir)/$$(basename $${files}); \
+ done
+ for files in $(BUILD_SDK_DIR)/include/*.h; do \
+ rm -vf $(DESTDIR)$(includedir)/$$(basename $${files}); \
+ done
+ for files in $(BUILD_SDK_DIR)/include/$(BUILD_OS_DIR)/*.h; do \
+ rm -vf $(DESTDIR)$(includedir)/$(BUILD_OS_DIR)/$$(basename $${files}); \
+ done
+ for files in $(BUILD_SDK_DIR)/lib/*.jar; do \
+ rm -vf $(DESTDIR)${exec_prefix}/lib/$$(basename $${files}); \
+ done
+ for files in $(BUILD_SDK_DIR)/lib/*.idl; do \
+ rm -vf $(DESTDIR)${exec_prefix}/lib/$$(basename $${files}); \
+ done
+ rm -vf $(DESTDIR)${exec_prefix}/lib/jexec
+ for files in $(BUILD_SDK_DIR)/lib/$(INSTALL_ARCH_DIR)/*.so; do \
+ rm -vf $(DESTDIR)${exec_prefix}/lib/$(INSTALL_ARCH_DIR)/$$(basename $${files}); \
+ done
+ for files in $(BUILD_SDK_DIR)/lib/$(INSTALL_ARCH_DIR)/jli/*.so; do \
+ rm -vf $(DESTDIR)${exec_prefix}/lib/$(INSTALL_ARCH_DIR)/jli/$$(basename $${files}); \
+ done
+ for files in $(BUILD_SDK_DIR)/jre/bin/*; do \
+ rm -vf $(DESTDIR)${prefix}/jre/bin/$$(basename $${files}); \
+ done
+ for files in $(BUILD_SDK_DIR)/jre/lib/*.jar; do \
+ rm -vf $(DESTDIR)${prefix}/jre/lib/$$(basename $${files}); \
+ done
+ rm -vf $(DESTDIR)${prefix}/jre/lib/jexec
+ for files in $(BUILD_SDK_DIR)/jre/lib/$(INSTALL_ARCH_DIR)/*.so; do \
+ rm -vf $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/$$(basename $${files}); \
+ done
+ for files in $(BUILD_SDK_DIR)/jre/lib/$(INSTALL_ARCH_DIR)/jli/*.so; do \
+ rm -vf $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/jli/$$(basename $${files}); \
+ done
+ for vms in client server ; do \
+ for files in $(BUILD_SDK_DIR)/jre/lib/$(INSTALL_ARCH_DIR)/$${vms}/*.so; do \
+ rm -vf $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/$${vms}/$$(basename $${files}); \
+ done ; \
+ done
+ for files in $(BUILD_SDK_DIR)/jre/lib/ext/*.jar; do \
+ rm -vf $(DESTDIR)${prefix}/jre/lib/ext/$$(basename $${files}); \
+ done
+ for files in $(BUILD_SDK_DIR)/tapset/*.stp; do \
+ rm -vf $(DESTDIR)${prefix}/tapset/$$(basename $${files}); \
+ done
+ for files in $(BUILD_SDK_DIR)/jre/lib/*.properties; do \
+ rm -vf $(DESTDIR)${prefix}/jre/lib/$$(basename $${files}); \
+ done
+ rm -vf $(DESTDIR)${prefix}/release
+ rm -vf $(DESTDIR)${prefix}/src.zip
+ rm -vf $(DESTDIR)${prefix}/jre/lib/classlist
+ rm -vf $(DESTDIR)${prefix}/jre/lib/currency.data
+ rm -vf $(DESTDIR)${prefix}/jre/lib/jvm.hprof.txt
+ rm -vf $(DESTDIR)${prefix}/jre/lib/meta-index
+ rm -vf $(DESTDIR)${prefix}/jre/lib/psfont.properties.ja
+ rm -vf $(DESTDIR)${prefix}/jre/lib/tzdb.dat
+ rm -vf $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/jvm.cfg
+ for vms in client server ; do \
+ rm -vf $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/$${vms}/Xusage.txt; \
+ done
+ for files in $(BUILD_SDK_DIR)/jre/lib/cmm/*.pf; do \
+ rm -vf $(DESTDIR)/${prefix}/jre/lib/cmm/$$(basename $${files}); \
+ done
+ rm -vf $(DESTDIR)${prefix}/jre/lib/ext/meta-index
+ for files in $(BUILD_SDK_DIR)/jre/lib/images/cursors/*.gif; do \
+ rm -vf $(DESTDIR)${prefix}/jre/lib/images/cursors/$$(basename $${files}); \
+ done
+ rm -vf $(DESTDIR)${prefix}/jre/lib/images/cursors/cursors.properties
+ rm -vf $(DESTDIR)${prefix}/jre/lib/management/jmxremote.access
+ rm -vf $(DESTDIR)${prefix}/jre/lib/management/management.properties
+ for files in $(BUILD_SDK_DIR)/jre/lib/management/*.template; do \
+ rm -vf $(DESTDIR)${prefix}/jre/lib/management/$$(basename $${files}); \
+ done
+ rm -vf $(DESTDIR)${prefix}/jre/lib/security/java.policy
+ rm -vf $(DESTDIR)${prefix}/jre/lib/security/java.security
+ rm -vf $(DESTDIR)${prefix}/jre/lib/security/nss.cfg
+ rm -vf $(DESTDIR)${prefix}/jre/lib/security/blacklisted.certs
+ for files in $(BUILD_SDK_DIR)/jre/lib/security/*.jar; do \
+ rm -vf $(DESTDIR)${prefix}/jre/lib/security/$$(basename $${files}); \
+ done
+ for files in $(BUILD_SDK_DIR)/man/man1/*.1; do \
+ rm -vf $(DESTDIR)$(mandir)/man1/$$(basename $${files}); \
+ done
+ for files in $(BUILD_SDK_DIR)/man/ja_JP.UTF-8/man1/*.1; do \
+ rm -vf $(DESTDIR)$(mandir)/ja_JP.UTF-8/man1/$$(basename $${files}); \
+ done
+ for items in $(BUILD_SDK_DIR)/demo/*; do \
+ rm -rvf $(DESTDIR)${prefix}/demo/$$(basename $${items}); \
+ done
+ for items in $(BUILD_SDK_DIR)/sample/*; do \
+ rm -rvf $(DESTDIR)${prefix}/sample/$$(basename $${items}); \
+ done
+ rm -rf $(DESTDIR)$(docdir)/README
+ rm -rf $(DESTDIR)$(docdir)/NEWS
+ rm -rf $(DESTDIR)$(docdir)/AUTHORS
+ rm -rf $(DESTDIR)$(docdir)/HACKING
+ rm -rf $(DESTDIR)$(docdir)/COPYING
+ rm -rf $(DESTDIR)$(docdir)/ChangeLog
+ rm -rf $(DESTDIR)$(docdir)/ASSEMBLY_EXCEPTION
+ rm -rf $(DESTDIR)$(docdir)/LICENSE
+ rm -rf $(DESTDIR)$(docdir)/THIRD_PARTY_README
+ rm -rf $(DESTDIR)$(docdir)/TRADEMARK
+ for sizes in 16 24 32 48 ; do \
+ rm -vf $(DESTDIR)$(datadir)/icons/hicolor/$${sizes}x$${sizes}/apps/java-1.8.0.png; \
+ done
+ for files in $(DESKTOP_FILES) ; do \
+ rm -vf $(DESTDIR)$(datadir)/applications/$$(basename $${files}); \
+ done
+ rm -vf $(DESTDIR)${prefix}/jre/.systemPrefs/.system.lock
+ rm -vf $(DESTDIR)${prefix}/jre/.systemPrefs/.systemRootModFile
+if ENABLE_DOCS
+ rm -rvf $(BUILD_OUTPUT_DIR)/docs/* $(DESTDIR)$(htmldir)
+ $(RMDIR) $(DESTDIR)$(htmldir)
+endif
+ for vms in client server ; do \
+ rm -vf $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/$${vms}/classes.jsa; \
+ if [ -e $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/$${vms} ] ; then \
+ $(RMDIR) $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/$${vms} ; \
+ fi ; \
+ done
+ $(RMDIR) $(DESTDIR)${exec_prefix}/lib/$(INSTALL_ARCH_DIR)/jli
+ $(RMDIR) $(DESTDIR)$(includedir)/$(BUILD_OS_DIR) $(DESTDIR)${exec_prefix}/lib/$(INSTALL_ARCH_DIR)
+ $(RMDIR) $(DESTDIR)$(bindir) $(DESTDIR)$(includedir) $(DESTDIR)${exec_prefix}/lib
+ $(RMDIR) $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/jli
+ $(RMDIR) $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)
+ $(RMDIR) $(DESTDIR)${prefix}/jre/lib/{cmm,ext,images/cursors,management,security}
+ $(RMDIR) $(DESTDIR)${prefix}/jre/lib/images
+ $(RMDIR) $(DESTDIR)${prefix}/jre/bin $(DESTDIR)${prefix}/jre/lib
+ $(RMDIR) $(DESTDIR)${prefix}/jre/.systemPrefs
+ $(RMDIR) $(DESTDIR)${prefix}/jre
+ $(RMDIR) $(DESTDIR)${prefix}/tapset
+ $(RMDIR) $(DESTDIR)${prefix}/demo
+ $(RMDIR) $(DESTDIR)${prefix}/sample
+ $(RMDIR) $(DESTDIR)$(docdir)
+ $(RMDIR) $(DESTDIR)$(datadir)/applications
+ $(RMDIR) $(DESTDIR)$(sysconfdir)/.java/.systemPrefs
+ $(RMDIR) $(DESTDIR)$(mandir)/{man1,ja_JP.UTF-8/man1}
+ for sizes in 16 24 32 48 ; do \
+ $(RMDIR) $(DESTDIR)$(datadir)/icons/hicolor/$${sizes}x$${sizes}/apps ; \
+ done
+
# Target Aliases
# ===============
diff -r e5d122ba61c0 -r db6287c26b47 NEWS
--- a/NEWS Wed Mar 02 17:03:51 2016 +0000
+++ b/NEWS Sat Mar 05 02:06:23 2016 +0000
@@ -136,6 +136,7 @@
- PR2804: test/tapset/jstaptest.pl should be executable
- PR2815: Race condition in SunEC provider with system NSS
- PR2825: Placement of -lfreebl matters when using bfd linker
+ - PR2826: Provide option to disable SystemTap tests
- PR2841: Parallelism issues resulting from PR2459
- PR2853: Fix build for aarch64/zero
- PR2853: Remaining miscellaneous synchronisation changes from aarch64/jdk8u
@@ -144,6 +145,7 @@
- PR2853: Remove some unnecessary divergences from jdk8u.
- PR2853: Revert AArch64 jvm.cfg divergence
- PR2853: Revert changes to libpng source code now 8078245 is in place.
+ - PR2865: Handle uninstallation.
- Don't substitute 'j' for '-j' inside -I directives
- Extend 8041658 to all files in the HotSpot build.
- Remove jcheck
diff -r e5d122ba61c0 -r db6287c26b47 acinclude.m4
--- a/acinclude.m4 Wed Mar 02 17:03:51 2016 +0000
+++ b/acinclude.m4 Sat Mar 05 02:06:23 2016 +0000
@@ -1980,3 +1980,42 @@
AC_SUBST(SUNEC_LIBS)
fi
])
+
+AC_DEFUN_ONCE([IT_CHECK_FOR_RMDIR],
+[
+ IT_FIND_TOOL([RMDIR],[rmdir])
+ AC_CACHE_CHECK([if ${RMDIR} supports --ignore-fail-on-non-empty], it_cv_RMDIR, [
+ mkdir tmp.$$
+ touch tmp.$$/t
+ if ${RMDIR} --ignore-fail-on-non-empty tmp.$$ >&AS_MESSAGE_LOG_FD 2>&1; then
+ it_cv_RMDIR=yes;
+ RMDIR="${RMDIR} --ignore-fail-on-non-empty"
+ else
+ it_cv_RMDIR=no;
+ fi
+ ])
+ rm -f tmp.$$/t
+ ${RMDIR} tmp.$$
+])
+
+AC_DEFUN_ONCE([IT_DISABLE_SYSTEMTAP_TESTS],
+[
+ AC_MSG_CHECKING([whether to disable the execution of the SystemTap tests])
+ AC_ARG_ENABLE([systemtap-tests],
+ [AS_HELP_STRING(--disable-systemtap-tests,do not run the SystemTap tests via make check [[default=no]])],
+ [
+ case "${enableval}" in
+ no)
+ disable_systemtap_tests=yes
+ ;;
+ *)
+ disable_systemtap_tests=no
+ ;;
+ esac
+ ],
+ [
+ disable_systemtap_tests=no
+ ])
+ AC_MSG_RESULT([$disable_systemtap_tests])
+ AM_CONDITIONAL([DISABLE_SYSTEMTAP_TESTS], test x"${disable_systemtap_tests}" = "xyes")
+])
diff -r e5d122ba61c0 -r db6287c26b47 configure.ac
--- a/configure.ac Wed Mar 02 17:03:51 2016 +0000
+++ b/configure.ac Sat Mar 05 02:06:23 2016 +0000
@@ -47,6 +47,7 @@
IT_CHECK_FOR_MERCURIAL
IT_OBTAIN_HG_REVISIONS
AC_PATH_TOOL([LSB_RELEASE],[lsb_release])
+IT_CHECK_FOR_RMDIR
IT_WITH_GCJ
IT_WITH_HOTSPOT_BUILD
AC_PATH_TOOL([LINUX32],[linux32])
@@ -58,6 +59,7 @@
IT_DISABLE_HOTSPOT_TESTS
IT_DISABLE_LANGTOOLS_TESTS
IT_DISABLE_JDK_TESTS
+IT_DISABLE_SYSTEMTAP_TESTS
IT_ENABLE_SUNEC
# Use xvfb-run if found to run gui tests (check-jdk).
More information about the distro-pkg-dev
mailing list