Mercurial > hg > release > icedtea6-1.7
changeset 1995:9f1417fbbb12
Add man page for javaws.
2010-10-12 Andrew John Hughes <ahughes@redhat.com>
* Makefile.am:
(add-netx): Ensure directory exists before
copying javaws man page.
(add-netx-debug): Likewise.
2010-09-13 Omair Majid <omajid@redhat.com>
Add a new man page for netx's javaws.
* NEWS: Updated to indicate the new man page for javaws.
* Makefile.am
(icedtea.stamp): Copy over the javaws man page into the build.
(icedtea-debug.stamp): Copy over the javaws man page.
* netx/javaws.1: New man page for netx's javaws.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Tue, 12 Oct 2010 18:01:47 +0100 |
| parents | 1c4624a3afe8 |
| children | 3b1a69fc737b |
| files | ChangeLog Makefile.am NEWS |
| diffstat | 3 files changed, 34 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Oct 11 22:31:47 2010 +0100 +++ b/ChangeLog Tue Oct 12 18:01:47 2010 +0100 @@ -1,3 +1,19 @@ +2010-10-12 Andrew John Hughes <ahughes@redhat.com> + + * Makefile.am: + (add-netx): Ensure directory exists before + copying javaws man page. + (add-netx-debug): Likewise. + +2010-09-13 Omair Majid <omajid@redhat.com> + + Add a new man page for netx's javaws. + * NEWS: Updated to indicate the new man page for javaws. + * Makefile.am + (icedtea.stamp): Copy over the javaws man page into the build. + (icedtea-debug.stamp): Copy over the javaws man page. + * netx/javaws.1: New man page for netx's javaws. + 2010-10-11 Andrew John Hughes <ahughes@redhat.com> * NEWS: Add CVE numbers and list 6925672
--- a/Makefile.am Mon Oct 11 22:31:47 2010 +0100 +++ b/Makefile.am Tue Oct 12 18:01:47 2010 +0100 @@ -55,6 +55,7 @@ JAXWS = openjdk/jaxws/src/share/classes # FIXME (netx): NetX source directories go here +NETX_SRCDIR = $(abs_top_srcdir)/rt OPENJDK_SOURCEPATH_DIRS = \ $(SHARE):$(SOLARIS):$(LANGTOOLS):$(JAXP):$(CORBA):$(JAXWS) @@ -1361,6 +1362,14 @@ cp $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources/about.jnlp \ extra-lib/about.jar \ $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib + if [ -d $(BUILD_OUTPUT_DIR)/j2sdk-image/man/man1 ] ; then \ + cp $(NETX_SRCDIR)/javaws.1 \ + $(BUILD_OUTPUT_DIR)/j2sdk-image/man/man1 ; \ + fi + if [ -d $(BUILD_OUTPUT_DIR)/j2re-image/man/man1 ] ; then \ + cp $(NETX_SRCDIR)/javaws.1 \ + $(BUILD_OUTPUT_DIR)/j2re-image/man/man1 ; \ + fi if ZERO_BUILD printf -- '-zero ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg endif @@ -1464,6 +1473,14 @@ cp $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources/default.jnlp \ extra-lib/about.jar \ $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib + if [ -d $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/man/man1 ] ; then \ + cp $(NETX_SRCDIR)/javaws.1 \ + $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/man/man1 ; \ + fi + if [ -d $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/man/man1 ] ; then \ + cp $(NETX_SRCDIR)/javaws.1 \ + $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/man/man1 ; \ + fi if ZERO_BUILD printf -- '-zero ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg endif
--- a/NEWS Mon Oct 11 22:31:47 2010 +0100 +++ b/NEWS Tue Oct 12 18:01:47 2010 +0100 @@ -46,6 +46,7 @@ - Run programs that inherit main(String[]) in their main-class - Work with JNLP files that use spec version 1.6 - RH601281: Possible NullPointerException in splash screen code + - New man page for javaws * Plugin - RH560193: Fix ziperror when applet jar contained another 0-byte jar - PR519: 100% CPU usage when displaying applets in Webkit based browsers