/hg/icedtea7: 4 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Sat Jul 18 00:46:29 UTC 2015
changeset 1735992903cb in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=1735992903cb
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Jul 17 15:19:45 2015 +0100
PR2548: install stage doesn't install symbolic links
2015-07-17 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR2548: install stage doesn't install symbolic links
* Makefile.am:
(install_file): Add function for installing
files which handles symlinks correctly.
(install-exec-local): Use install_file
function to install files where symlinks
may be encountered.
(install-data-local): Likewise. Also
copy the man/ja symlink.
* NEWS: Updated.
changeset acdb38367f2b in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=acdb38367f2b
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Jul 17 15:24:53 2015 +0100
PR2550: Desktop file doesn't reference versioned icon
2015-07-17 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR2550: Desktop file doesn't reference versioned icon
* NEWS: Updated
* jconsole.desktop.in:
Set Icon to java- at JAVA_VER@, so the icon can be found.
* policytool.desktop.in: Likewise.
changeset 04264787379d in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=04264787379d
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Jul 17 15:25:40 2015 +0100
Bump 2.6.0 release date.
2015-07-17 Andrew John Hughes <gnu_andrew at member.fsf.org>
* NEWS: Bump 2.6.0 release date.
changeset ce844a4177de in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=ce844a4177de
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Sat Jul 18 01:46:16 2015 +0100
Added tag icedtea-2.6.0 for changeset 04264787379d
diffstat:
.hgtags | 1 +
ChangeLog | 25 +++++++++++++++++++++++++
Makefile.am | 44 ++++++++++++++++++++++++--------------------
NEWS | 4 +++-
jconsole.desktop.in | 2 +-
policytool.desktop.in | 2 +-
6 files changed, 55 insertions(+), 23 deletions(-)
diffs (234 lines):
diff -r a3787c18ead8 -r ce844a4177de .hgtags
--- a/.hgtags Fri Jul 17 01:40:01 2015 +0100
+++ b/.hgtags Sat Jul 18 01:46:16 2015 +0100
@@ -56,3 +56,4 @@
cfb7718f2b3b0743e6cf8be785472cf2502aaf41 icedtea-2.6.0pre22
8188efd0009bdad9fda1c3188df16f59d25b7194 icedtea-2.6.0pre23
3e3f044261cd82b41738f5dcc39b5edff40302e6 icedtea-2.6.0pre24
+04264787379db3f91a819d38094c31e722dbb592 icedtea-2.6.0
diff -r a3787c18ead8 -r ce844a4177de ChangeLog
--- a/ChangeLog Fri Jul 17 01:40:01 2015 +0100
+++ b/ChangeLog Sat Jul 18 01:46:16 2015 +0100
@@ -1,3 +1,28 @@
+2015-07-17 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ * NEWS: Bump 2.6.0 release date.
+
+2015-07-17 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR2550: Desktop file doesn't reference versioned icon
+ * NEWS: Updated
+ * jconsole.desktop.in:
+ Set Icon to java- at JAVA_VER@, so the icon can be found.
+ * policytool.desktop.in: Likewise.
+
+2015-07-17 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR2548: install stage doesn't install symbolic links
+ * Makefile.am:
+ (install_file): Add function for installing
+ files which handles symlinks correctly.
+ (install-exec-local): Use install_file
+ function to install files where symlinks
+ may be encountered.
+ (install-data-local): Likewise. Also
+ copy the man/ja symlink.
+ * NEWS: Updated.
+
2015-07-16 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR2545: Extend tarball checksumming option to
diff -r a3787c18ead8 -r ce844a4177de Makefile.am
--- a/Makefile.am Fri Jul 17 01:40:01 2015 +0100
+++ b/Makefile.am Sat Jul 18 01:46:16 2015 +0100
@@ -2925,6 +2925,9 @@
# Installation Targets
# ====================
+# install doesn't work with symlinks
+install_file = if [ -h $(1) ] ; then cp -a $(1) $(2) ; else $(3) $(1) $(2) ; fi
+
install-exec-local:
${mkinstalldirs} $(DESTDIR)$(bindir) $(DESTDIR)$(includedir) $(DESTDIR)${exec_prefix}/lib
${mkinstalldirs} $(DESTDIR)$(includedir)/$(BUILD_OS_DIR) $(DESTDIR)${exec_prefix}/lib/$(INSTALL_ARCH_DIR)
@@ -2947,20 +2950,20 @@
$(INSTALL_PROGRAM) $${dir}/$${name}.stripped $(DESTDIR)$(bindir)/$${name}; \
$(INSTALL_PROGRAM) $${dir}/$${name}.debug $(DESTDIR)$(DEBUG_PREFIX)/$(bindir); \
else \
- $(INSTALL_PROGRAM) $${files} $(DESTDIR)$(bindir); \
+ $(call install_file,$${files},$(DESTDIR)$(bindir),$(INSTALL_PROGRAM)) ; \
fi ; \
done
for files in $(BUILD_SDK_DIR)/include/*.h; do \
- $(INSTALL_DATA) $${files} $(DESTDIR)$(includedir); \
+ $(call install_file,$${files},$(DESTDIR)$(includedir),$(INSTALL_DATA)) ; \
done
for files in $(BUILD_SDK_DIR)/include/$(BUILD_OS_DIR)/*.h; do \
- $(INSTALL_DATA) $${files} $(DESTDIR)$(includedir)/$(BUILD_OS_DIR); \
+ $(call install_file,$${files},$(DESTDIR)$(includedir)/$(BUILD_OS_DIR),$(INSTALL_DATA)) ; \
done
for files in $(BUILD_SDK_DIR)/lib/*.jar; do \
- $(INSTALL_DATA) $${files} $(DESTDIR)${exec_prefix}/lib; \
+ $(call install_file,$${files},$(DESTDIR)${exec_prefix}/lib,$(INSTALL_DATA)) ; \
done
for files in $(BUILD_SDK_DIR)/lib/*.idl; do \
- $(INSTALL_DATA) $${files} $(DESTDIR)${exec_prefix}/lib; \
+ $(call install_file,$${files},$(DESTDIR)${exec_prefix}/lib,$(INSTALL_DATA)) ; \
done
if test "x$(enable_split_debuginfo)" = "xyes"; then \
$(INSTALL_PROGRAM) $(BUILD_DEBUGINFO_DIR)/lib/jexec.stripped $(DESTDIR)${exec_prefix}/lib/jexec ; \
@@ -2975,7 +2978,7 @@
$(INSTALL_PROGRAM) $${dir}/$${name}.stripped $(DESTDIR)${exec_prefix}/lib/$(INSTALL_ARCH_DIR)/jli/$${name}; \
$(INSTALL_PROGRAM) $${dir}/$${name}.debug $(DESTDIR)$(DEBUG_PREFIX)/${exec_prefix}/lib/$(INSTALL_ARCH_DIR)/jli; \
else \
- $(INSTALL_PROGRAM) $${files} $(DESTDIR)${exec_prefix}/lib/$(INSTALL_ARCH_DIR)/jli; \
+ $(call install_file,$${files},$(DESTDIR)${exec_prefix}/lib/$(INSTALL_ARCH_DIR)/jli,$(INSTALL_PROGRAM)) ; \
fi ; \
done
for files in $(BUILD_SDK_DIR)/jre/bin/*; do \
@@ -2985,11 +2988,11 @@
$(INSTALL_PROGRAM) $${dir}/$${name}.stripped $(DESTDIR)${prefix}/jre/bin/$${name}; \
$(INSTALL_PROGRAM) $${dir}/$${name}.debug $(DESTDIR)$(DEBUG_PREFIX)/${prefix}/jre/bin; \
else \
- $(INSTALL_PROGRAM) $${files} $(DESTDIR)${prefix}/jre/bin; \
+ $(call install_file,$${files},$(DESTDIR)${prefix}/jre/bin,$(INSTALL_PROGRAM)) ; \
fi ; \
done
for files in $(BUILD_SDK_DIR)/jre/lib/*.jar; do \
- $(INSTALL_DATA) $${files} $(DESTDIR)${prefix}/jre/lib; \
+ $(call install_file,$${files},$(DESTDIR)${prefix}/jre/lib,$(INSTALL_DATA)) ; \
done
if test "x$(enable_split_debuginfo)" = "xyes"; then \
$(INSTALL_PROGRAM) $(BUILD_DEBUGINFO_DIR)/jre/lib/jexec.stripped $(DESTDIR)${exec_prefix}/jre/lib/jexec ; \
@@ -3007,7 +3010,7 @@
$(INSTALL_PROGRAM) $${dir}/$${name}.debug \
$(DESTDIR)$(DEBUG_PREFIX)/${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/$${subdirs}; \
else \
- $(INSTALL_PROGRAM) $${files} $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/$${subdirs}; \
+ $(call install_file,$${files},$(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/$${subdirs},$(INSTALL_PROGRAM));\
fi ; \
done ; \
done
@@ -3024,16 +3027,16 @@
$(INSTALL_PROGRAM) $${dir}/$${name}.debug \
$(DESTDIR)$(DEBUG_PREFIX)/${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/$${vms}; \
else \
- $(INSTALL_PROGRAM) $${files} $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/$${vms}; \
+ $(call install_file,$${files},$(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/$${vms},$(INSTALL_PROGRAM));\
fi ; \
done ; \
fi ; \
done
for files in $(BUILD_SDK_DIR)/jre/lib/ext/*.jar; do \
- $(INSTALL_DATA) $${files} $(DESTDIR)${prefix}/jre/lib/ext; \
+ $(call install_file,$${files},$(DESTDIR)${prefix}/jre/lib/ext,$(INSTALL_DATA));\
done
for files in $(BUILD_SDK_DIR)/tapset/*.stp; do \
- $(INSTALL_DATA) $${files} $(DESTDIR)${prefix}/tapset; \
+ $(call install_file,$${files},$(DESTDIR)${prefix}/tapset,$(INSTALL_DATA));\
done
$(abs_top_builddir)/pax-mark-vm $(DESTDIR)${prefix}
@@ -3050,10 +3053,10 @@
${mkinstalldirs} $(DESTDIR)$(datadir)/applications
${mkinstalldirs} $(DESTDIR)$(sysconfdir)/.java/.systemPrefs
for files in $(BUILD_SDK_DIR)/jre/lib/*.properties; do \
- $(INSTALL_DATA) $${files} $(DESTDIR)${prefix}/jre/lib; \
+ $(call install_file,$${files},$(DESTDIR)${prefix}/jre/lib,$(INSTALL_DATA)) ; \
done
for files in $(BUILD_SDK_DIR)/jre/lib/fontconfig*.{properties.src,bfc}; do \
- $(INSTALL_DATA) $${files} $(DESTDIR)${prefix}/jre/lib; \
+ $(call install_file,$${files},$(DESTDIR)${prefix}/jre/lib,$(INSTALL_DATA)) ; \
done
$(INSTALL_DATA) $(BUILD_SDK_DIR)/release $(DESTDIR)${prefix}
$(INSTALL_DATA) $(BUILD_SDK_DIR)/src.zip $(DESTDIR)${prefix}
@@ -3072,11 +3075,11 @@
fi ; \
done
for files in $(BUILD_SDK_DIR)/jre/lib/cmm/*.pf; do \
- $(INSTALL_DATA) $${files} $(DESTDIR)${prefix}/jre/lib/cmm; \
+ $(call install_file,$${files},$(DESTDIR)${prefix}/jre/lib/cmm,$(INSTALL_DATA)) ; \
done
$(INSTALL_DATA) $(BUILD_SDK_DIR)/jre/lib/ext/meta-index $(DESTDIR)${prefix}/jre/lib/ext
for files in $(BUILD_SDK_DIR)/jre/lib/images/cursors/*.gif; do \
- $(INSTALL_DATA) $${files} $(DESTDIR)${prefix}/jre/lib/images/cursors; \
+ $(call install_file,$${files},$(DESTDIR)${prefix}/jre/lib/images/cursors,$(INSTALL_DATA)) ; \
done
$(INSTALL_DATA) $(BUILD_SDK_DIR)/jre/lib/images/cursors/cursors.properties \
$(DESTDIR)${prefix}/jre/lib/images/cursors
@@ -3085,7 +3088,7 @@
$(INSTALL_DATA) $(BUILD_SDK_DIR)/jre/lib/management/management.properties \
$(DESTDIR)${prefix}/jre/lib/management
for files in $(BUILD_SDK_DIR)/jre/lib/management/*.template; do \
- $(INSTALL_DATA) $${files} $(DESTDIR)${prefix}/jre/lib/management; \
+ $(call install_file,$${files},$(DESTDIR)${prefix}/jre/lib/management,$(INSTALL_DATA)) ; \
done
$(INSTALL_DATA) $(BUILD_SDK_DIR)/jre/lib/security/cacerts \
$(DESTDIR)${prefix}/jre/lib/security
@@ -3096,17 +3099,18 @@
$(INSTALL_DATA) $(BUILD_SDK_DIR)/jre/lib/security/nss.cfg \
$(DESTDIR)${prefix}/jre/lib/security
for files in $(BUILD_SDK_DIR)/jre/lib/security/*.jar; do \
- $(INSTALL_DATA) $${files} $(DESTDIR)${prefix}/jre/lib/security; \
+ $(call install_file,$${files},$(DESTDIR)${prefix}/jre/lib/security,$(INSTALL_DATA)) ; \
done
for items in $(BUILD_SDK_DIR)/jre/lib/zi/*; do \
cp -RP $${items} $(DESTDIR)${prefix}/jre/lib/zi ; \
done
for files in $(BUILD_SDK_DIR)/man/man1/*.1; do \
- $(INSTALL_DATA) $${files} $(DESTDIR)$(mandir)/man1; \
+ $(call install_file,$${files},$(DESTDIR)$(mandir)/man1,$(INSTALL_DATA)) ; \
done
for files in $(BUILD_SDK_DIR)/man/ja_JP.UTF-8/man1/*.1; do \
- $(INSTALL_DATA) $${files} $(DESTDIR)$(mandir)/ja_JP.UTF-8/man1; \
+ $(call install_file,$${files},$(DESTDIR)$(mandir)/ja_JP.UTF-8/man1,$(INSTALL_DATA)) ; \
done
+ cp -a $(BUILD_SDK_DIR)/man/ja $(DESTDIR)$(mandir)
for items in $(BUILD_SDK_DIR)/demo/*; do \
cp -RP $${items} $(DESTDIR)${prefix}/demo ; \
done
diff -r a3787c18ead8 -r ce844a4177de NEWS
--- a/NEWS Fri Jul 17 01:40:01 2015 +0100
+++ b/NEWS Sat Jul 18 01:46:16 2015 +0100
@@ -12,7 +12,7 @@
CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
-New in release 2.6.0 (2015-07-15):
+New in release 2.6.0 (2015-07-17):
* OpenJDK
- S4792059: test/java/io/pathNames/GeneralSolaris.java fails on symbolic links
@@ -338,6 +338,8 @@
- PR2539: Libraries in some subdirectories of jre/lib/{arch} are not installed
- PR2540: Specify a cacerts file for the OpenJDK build as we do for OpenJDK 8
- PR2545: Extend tarball checksumming option to allow the checksum to be specified
+ - PR2548: install stage doesn't install symbolic links
+ - PR2550: Desktop file doesn't reference versioned icon
* AArch64 port
- Add copyright to aarch64_ad.m4
- S8069593: Changes to JavaThread::_thread_state must use acquire and release
diff -r a3787c18ead8 -r ce844a4177de jconsole.desktop.in
--- a/jconsole.desktop.in Fri Jul 17 01:40:01 2015 +0100
+++ b/jconsole.desktop.in Sat Jul 18 01:46:16 2015 +0100
@@ -2,7 +2,7 @@
Name=OpenJDK @JAVA_VER@ Monitoring & Management Console
Comment=Monitor and manage OpenJDK applications
Exec=_BINDIR_/jconsole
-Icon=java
+Icon=java- at JAVA_VER@
Terminal=false
Type=Application
StartupWMClass=sun-tools-jconsole-JConsole
diff -r a3787c18ead8 -r ce844a4177de policytool.desktop.in
--- a/policytool.desktop.in Fri Jul 17 01:40:01 2015 +0100
+++ b/policytool.desktop.in Sat Jul 18 01:46:16 2015 +0100
@@ -2,7 +2,7 @@
Name=OpenJDK @JAVA_VER@ Policy Tool
Comment=Manage OpenJDK policy files
Exec=_BINDIR_/policytool
-Icon=java
+Icon=java- at JAVA_VER@
Terminal=false
Type=Application
StartupWMClass=sun-security-tools-PolicyTool
More information about the distro-pkg-dev
mailing list