OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Makefile.am: Add rules to build and install man pages from texinfo docs. 

ChangeLog

2007-02-20  Matthias Klose  <doko@ubuntu.com>

        * doc/Makefile.am: Add rules to build and install man pages
        from texinfo docs.
        * doc/hacking.texinfo doc/tools.texinfo, doc/vmintegration.texinfo:
        Rename, prefix files with "cp-".
        * doc/cp-tools.texinfo: Add markup for man page generation,
        add documentation for command line options for gjar, gjavah,
        gnative2ascii, gorbd, grmid, grmiregistry, gserialver, gtnameserv.
        doc/texi2pod.pl: New, taken from the GCC sources.

ChangeLog.gcj

2007-02-20  Matthias Klose  <doko@ubuntu.com>

        * Merge doc update from classpath HEAD.
        * doc/texi2pod.pl: Not imported.
        * doc/Makefile.am: Use GCC's texi2pod.pl
        * doc/Makefile.in: Regenerate.

From-SVN: r122170
This commit is contained in:
Matthias Klose 2007-02-20 19:46:57 +00:00 committed by Matthias Klose
parent 8df79ac594
commit 54a0a14af9
7 changed files with 1025 additions and 254 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libjava/classpath/ChangeLog
View File

@ -1,3 +1,14 @@
2007-02-20 Matthias Klose <doko@ubuntu.com>
* doc/Makefile.am: Add rules to build and install man pages
from texinfo docs.
* doc/hacking.texinfo doc/tools.texinfo, doc/vmintegration.texinfo:
Rename, prefix files with "cp-".
* doc/cp-tools.texinfo: Add markup for man page generation,
add documentation for command line options for gjar, gjavah,
gnative2ascii, gorbd, grmid, grmiregistry, gserialver, gtnameserv.
doc/texi2pod.pl: New, taken from the GCC sources.
2006-10-14 Edwin Steiner <edwin.steiner@gmx.net>
PR classpath/28652:

7
libjava/classpath/ChangeLog.gcj
View File

@ -1,3 +1,10 @@
2007-02-20 Matthias Klose <doko@ubuntu.com>
* Merge doc update from classpath HEAD.
* doc/texi2pod.pl: Not imported.
* doc/Makefile.am: Use GCC's texi2pod.pl
* doc/Makefile.in: Regenerate.
2007-02-20 Gary Benson <gbenson@redhat.com>
* javax/management/MBeanServer.java: Updated.

85
libjava/classpath/doc/Makefile.am
View File

@ -1,9 +1,9 @@
SUBDIRS = api
EXTRA_DIST = README.jaxp
EXTRA_DIST = README.jaxp $(man_MANS)
## GCJ LOCAL: we don't want to install Classpath's info files.
## info_TEXINFOS = hacking.texinfo vmintegration.texinfo
## GCJ LOCAL: we don't want to install all of Classpath's info files.
## info_TEXINFOS = cp-hacking.texinfo cp-vmintegration.texinfo cp-tools.texinfo
%.dvi : %.texinfo
texi2dvi $<
@ -11,4 +11,81 @@ EXTRA_DIST = README.jaxp
%.ps : %.dvi
dvips -o $@ $<
docs: hacking.ps vmintegration.ps tools.ps
docs: cp-hacking.ps cp-vmintegration.ps cp-tools.ps
#man_MANS = $(TOOLS_MANFILES)
TOOLS_MANFILES = \
gappletviewer.1 \
gjar.1 \
gjarsigner.1 \
gjavah.1 \
gkeytool.1 \
gnative2ascii.1 \
gorbd.1 \
grmid.1 \
grmiregistry.1 \
gserialver.1 \
gtnameserv.1
BASEVER = $(top_srcdir)/../../gcc/BASE-VER
DEVPHASE = $(top_srcdir)/../../gcc/DEV-PHASE
POD2MAN = pod2man --center="GNU" --release="gcc-$(shell cat $(BASEVER))"
TEXI2POD = perl $(top_srcdir)/../../contrib/texi2pod.pl
STAMP = echo timestamp >
# gcc-vers.texi is generated from the version files.
gcc-vers.texi: $(BASEVER) $(DEVPHASE)
(echo "@set version-GCC $(shell cat $(BASEVER))"; \
if [ "$(shell cat $(DEVPHASE))" = "experimental" ]; \
then echo "@set DEVELOPMENT"; \
else echo "@clear DEVELOPMENT"; \
fi) > $@T
mv -f $@T $@
%.1: %.pod
$(STAMP) $@
-($(POD2MAN) --section=1 $< > $(@).T$$$$ && \
mv -f $(@).T$$$$ $@) || \
(rm -f $(@).T$$$$ && exit 1)
.INTERMEDIATE: gappletviewer.pod gjarsigner.pod gjar.pod gjavah.pod \
gkeytool.pod gnative2ascii.pod gorbd.pod grmid.pod grmiregistry.pod \
gserialver.pod gtnameserv.pod
gappletviewer.pod: $(srcdir)/cp-tools.texinfo
-$(TEXI2POD) -D gappletviewer < $< > $@
gjarsigner.pod: $(srcdir)/cp-tools.texinfo
-$(TEXI2POD) -D gjarsigner < $< > $@
gjar.pod: $(srcdir)/cp-tools.texinfo
-$(TEXI2POD) -D gjar < $< > $@
gjavah.pod: $(srcdir)/cp-tools.texinfo
-$(TEXI2POD) -D gjavah < $< > $@
# hack around the cross references and the enumeration
gkeytool.pod: $(srcdir)/cp-tools.texinfo
-$(TEXI2POD) -D gkeytool < $< > $@
sed -i -e 's/^For more details.*/See I<Common Options> for more details./' \
-e 's/1\.<\([^>]*\)>/- \1/' \
$@
gnative2ascii.pod: $(srcdir)/cp-tools.texinfo
-$(TEXI2POD) -D gnative2ascii < $< > $@
gorbd.pod: $(srcdir)/cp-tools.texinfo
-$(TEXI2POD) -D gorbd < $< > $@
grmid.pod: $(srcdir)/cp-tools.texinfo
-$(TEXI2POD) -D grmid < $< > $@
grmiregistry.pod: $(srcdir)/cp-tools.texinfo
-$(TEXI2POD) -D grmiregistry < $< > $@
gserialver.pod: $(srcdir)/cp-tools.texinfo
-$(TEXI2POD) -D gserialver < $< > $@
gtnameserv.pod: $(srcdir)/cp-tools.texinfo
-$(TEXI2POD) -D gtnameserv < $< > $@

