[patch] add a man page for javaws
Dr Andrew John Hughes
ahughes at redhat.com
Thu Sep 16 15:31:55 PDT 2010
On 12:07 Tue 14 Sep , Omair Majid wrote:
> Hi,
>
> On 09/14/2010 07:02 AM, Dr Andrew John Hughes wrote:
> > On 14:37 Thu 09 Sep , Omair Majid wrote:
> >> Hi,
> >>
> >> OpenJDK6 contains a man page for javaws, but it has two problems:
> >> - it not applicable to netx which has different quirks and options
> >> - openjdk's javaws man page is only "built" on a 32 bit arch.
> >>
> >> The attached patch adds a man page for javaws, which overwrites the one
> >> from openjdk. This man page should be much more relevant to anyone using
> >> IcedTea. Any comments or concerns?
> >>
> >> 2010-09-09 Omair Majid<omajid at redhat.com>
> >>
> >> Add a new man page for netx's javaws.
> >> * Makefile.am
> >> (stamps/add-netx.stamp): Copy over the javaws man page into the
> >> build.
> >> (clean-add-netx): Remove the javaws man pages on clean.
> >> (stamps/add-netx-debug.stamp): Copy over the javaws man page.
> >> (clean-add-netx-debug): Remove the javaws man page.
> >> * netx/javaws.1: New man page for netx's javaws.
> >>
> >> Cheers,
> >> Omair
> >
>
> > This has broken the build on toadeater:
> >
> > cp /notnfs/nighttester/icedtea6-target-testing/netx/javaws.1 /notnfs/nighttester/icedtea6-target-testing/openjdk.build/j2sdk-image/man/man1
> > cp: cannot create regular file `/notnfs/nighttester/icedtea6-target-testing/openjdk.build/j2sdk-image/man/man1': No such file or directory
> > make[1]: *** [stamps/add-netx.stamp] Error 1
> > make[1]: Leaving directory `/notnfs/nighttester/icedtea6-target-testing'
> >
> > I think you need to add a check to make sure this directory exists (maybe it is not built if docs are disabled?)
> >
> > I also notice that you missed adding the logic to the ecj build.
> >
> > Thanks,
>
> Ah, sorry about that. I looked into it and the build logic seems a
> little weird. Doing a 'make hotspot' causes netx/plugin to be built but
> not the rest of the jdk. The directories $(build)/jre/lib/$(arch) are
> created, so netx.jar and plugin.jar are copied into jre/lib
> successfully, but since the man directory is not, the copying of the man
> page fails.
>
> The attached patch makes the copying of man pages conditional on
> ENABLE_DOCS as well as the man folder existing. I am not sure if this is
> the best solution though. Any thoughts?
>
Looks good. Please apply so the build gets fixed.
> As for ecj, I am slightly confused. I updated all the targets that
> create or remove netx.jar. Are netx/plugin even built with ecj?
>
Doesn't look like it. This needs to be fixed separately.
> Thanks,
> Omair
> diff -r 1c5acca8abfd Makefile.am
> --- a/Makefile.am Mon Sep 13 10:21:58 2010 -0400
> +++ b/Makefile.am Tue Sep 14 11:55:27 2010 -0400
> @@ -1422,10 +1422,16 @@
> $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib
> cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \
> $(BUILD_OUTPUT_DIR)/j2re-image/lib
> - cp $(NETX_SRCDIR)/javaws.1 \
> - $(BUILD_OUTPUT_DIR)/j2sdk-image/man/man1
> - cp $(NETX_SRCDIR)/javaws.1 \
> - $(BUILD_OUTPUT_DIR)/j2re-image/man/man1
> +if ENABLE_DOCS
> + if test -d $(BUILD_OUTPUT_DIR)/j2sdk-image/man/man1; then \
> + cp $(NETX_SRCDIR)/javaws.1 \
> + $(BUILD_OUTPUT_DIR)/j2sdk-image/man/man1; \
> + fi
> + if test -d $(BUILD_OUTPUT_DIR)/j2re-image/man/man1; then \
> + cp $(NETX_SRCDIR)/javaws.1 \
> + $(BUILD_OUTPUT_DIR)/j2re-image/man/man1; \
> + fi
> +endif
> touch stamps/add-netx.stamp
>
> clean-add-netx:
> @@ -1435,8 +1441,14 @@
> rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/about.jar
> rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/about.jnlp
> rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/about.jar
> - rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/man/man1/javaws.1
> - rm -f $(BUILD_OUTPUT_DIR)/j2re-image/man/man1/javaws.1
> +if ENABLE_DOCS
> + if test -d $(BUILD_OUTPUT_DIR)/j2sdk-image/man/man1; then \
> + rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/man/man1/javaws.1; \
> + fi
> + if test -d $(BUILD_OUTPUT_DIR)/j2re-image/man/man1; then \
> + rm -f $(BUILD_OUTPUT_DIR)/j2re-image/man/man1/javaws.1; \
> + fi
> +endif
> rm -f stamps/add-netx.stamp
>
> stamps/add-netx-debug.stamp: stamps/netx-dist.stamp extra-lib/about.jar
> @@ -1448,10 +1460,16 @@
> $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib
> cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \
> $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib
> - cp $(NETX_SRCDIR)/javaws.1 \
> - $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/man/man1
> - cp $(NETX_SRCDIR)/javaws.1 \
> - $(BUILD_OUTPUT_DIR)/j2re-image/man/man1
> +if ENABLE_DOCS
> + if test -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 test -d $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/man/man1; then \
> + cp $(NETX_SRCDIR)/javaws.1 \
> + $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/man/man1; \
> + fi
> +endif
> touch stamps/add-netx-debug.stamp
>
> clean-add-netx-debug:
> @@ -1461,8 +1479,14 @@
> rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/about.jar
> rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/about.jnlp
> rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/about.jar
> - rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/man/man1/javaws.1
> - rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/man/man1/javaws.1
> +if ENABLE_DOCS
> + if test -d $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/man/man1; then \
> + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/man/man1/javaws.1; \
> + fi
> + if test -d $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/man/man1; then \
> + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/man/man1/javaws.1; \
> + fi
> +endif
> rm -f stamps/add-netx-debug.stamp
>
> # OpenJDK ecj Targets
--
Andrew :)
Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)
Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8
More information about the distro-pkg-dev
mailing list