/hg/icedtea: 4 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Thu Jun 18 20:56:49 UTC 2015
changeset 837a3359425b in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=837a3359425b
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Wed Jun 17 22:39:38 2015 +0100
PR2443: install stage fails where BUILD_ARCH_DIR != INSTALL_ARCH_DIR
2015-06-17 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR2443: install stage fails where
BUILD_ARCH_DIR != INSTALL_ARCH_DIR
* Makefile.am:
(install-exec-local): Use INSTALL_ARCH_DIR
rather than BUILD_ARCH_DIR as the two are not
the same on x86 (i386 vs. i586)
(install-data-local): Likewise.
* NEWS: Updated.
changeset d9532d535bb7 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=d9532d535bb7
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu Jun 18 00:07:10 2015 +0100
PR2447: Allow greater control of Javadoc installation directory
2015-06-17 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR2447: Allow greater control of Javadoc
installation directory
* Makefile.am:
(install-data-local): Install Javadocs into
$htmldir rather than $docdir/html, so the
user has more control over where they end up.
Copy the contents of docs rather than the
directory itself.
* NEWS: Updated.
changeset f9e92005cb3e in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=f9e92005cb3e
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu Jun 18 00:31:17 2015 +0100
PR2448: Install TRADEMARK, COPYING and ChangeLog as RPM spec file does
2015-06-17 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR2448: Install TRADEMARK, COPYING and ChangeLog
as RPM spec file does
* Makefile.am:
(install-data-local): Install missing files.
* NEWS: Updated.
changeset a366a80437b7 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=a366a80437b7
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu Jun 18 20:27:38 2015 +0100
PR2454: install-data-local needs to check that classes.jsa actually exists
2015-06-17 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR2454: install-data-local needs to check that
classes.jsa actually exists
* Makefile.am:
(install-data-local): Remove conditionals around
classes.jsa installation, instead just checking
that the file exists. Create the directory for it
first, as technically install-data-local does not
depend on install-exec-local and so should be
self-sufficient.
* NEWS: Updated.
diffstat:
ChangeLog | 44 ++++++++++++++++++++++++++++++++++++++++
Makefile.am | 66 +++++++++++++++++++++++++++++-------------------------------
NEWS | 4 +++
3 files changed, 80 insertions(+), 34 deletions(-)
diffs (196 lines):
diff -r 9382763800e6 -r a366a80437b7 ChangeLog
--- a/ChangeLog Wed Jun 17 17:38:23 2015 +0100
+++ b/ChangeLog Thu Jun 18 20:27:38 2015 +0100
@@ -1,3 +1,47 @@
+2015-06-17 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR2454: install-data-local needs to check that
+ classes.jsa actually exists
+ * Makefile.am:
+ (install-data-local): Remove conditionals around
+ classes.jsa installation, instead just checking
+ that the file exists. Create the directory for it
+ first, as technically install-data-local does not
+ depend on install-exec-local and so should be
+ self-sufficient.
+ * NEWS: Updated.
+
+2015-06-17 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR2448: Install TRADEMARK, COPYING and ChangeLog
+ as RPM spec file does
+ * Makefile.am:
+ (install-data-local): Install missing files.
+ * NEWS: Updated.
+
+2015-06-17 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR2447: Allow greater control of Javadoc
+ installation directory
+ * Makefile.am:
+ (install-data-local): Install Javadocs into
+ $htmldir rather than $docdir/html, so the
+ user has more control over where they end up.
+ Copy the contents of docs rather than the
+ directory itself.
+ * NEWS: Updated.
+
+2015-06-17 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR2443: install stage fails where
+ BUILD_ARCH_DIR != INSTALL_ARCH_DIR
+ * Makefile.am:
+ (install-exec-local): Use INSTALL_ARCH_DIR
+ rather than BUILD_ARCH_DIR as the two are not
+ the same on x86 (i386 vs. i586)
+ (install-data-local): Likewise.
+ * NEWS: Updated.
+
2012-03-14 Mark Wielaard <mjw at redhat.com>
PR2256: Add SystemTap tests
diff -r 9382763800e6 -r a366a80437b7 Makefile.am
--- a/Makefile.am Wed Jun 17 17:38:23 2015 +0100
+++ b/Makefile.am Thu Jun 18 20:27:38 2015 +0100
@@ -2340,11 +2340,11 @@
install-exec-local:
${mkinstalldirs} $(DESTDIR)$(bindir) $(DESTDIR)$(includedir) $(DESTDIR)${exec_prefix}/lib
- ${mkinstalldirs} $(DESTDIR)$(includedir)/$(BUILD_OS_DIR) $(DESTDIR)${exec_prefix}/lib/$(BUILD_ARCH_DIR)
- ${mkinstalldirs} $(DESTDIR)${exec_prefix}/lib/$(BUILD_ARCH_DIR)/jli
+ ${mkinstalldirs} $(DESTDIR)$(includedir)/$(BUILD_OS_DIR) $(DESTDIR)${exec_prefix}/lib/$(INSTALL_ARCH_DIR)
+ ${mkinstalldirs} $(DESTDIR)${exec_prefix}/lib/$(INSTALL_ARCH_DIR)/jli
${mkinstalldirs} $(DESTDIR)${prefix}/jre/bin $(DESTDIR)${prefix}/jre/lib
- ${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/$(BUILD_ARCH_DIR)
- ${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/$(BUILD_ARCH_DIR)/jli
+ ${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)
+ ${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/jli
${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/ext
${mkinstalldirs} $(DESTDIR)${prefix}/tapset
for files in $(BUILD_SDK_DIR)/bin/*; do \
@@ -2363,11 +2363,11 @@
$(INSTALL_DATA) $${files} $(DESTDIR)${exec_prefix}/lib; \
done
$(INSTALL_PROGRAM) $(BUILD_SDK_DIR)/lib/jexec $(DESTDIR)${exec_prefix}/lib
- for files in $(BUILD_SDK_DIR)/lib/$(BUILD_ARCH_DIR)/*.so; do \
- $(INSTALL_PROGRAM) $${files} $(DESTDIR)${exec_prefix}/lib/$(BUILD_ARCH_DIR); \
+ for files in $(BUILD_SDK_DIR)/lib/$(INSTALL_ARCH_DIR)/*.so; do \
+ $(INSTALL_PROGRAM) $${files} $(DESTDIR)${exec_prefix}/lib/$(INSTALL_ARCH_DIR); \
done
- for files in $(BUILD_SDK_DIR)/lib/$(BUILD_ARCH_DIR)/jli/*.so; do \
- $(INSTALL_PROGRAM) $${files} $(DESTDIR)${exec_prefix}/lib/$(BUILD_ARCH_DIR)/jli; \
+ for files in $(BUILD_SDK_DIR)/lib/$(INSTALL_ARCH_DIR)/jli/*.so; do \
+ $(INSTALL_PROGRAM) $${files} $(DESTDIR)${exec_prefix}/lib/$(INSTALL_ARCH_DIR)/jli; \
done
for files in $(BUILD_SDK_DIR)/jre/bin/*; do \
$(INSTALL_PROGRAM) $${files} $(DESTDIR)${prefix}/jre/bin; \
@@ -2376,17 +2376,17 @@
$(INSTALL_DATA) $${files} $(DESTDIR)${prefix}/jre/lib; \
done
$(INSTALL_PROGRAM) $(BUILD_SDK_DIR)/lib/jexec $(DESTDIR)${prefix}/jre/lib
- for files in $(BUILD_SDK_DIR)/jre/lib/$(BUILD_ARCH_DIR)/*.so; do \
- $(INSTALL_PROGRAM) $${files} $(DESTDIR)${prefix}/jre/lib/$(BUILD_ARCH_DIR); \
+ for files in $(BUILD_SDK_DIR)/jre/lib/$(INSTALL_ARCH_DIR)/*.so; do \
+ $(INSTALL_PROGRAM) $${files} $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR); \
done
- for files in $(BUILD_SDK_DIR)/jre/lib/$(BUILD_ARCH_DIR)/jli/*.so; do \
- $(INSTALL_PROGRAM) $${files} $(DESTDIR)${prefix}/jre/lib/$(BUILD_ARCH_DIR)/jli; \
+ for files in $(BUILD_SDK_DIR)/jre/lib/$(INSTALL_ARCH_DIR)/jli/*.so; do \
+ $(INSTALL_PROGRAM) $${files} $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/jli; \
done
for vms in client server ; do \
- if [ -d $(BUILD_SDK_DIR)/jre/lib/$(BUILD_ARCH_DIR)/$${vms} ] ; then \
- ${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/$(BUILD_ARCH_DIR)/$${vms} ; \
- for files in $(BUILD_SDK_DIR)/jre/lib/$(BUILD_ARCH_DIR)/$${vms}/*.so; do \
- $(INSTALL_PROGRAM) $${files} $(DESTDIR)${prefix}/jre/lib/$(BUILD_ARCH_DIR)/$${vms}; \
+ if [ -d $(BUILD_SDK_DIR)/jre/lib/$(INSTALL_ARCH_DIR)/$${vms} ] ; then \
+ ${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/$${vms} ; \
+ for files in $(BUILD_SDK_DIR)/jre/lib/$(INSTALL_ARCH_DIR)/$${vms}/*.so; do \
+ $(INSTALL_PROGRAM) $${files} $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/$${vms}; \
done ; \
fi ; \
done
@@ -2404,7 +2404,7 @@
${mkinstalldirs} $(DESTDIR)${prefix}
${mkinstalldirs} $(DESTDIR)${prefix}/jre/.systemPrefs
${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib
- ${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/$(BUILD_ARCH_DIR)
+ ${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)
${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/{cmm,ext,images/cursors,management,security}
${mkinstalldirs} $(DESTDIR)$(mandir)/{man1,ja_JP.UTF-8/man1}
${mkinstalldirs} $(DESTDIR)${prefix}/demo
@@ -2423,13 +2423,13 @@
$(INSTALL_DATA) $(BUILD_SDK_DIR)/jre/lib/meta-index $(DESTDIR)${prefix}/jre/lib
$(INSTALL_DATA) $(BUILD_SDK_DIR)/jre/lib/psfont.properties.ja $(DESTDIR)${prefix}/jre/lib
$(INSTALL_DATA) $(BUILD_SDK_DIR)/jre/lib/tzdb.dat $(DESTDIR)${prefix}/jre/lib
- $(INSTALL_DATA) $(BUILD_SDK_DIR)/jre/lib/$(BUILD_ARCH_DIR)/jvm.cfg \
- $(DESTDIR)${prefix}/jre/lib/$(BUILD_ARCH_DIR)
+ $(INSTALL_DATA) $(BUILD_SDK_DIR)/jre/lib/$(INSTALL_ARCH_DIR)/jvm.cfg \
+ $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)
for vms in client server ; do \
- if [ -d $(BUILD_SDK_DIR)/jre/lib/$(BUILD_ARCH_DIR)/$${vms} ] ; then \
- ${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/$(BUILD_ARCH_DIR)/$${vms} ; \
- $(INSTALL_DATA) $(BUILD_SDK_DIR)/jre/lib/$(BUILD_ARCH_DIR)/$${vms}/Xusage.txt \
- $(DESTDIR)${prefix}/jre/lib/$(BUILD_ARCH_DIR)/$${vms} ; \
+ if [ -d $(BUILD_SDK_DIR)/jre/lib/$(INSTALL_ARCH_DIR)/$${vms} ] ; then \
+ ${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/$${vms} ; \
+ $(INSTALL_DATA) $(BUILD_SDK_DIR)/jre/lib/$(INSTALL_ARCH_DIR)/$${vms}/Xusage.txt \
+ $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/$${vms} ; \
fi ; \
done
for files in $(BUILD_SDK_DIR)/jre/lib/cmm/*.pf; do \
@@ -2475,9 +2475,12 @@
${INSTALL_DATA} $(srcdir)/NEWS $(DESTDIR)$(docdir)
${INSTALL_DATA} $(srcdir)/AUTHORS $(DESTDIR)$(docdir)
${INSTALL_DATA} $(srcdir)/HACKING $(DESTDIR)$(docdir)
+ ${INSTALL_DATA} $(srcdir)/COPYING $(DESTDIR)$(docdir)
+ ${INSTALL_DATA} $(srcdir)/ChangeLog $(DESTDIR)$(docdir)
${INSTALL_DATA} $(BUILD_SDK_DIR)/ASSEMBLY_EXCEPTION $(DESTDIR)$(docdir)
${INSTALL_DATA} $(BUILD_SDK_DIR)/LICENSE $(DESTDIR)$(docdir)
${INSTALL_DATA} $(BUILD_SDK_DIR)/THIRD_PARTY_README $(DESTDIR)$(docdir)
+ ${INSTALL_DATA} openjdk/jaxp/TRADEMARK $(DESTDIR)$(docdir)
for sizes in 16 24 32 48 ; do \
${mkinstalldirs} $(DESTDIR)$(datadir)/icons/hicolor/$${sizes}x$${sizes}/apps ; \
${INSTALL_DATA} openjdk/jdk/src/solaris/classes/sun/awt/X11/java-icon$${sizes}.png \
@@ -2489,21 +2492,16 @@
touch $(DESTDIR)/${prefix}/jre/.systemPrefs/.system.lock
touch $(DESTDIR)/${prefix}/jre/.systemPrefs/.systemRootModFile
if ENABLE_DOCS
- ${mkinstalldirs} $(DESTDIR)$(docdir)/html
- cp -RP $(BUILD_OUTPUT_DIR)/docs $(DESTDIR)$(docdir)/html
+ ${mkinstalldirs} $(DESTDIR)$(htmldir)
+ cp -RP $(BUILD_OUTPUT_DIR)/docs/* $(DESTDIR)$(htmldir)
endif
-if !ENABLE_JAMVM
-if !ENABLE_CACAO
-if !ZERO_BUILD
for vms in client server ; do \
- if [ -d $(BUILD_SDK_DIR)/jre/lib/$(BUILD_ARCH_DIR)/$${vms} ] ; then \
- $(INSTALL_DATA) $(BUILD_SDK_DIR)/jre/lib/$(BUILD_ARCH_DIR)/$${vms}/classes.jsa \
- $(DESTDIR)${prefix}/jre/lib/$(BUILD_ARCH_DIR)/$${vms} ; \
+ if [ -f $(BUILD_SDK_DIR)/jre/lib/$(INSTALL_ARCH_DIR)/$${vms}/classes.jsa ] ; then \
+ ${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/$${vms} ; \
+ $(INSTALL_DATA) $(BUILD_SDK_DIR)/jre/lib/$(INSTALL_ARCH_DIR)/$${vms}/classes.jsa \
+ $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/$${vms} ; \
fi ; \
done
-endif
-endif
-endif
# Target Aliases
# ===============
diff -r 9382763800e6 -r a366a80437b7 NEWS
--- a/NEWS Wed Jun 17 17:38:23 2015 +0100
+++ b/NEWS Thu Jun 18 20:27:38 2015 +0100
@@ -108,6 +108,10 @@
- PR2433: ppc64le does not support -Xshare:dump
- PR2434: SystemTap support is no longer optional
- PR2439: NSS PKCS11 regression - due to java.security automatic loading
+ - PR2443: install stage fails where BUILD_ARCH_DIR != INSTALL_ARCH_DIR
+ - PR2447: Allow greater control of Javadoc installation directory
+ - PR2448: Install TRADEMARK, COPYING and ChangeLog as RPM spec file does
+ - PR2454: install-data-local needs to check that classes.jsa actually exists
- Don't substitute 'j' for '-j' inside -I directives
- Extend 8041658 to all files in the HotSpot build.
- Remove jcheck
More information about the distro-pkg-dev
mailing list