80
libjava/classpath/doc/Makefile.in
View File

@ -296,7 +296,27 @@ target_vendor = @target_vendor@
toolexeclibdir = @toolexeclibdir@
vm_classes = @vm_classes@
SUBDIRS = api
EXTRA_DIST = README.jaxp
EXTRA_DIST = README.jaxp $(man_MANS)
#man_MANS = $(TOOLS_MANFILES)
TOOLS_MANFILES = \
gappletviewer.1 \
gjar.1 \
gjarsigner.1 \
gjavah.1 \
gkeytool.1 \
gnative2ascii.1 \
gorbd.1 \
grmid.1 \
grmiregistry.1 \
gserialver.1 \
gtnameserv.1
BASEVER = $(top_srcdir)/../../gcc/BASE-VER
DEVPHASE = $(top_srcdir)/../../gcc/DEV-PHASE
POD2MAN = pod2man --center="GNU" --release="gcc-$(shell cat $(BASEVER))"
TEXI2POD = perl $(top_srcdir)/../../contrib/texi2pod.pl
STAMP = echo timestamp >
all: all-recursive
.SUFFIXES:
@ -612,7 +632,63 @@ uninstall-info: uninstall-info-recursive
%.ps : %.dvi
dvips -o $@ $<
docs: hacking.ps vmintegration.ps tools.ps
docs: cp-hacking.ps cp-vmintegration.ps cp-tools.ps
# gcc-vers.texi is generated from the version files.
gcc-vers.texi: $(BASEVER) $(DEVPHASE)
(echo "@set version-GCC $(shell cat $(BASEVER))"; \
if [ "$(shell cat $(DEVPHASE))" = "experimental" ]; \
then echo "@set DEVELOPMENT"; \
else echo "@clear DEVELOPMENT"; \
fi) > $@T
mv -f $@T $@
%.1: %.pod
$(STAMP) $@
-($(POD2MAN) --section=1 $< > $(@).T$$$$ && \
mv -f $(@).T$$$$ $@) || \
(rm -f $(@).T$$$$ && exit 1)
.INTERMEDIATE: gappletviewer.pod gjarsigner.pod gjar.pod gjavah.pod \
gkeytool.pod gnative2ascii.pod gorbd.pod grmid.pod grmiregistry.pod \
gserialver.pod gtnameserv.pod
gappletviewer.pod: $(srcdir)/cp-tools.texinfo
-$(TEXI2POD) -D gappletviewer < $< > $@
gjarsigner.pod: $(srcdir)/cp-tools.texinfo
-$(TEXI2POD) -D gjarsigner < $< > $@
gjar.pod: $(srcdir)/cp-tools.texinfo
-$(TEXI2POD) -D gjar < $< > $@
gjavah.pod: $(srcdir)/cp-tools.texinfo
-$(TEXI2POD) -D gjavah < $< > $@
# hack around the cross references and the enumeration
gkeytool.pod: $(srcdir)/cp-tools.texinfo
-$(TEXI2POD) -D gkeytool < $< > $@
sed -i -e 's/^For more details.*/See I<Common Options> for more details./' \
-e 's/1\.<\([^>]*\)>/- \1/' \
$@
gnative2ascii.pod: $(srcdir)/cp-tools.texinfo
-$(TEXI2POD) -D gnative2ascii < $< > $@
gorbd.pod: $(srcdir)/cp-tools.texinfo
-$(TEXI2POD) -D gorbd < $< > $@
grmid.pod: $(srcdir)/cp-tools.texinfo
-$(TEXI2POD) -D grmid < $< > $@
grmiregistry.pod: $(srcdir)/cp-tools.texinfo
-$(TEXI2POD) -D grmiregistry < $< > $@
gserialver.pod: $(srcdir)/cp-tools.texinfo
-$(TEXI2POD) -D gserialver < $< > $@
gtnameserv.pod: $(srcdir)/cp-tools.texinfo
-$(TEXI2POD) -D gtnameserv < $< > $@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:

0
libjava/classpath/doc/hacking.texinfo → libjava/classpath/doc/cp-hacking.texinfo
View File

1096
libjava/classpath/doc/tools.texinfo → libjava/classpath/doc/cp-tools.texinfo
View File

File diff suppressed because it is too large Load Diff

0
libjava/classpath/doc/vmintegration.texinfo → libjava/classpath/doc/cp-vmintegration.texinfo
View File