public inbox for binutils@sourceware.org
 help / color / mirror / Atom feed
* [PATCH] Fix binutils html target.
@ 2006-02-17  1:29 Carlos O'Donell
  2006-02-17 12:47 ` Nick Clifton
                   ` (2 more replies)
  0 siblings, 3 replies; 20+ messages in thread
From: Carlos O'Donell @ 2006-02-17  1:29 UTC (permalink / raw)
  To: binutils


These patches enable building the binutils html target.

I intend to keep this target up to date and tested as much
as possible. If you have any long term thoughts about
documentation building and maintenance please feel free
to comment.

Cheers,
Carlos.
-- 
Carlos O'Donell
CodeSourcery
carlos@codesourcery.com
(650) 331-3385 x716

bfd/doc/

2006-10-14  Carlos O'Donell  <carlos@codesourcery.com>

	* Makefile.am: Add html target.
	* Makefile.in: Regenerate.

bfd/

2006-10-14  Carlos O'Donell  <carlos@codesourcery.com>

	* po/Make-in: Add html target.

binutils/

2006-10-14  Carlos O'Donell  <carlos@codesourcery.com>

	* po/Make-in: Add html target.

etc/

2006-10-14  Carlos O'Donell  <carlos@codesourcery.com>

	* Makefile.in: TEXI2HTML uses makeinfo. Define
	HTMLFILES. Add html targets.
	* configure.texi: Use ifnottex. Add alternative
	image format specfier as jpg.
	* standards.texi: Use ifnottex.

gas/

2006-10-14  Carlos O'Donell  <carlos@codesourcery.com>

	* doc/Makefile.am: Add html target.
	* doc/Makefile.in: Regenerate.
	* po/Make-in: Add html target.

gprof/

2006-10-14  Carlos O'Donell  <carlos@codesourcery.com>

	* po/Make-in: Add html target.

intl/

2006-10-14  Carlos O'Donell  <carlos@codesourcery.com>

	* intl/Makefile.in: Add html target.

ld/

2006-10-14  Carlos O'Donell  <carlos@codesourcery.com>

	* Makefile.am: Add html target.
	* Makefile.in: Regenerate.
	* po/Make-in: Add html target.

opcodes/

2006-10-14  Carlos O'Donell  <carlos@codesourcery.com>

	* po/Make-in: Add html target.

Index: bfd/doc/Makefile.am
===================================================================
RCS file: /cvs/src/src/bfd/doc/Makefile.am,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile.am
--- bfd/doc/Makefile.am	9 May 2005 21:13:56 -0000	1.18
+++ bfd/doc/Makefile.am	16 Feb 2006 17:45:09 -0000
@@ -68,7 +68,7 @@ chew.o: chew.c
 
 protos: libbfd.h libcoff.h bfd.h
 
-$(srcdir)/bfd.info bfd.dvi: $(DOCFILES) bfdsumm.texi bfd.texinfo
+$(srcdir)/bfd.info bfd.dvi bfd.html: $(DOCFILES) bfdsumm.texi bfd.texinfo
 
 # We can't replace these rules with an implicit rule, because
 # makes without VPATH support couldn't find the .h files in `..'.
Index: bfd/doc/Makefile.in
===================================================================
RCS file: /cvs/src/src/bfd/doc/Makefile.in,v
retrieving revision 1.65
diff -u -p -r1.65 Makefile.in
--- bfd/doc/Makefile.in	10 May 2005 01:27:54 -0000	1.65
+++ bfd/doc/Makefile.in	16 Feb 2006 17:45:09 -0000
@@ -596,7 +596,7 @@ chew.o: chew.c
 
 protos: libbfd.h libcoff.h bfd.h
 
-$(srcdir)/bfd.info bfd.dvi: $(DOCFILES) bfdsumm.texi bfd.texinfo
+$(srcdir)/bfd.info bfd.dvi bfd.html: $(DOCFILES) bfdsumm.texi bfd.texinfo
 
 # We can't replace these rules with an implicit rule, because
 # makes without VPATH support couldn't find the .h files in `..'.
Index: bfd/po/Make-in
===================================================================
RCS file: /cvs/src/src/bfd/po/Make-in,v
retrieving revision 1.6
diff -u -p -r1.6 Make-in
--- bfd/po/Make-in	3 Mar 2005 11:41:03 -0000	1.6
+++ bfd/po/Make-in	16 Feb 2006 17:45:09 -0000
@@ -198,7 +198,7 @@ check: all
 
 cat-id-tbl.o: ../intl/libgettext.h
 
-dvi info tags TAGS ID:
+html dvi info tags TAGS ID:
 
 mostlyclean:
 	rm -f core core.* *.pox $(PACKAGE).po *.old.po cat-id-tbl.tmp
Index: binutils/po/Make-in
===================================================================
RCS file: /cvs/src/src/binutils/po/Make-in,v
retrieving revision 1.3
diff -u -p -r1.3 Make-in
--- binutils/po/Make-in	3 Mar 2005 11:46:13 -0000	1.3
+++ binutils/po/Make-in	16 Feb 2006 17:45:09 -0000
@@ -185,7 +185,7 @@ check: all
 
 cat-id-tbl.o: ../intl/libgettext.h
 
-dvi info tags TAGS ID:
+html dvi info tags TAGS ID:
 
 mostlyclean:
 	rm -f core core.* *.pox $(PACKAGE).po *.old.po cat-id-tbl.tmp
Index: etc/Makefile.in
===================================================================
RCS file: /cvs/src/src/etc/Makefile.in,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile.in
--- etc/Makefile.in	19 May 2005 23:49:46 -0000	1.4
+++ etc/Makefile.in	16 Feb 2006 17:45:09 -0000
@@ -39,7 +39,10 @@ MAKEINFO = `if [ -f ../texinfo/makeinfo/
 TEXI2DVI = `if [ -f ../texinfo/util/texi2dvi ]; \
 	then echo ../texinfo/util/texi2dvi; \
 	else echo texi2dvi; fi`
-TEXI2HTML = texi2html
+TEXI2HTML = `if [ -f ../texinfo/makeinfo/makeinfo ]; \
+	then echo "../texinfo/makeinfo/makeinfo --html"; \
+	else echo "makeinfo --html"; fi`
+
 DVIPS = dvips
 
 # Where to find texinfo.tex to format documentation with TeX.
@@ -50,6 +53,7 @@ TEXIDIR = $(srcdir)/../texinfo
 
 INFOFILES = standards.info configure.info
 DVIFILES = standards.dvi configure.dvi
+HTMLFILES = standards.html configure.html
 
 all: info
 install: install-info
@@ -82,6 +86,18 @@ install-info: info
 	  done; \
 	fi
 
+html:
+	for f in $(HTMLFILES); do \
+	  if test -f $(srcdir)/`echo $$f | sed -e 's/.html$$/.texi/'`; then \
+	    if $(MAKE) "TEXI2HTML=$(TEXI2HTML)" $$f; then \
+	      true; \
+	    else \
+	      exit 1; \
+	    fi; \
+	  fi; \
+	done
+
+
 dvi:
 	for f in $(DVIFILES); do \
 	  if test -f $(srcdir)/`echo $$f | sed -e 's/.dvi$$/.texi/'`; then \
@@ -96,6 +112,9 @@ dvi:
 standards.info: $(srcdir)/standards.texi $(srcdir)/make-stds.texi
 	$(MAKEINFO) --no-split -I$(srcdir) -o standards.info $(srcdir)/standards.texi
 
+standards.html: $(srcdir)/standards.texi $(srcdir)/make-stds.texi
+	$(TEXI2HTML) --no-split -I$(srcdir) -o standards.html $(srcdir)/standards.texi
+
 standards.dvi: $(srcdir)/standards.texi
 	TEXINPUTS=$(TEXIDIR):$$TEXINPUTS $(TEXI2DVI) $(srcdir)/standards.texi
 
@@ -131,12 +150,15 @@ configure.ps: configure.dvi $(srcdir)/co
 	rm -f configdev.eps configbuild.eps
 
 configure.html: $(srcdir)/configure.texi
-	$(TEXI2HTML) -split_chapter $(srcdir)/configure.texi
+	cp $(srcdir)/configdev.jin configdev.jpg
+	cp $(srcdir)/configbuild.jin configbuild.jpg
+	$(TEXI2HTML) --no-split -I$(srcdir) -o configure.html $(srcdir)/configure.texi
 
 clean:
 	rm -f *.aux *.cp *.cps *.dvi *.fn *.fns *.ky *.kys *.log
 	rm -f *.pg *.pgs *.toc *.tp *.tps *.vr *.vrs
-	rm -f configdev.txt configbuild.txt configdev.eps configbuild.eps
+	rm -f configdev.txt configbuild.txt 
+	rm -f configdev.eps configbuild.eps
 	rm -f configdev.jpg configbuild.jpg
 
 mostlyclean: clean
@@ -145,6 +167,7 @@ distclean:   clean
 	rm -f Makefile config.status config.cache
 
 maintainer-clean realclean:   distclean
+	rm -f *.html*
 	rm -f *.info*
 
 Makefile: $(srcdir)/Makefile.in $(host_makefile_frag) $(target_makefile_frag)
Index: etc/configure.texi
===================================================================
RCS file: /cvs/src/src/etc/configure.texi,v
retrieving revision 1.2
diff -u -p -r1.2 configure.texi
--- etc/configure.texi	16 May 2003 16:30:26 -0000	1.2
+++ etc/configure.texi	16 Feb 2006 17:45:09 -0000
@@ -10,7 +10,7 @@
 * configure: (configure).	The GNU configure and build system
 @end direntry
 
-@ifinfo
+@ifnottex
 This file documents the GNU configure and build system.
 
 Copyright (C) 1998 Cygnus Solutions.
@@ -35,7 +35,7 @@ Permission is granted to copy and distri
 into another language, under the above conditions for modified versions,
 except that this permission notice may be stated in a translation approved
 by the Foundation.
-@end ifinfo
+@end ifnottex
 
 @titlepage
 @title The GNU configure and build system
@@ -60,7 +60,7 @@ except that this permission notice may b
 approved by the Free Software Foundation.
 @end titlepage
 
-@ifinfo
+@ifnottex
 @node Top
 @top GNU configure and build system
 
@@ -79,7 +79,7 @@ The GNU configure and build system.
 * Index::			Index.
 @end menu
 
-@end ifinfo
+@end ifnottex
 
 @node Introduction
 @chapter Introduction
@@ -1085,7 +1085,7 @@ are in rectangles with rounded corners
 @end ifnotinfo
 (e.g., @samp{autoheader} is the name of a tool, not the name of a file).
 
-@image{configdev}
+@image{configdev,,,,jpg}
 
 @node Written Developer Files
 @subsection Written Developer Files
@@ -1235,7 +1235,7 @@ Here is a picture of the files which wil
 @file{config.status} is both a created file and a shell script which is
 run to create other files, and the picture attempts to show that.
 
-@image{configbuild}
+@image{configbuild,,,,jpg}
 
 @node Build Files Description
 @subsection Build Files Description
Index: etc/standards.texi
===================================================================
RCS file: /cvs/src/src/etc/standards.texi,v
retrieving revision 1.2
diff -u -p -r1.2 standards.texi
--- etc/standards.texi	27 Feb 2002 02:13:33 -0000	1.2
+++ etc/standards.texi	16 Feb 2006 17:45:09 -0000
@@ -6,13 +6,13 @@
 @set lastupdate February 14, 2002
 @c %**end of header
 
-@ifinfo
+@ifnottex
 @format
 START-INFO-DIR-ENTRY
 * Standards: (standards).        GNU coding standards.
 END-INFO-DIR-ENTRY
 @end format
-@end ifinfo
+@end ifnottex
 
 @c @setchapternewpage odd
 @setchapternewpage off
@@ -28,11 +28,11 @@ END-INFO-DIR-ENTRY
 @iftex
 @set CHAPTER chapter
 @end iftex
-@ifinfo
+@ifnottex
 @set CHAPTER node
-@end ifinfo
+@end ifnottex
 
-@ifinfo
+@ifnottex
 GNU Coding Standards
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
 
@@ -43,7 +43,7 @@ with no Invariant Sections, with no
 Front-Cover Texts, and with no Back-Cover Texts.
 A copy of the license is included in the section entitled ``GNU
 Free Documentation License''.
-@end ifinfo
+@end ifnottex
 
 @titlepage
 @title GNU Coding Standards
@@ -63,12 +63,12 @@ A copy of the license is included in the
 Free Documentation License''.
 @end titlepage
 
-@ifinfo
+@ifnottex
 @node Top, Preface, (dir), (dir)
 @top Version
 
 Last updated @value{lastupdate}.
-@end ifinfo
+@end ifnottex
 
 @menu
 * Preface::                     About the GNU Coding Standards
Index: gas/doc/Makefile.am
===================================================================
RCS file: /cvs/src/src/gas/doc/Makefile.am,v
retrieving revision 1.41
diff -u -p -r1.41 Makefile.am
--- gas/doc/Makefile.am	12 Dec 2005 11:25:04 -0000	1.41
+++ gas/doc/Makefile.am	16 Feb 2006 17:45:09 -0000
@@ -64,8 +64,7 @@ gasver.texi: $(srcdir)/../../bfd/configu
 	eval `grep '^ *VERSION=' $(srcdir)/../../bfd/configure`; \
 	  echo "@set VERSION $$VERSION" > $@
 
-$(srcdir)/as.info: $(srcdir)/as.texinfo asconfig.texi gasver.texi $(CPU_DOCS)
-as.dvi: $(srcdir)/as.texinfo asconfig.texi gasver.texi $(CPU_DOCS)
+$(srcdir)/as.info as.dvi as.html: $(srcdir)/as.texinfo asconfig.texi gasver.texi $(CPU_DOCS)
 
 # We want install to imply install-info as per GNU standards, despite the
 # cygnus option.
Index: gas/doc/Makefile.in
===================================================================
RCS file: /cvs/src/src/gas/doc/Makefile.in,v
retrieving revision 1.74
diff -u -p -r1.74 Makefile.in
--- gas/doc/Makefile.in	12 Dec 2005 11:25:04 -0000	1.74
+++ gas/doc/Makefile.in	16 Feb 2006 17:45:09 -0000
@@ -343,6 +343,8 @@ distclean-libtool:
 	    rm -rf $(@:.html=); else rm -Rf $(@:.html=.htp) $@; fi; \
 	  exit 1; \
 	fi
+$(srcdir)/as.info: as.texinfo 
+as.dvi: as.texinfo 
 as.pdf: as.texinfo 
 as.html: as.texinfo 
 .dvi.ps:
@@ -586,8 +588,7 @@ gasver.texi: $(srcdir)/../../bfd/configu
 	eval `grep '^ *VERSION=' $(srcdir)/../../bfd/configure`; \
 	  echo "@set VERSION $$VERSION" > $@
 
-$(srcdir)/as.info: $(srcdir)/as.texinfo asconfig.texi gasver.texi $(CPU_DOCS)
-as.dvi: $(srcdir)/as.texinfo asconfig.texi gasver.texi $(CPU_DOCS)
+$(srcdir)/as.info as.dvi as.html: $(srcdir)/as.texinfo asconfig.texi gasver.texi $(CPU_DOCS)
 
 # We want install to imply install-info as per GNU standards, despite the
 # cygnus option.
Index: gas/po/Make-in
===================================================================
RCS file: /cvs/src/src/gas/po/Make-in,v
retrieving revision 1.3
diff -u -p -r1.3 Make-in
--- gas/po/Make-in	3 Mar 2005 11:47:57 -0000	1.3
+++ gas/po/Make-in	16 Feb 2006 17:45:09 -0000
@@ -185,7 +185,7 @@ check: all
 
 cat-id-tbl.o: ../intl/libgettext.h
 
-dvi info tags TAGS ID:
+html dvi info tags TAGS ID:
 
 mostlyclean:
 	rm -f core core.* *.pox $(PACKAGE).po *.old.po cat-id-tbl.tmp
Index: gprof/po/Make-in
===================================================================
RCS file: /cvs/src/src/gprof/po/Make-in,v
retrieving revision 1.5
diff -u -p -r1.5 Make-in
--- gprof/po/Make-in	3 Mar 2005 12:05:13 -0000	1.5
+++ gprof/po/Make-in	16 Feb 2006 17:45:10 -0000
@@ -185,7 +185,7 @@ check: all
 
 cat-id-tbl.o: ../intl/libgettext.h
 
-dvi info tags TAGS ID:
+html dvi info tags TAGS ID:
 
 mostlyclean:
 	rm -f core core.* *.pox $(PACKAGE).po *.old.po cat-id-tbl.tmp
Index: intl/Makefile.in
===================================================================
RCS file: /cvs/src/src/intl/Makefile.in,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile.in
--- intl/Makefile.in	13 May 2005 08:04:30 -0000	1.4
+++ intl/Makefile.in	16 Feb 2006 17:45:10 -0000
@@ -149,7 +149,7 @@ uninstall:
 	  rm -f $(gettextsrcdir)/$$file; \
 	done
 
-info dvi:
+html info dvi:
 
 $(OBJECTS): config.h libgettext.h
 bindtextdom.$lo finddomain.$lo loadmsgcat.$lo: gettextP.h gettext.h loadinfo.h
Index: ld/Makefile.am
===================================================================
RCS file: /cvs/src/src/ld/Makefile.am,v
retrieving revision 1.198
diff -u -p -r1.198 Makefile.am
--- ld/Makefile.am	27 Dec 2005 01:21:01 -0000	1.198
+++ ld/Makefile.am	16 Feb 2006 17:45:10 -0000
@@ -1661,8 +1661,7 @@ ldver.texi: $(srcdir)/../bfd/configure
 	eval `grep '^ *VERSION=' $(srcdir)/../bfd/configure`; \
 	  echo "@set VERSION $$VERSION" > $@
 
-$(srcdir)/ld.info: $(srcdir)/ld.texinfo configdoc.texi ldver.texi
-ld.dvi: $(srcdir)/ld.texinfo configdoc.texi ldver.texi
+$(srcdir)/ld.info ld.dvi ld.html: $(srcdir)/ld.texinfo configdoc.texi ldver.texi
 
 # Build the man page from the texinfo file
 # The sed command removes the no-adjust Nroff command so that
Index: ld/Makefile.in
===================================================================
RCS file: /cvs/src/src/ld/Makefile.in,v
retrieving revision 1.212
diff -u -p -r1.212 Makefile.in
--- ld/Makefile.in	27 Dec 2005 01:21:01 -0000	1.212
+++ ld/Makefile.in	16 Feb 2006 17:45:11 -0000
@@ -829,6 +829,8 @@ distclean-libtool:
 	    rm -rf $(@:.html=); else rm -Rf $(@:.html=.htp) $@; fi; \
 	  exit 1; \
 	fi
+$(srcdir)/ld.info: ld.texinfo 
+ld.dvi: ld.texinfo 
 ld.pdf: ld.texinfo 
 ld.html: ld.texinfo 
 .dvi.ps:
@@ -2454,8 +2456,7 @@ ldver.texi: $(srcdir)/../bfd/configure
 	eval `grep '^ *VERSION=' $(srcdir)/../bfd/configure`; \
 	  echo "@set VERSION $$VERSION" > $@
 
-$(srcdir)/ld.info: $(srcdir)/ld.texinfo configdoc.texi ldver.texi
-ld.dvi: $(srcdir)/ld.texinfo configdoc.texi ldver.texi
+$(srcdir)/ld.info ld.dvi ld.html: $(srcdir)/ld.texinfo configdoc.texi ldver.texi
 
 # Build the man page from the texinfo file
 # The sed command removes the no-adjust Nroff command so that
Index: ld/po/Make-in
===================================================================
RCS file: /cvs/src/src/ld/po/Make-in,v
retrieving revision 1.3
diff -u -p -r1.3 Make-in
--- ld/po/Make-in	3 Mar 2005 11:52:05 -0000	1.3
+++ ld/po/Make-in	16 Feb 2006 17:45:11 -0000
@@ -185,7 +185,7 @@ check: all
 
 cat-id-tbl.o: ../intl/libgettext.h
 
-dvi info tags TAGS ID:
+html dvi info tags TAGS ID:
 
 mostlyclean:
 	rm -f core core.* *.pox $(PACKAGE).po *.old.po cat-id-tbl.tmp
Index: opcodes/po/Make-in
===================================================================
RCS file: /cvs/src/src/opcodes/po/Make-in,v
retrieving revision 1.3
diff -u -p -r1.3 Make-in
--- opcodes/po/Make-in	3 Mar 2005 11:49:51 -0000	1.3
+++ opcodes/po/Make-in	16 Feb 2006 17:45:11 -0000
@@ -185,7 +185,7 @@ check: all
 
 cat-id-tbl.o: ../intl/libgettext.h
 
-dvi info tags TAGS ID:
+html dvi info tags TAGS ID:
 
 mostlyclean:
 	rm -f core core.* *.pox $(PACKAGE).po *.old.po cat-id-tbl.tmp

^ permalink raw reply	[flat|nested] 20+ messages in thread

* Re: [PATCH] Fix binutils html target.
  2006-02-17  1:29 [PATCH] Fix binutils html target Carlos O'Donell
@ 2006-02-17 12:47 ` Nick Clifton
  2006-02-17 15:48   ` Joseph S. Myers
  2006-02-18  0:02 ` Dave Korn
  2006-02-20 16:05 ` Nick Clifton
  2 siblings, 1 reply; 20+ messages in thread
From: Nick Clifton @ 2006-02-17 12:47 UTC (permalink / raw)
  To: Carlos O'Donell; +Cc: binutils

Hi Carlos,

> These patches enable building the binutils html target.

These seem to be OK, apart from one thing:

-TEXI2HTML = texi2html
+TEXI2HTML = `if [ -f ../texinfo/makeinfo/makeinfo ]; \
+	then echo "../texinfo/makeinfo/makeinfo --html"; \
+	else echo "makeinfo --html"; fi`
+

Why is the use of texi2html being abandoned ?  If the makeinfo program 
is not installed or present in the build tree, shouldn't the texi2html 
program be used instead ?

Cheers
   Nick

^ permalink raw reply	[flat|nested] 20+ messages in thread

* Re: [PATCH] Fix binutils html target.
  2006-02-17 12:47 ` Nick Clifton
@ 2006-02-17 15:48   ` Joseph S. Myers
  2006-02-18 18:08     ` Carlos O'Donell
  0 siblings, 1 reply; 20+ messages in thread
From: Joseph S. Myers @ 2006-02-17 15:48 UTC (permalink / raw)
  To: Nick Clifton; +Cc: Carlos O'Donell, binutils

On Fri, 17 Feb 2006, Nick Clifton wrote:

> Hi Carlos,
> 
> > These patches enable building the binutils html target.
> 
> These seem to be OK, apart from one thing:
> 
> -TEXI2HTML = texi2html
> +TEXI2HTML = `if [ -f ../texinfo/makeinfo/makeinfo ]; \
> +	then echo "../texinfo/makeinfo/makeinfo --html"; \
> +	else echo "makeinfo --html"; fi`
> +
> 
> Why is the use of texi2html being abandoned ?  If the makeinfo program is not
> installed or present in the build tree, shouldn't the texi2html program be
> used instead ?

These programs are not compatible in their command-line options.  In 
general texi2html cannot be relied upon to support the required Texinfo 
language features, whereas a makeinfo version check ensures that it does 
support the required features (and the in-tree copy of texinfo.tex should 
be of a suitable version to support them - a more recent version might 
need to be imported - and be used by -I options on all texi2dvi uses).  
The GNU Coding Standards suggest "makeinfo --no-split --html" as the 
proper TEXI2HTML definition.

-- 
Joseph S. Myers
joseph@codesourcery.com

^ permalink raw reply	[flat|nested] 20+ messages in thread

* RE: [PATCH] Fix binutils html target.
  2006-02-17  1:29 [PATCH] Fix binutils html target Carlos O'Donell
  2006-02-17 12:47 ` Nick Clifton
@ 2006-02-18  0:02 ` Dave Korn
  2006-02-20 16:05 ` Nick Clifton
  2 siblings, 0 replies; 20+ messages in thread
From: Dave Korn @ 2006-02-18  0:02 UTC (permalink / raw)
  To: 'Carlos O'Donell', binutils

On 16 February 2006 18:00, Carlos O'Donell wrote:

> These patches enable building the binutils html target.


  The dates on the changelog entries are a bit far in the future!

> bfd/doc/
>
> 2006-10-14  Carlos O'Donell  <carlos@codesourcery.com>

    cheers,
      DaveK
-- 
Can't think of a witty .sigline today....

^ permalink raw reply	[flat|nested] 20+ messages in thread

* Re: [PATCH] Fix binutils html target.
  2006-02-17 15:48   ` Joseph S. Myers
@ 2006-02-18 18:08     ` Carlos O'Donell
  0 siblings, 0 replies; 20+ messages in thread
From: Carlos O'Donell @ 2006-02-18 18:08 UTC (permalink / raw)
  To: Joseph S. Myers; +Cc: Nick Clifton, binutils

On Fri, Feb 17, 2006 at 01:24:54PM +0000, Joseph S. Myers wrote:
> On Fri, 17 Feb 2006, Nick Clifton wrote:
> 
> > Hi Carlos,
> > 
> > > These patches enable building the binutils html target.
> > 
> > These seem to be OK, apart from one thing:
> > 
> > -TEXI2HTML = texi2html
> > +TEXI2HTML = `if [ -f ../texinfo/makeinfo/makeinfo ]; \
> > +	then echo "../texinfo/makeinfo/makeinfo --html"; \
> > +	else echo "makeinfo --html"; fi`
> > +
> > 
> > Why is the use of texi2html being abandoned ?  If the makeinfo program is not
> > installed or present in the build tree, shouldn't the texi2html program be
> > used instead ?
> 
> These programs are not compatible in their command-line options.  In 
> general texi2html cannot be relied upon to support the required Texinfo 
> language features, whereas a makeinfo version check ensures that it does 
> support the required features (and the in-tree copy of texinfo.tex should 
> be of a suitable version to support them - a more recent version might 
> need to be imported - and be used by -I options on all texi2dvi uses).  
> The GNU Coding Standards suggest "makeinfo --no-split --html" as the 
> proper TEXI2HTML definition.

I would respond but Joseph has done a great job.

I think it is reasonable to require makeinfo when generating html targets.

Cheers,
Carlos.
-- 
Carlos O'Donell
CodeSourcery
carlos@codesourcery.com
(650) 331-3385 x716

^ permalink raw reply	[flat|nested] 20+ messages in thread

* Re: [PATCH] Fix binutils html target.
  2006-02-17  1:29 [PATCH] Fix binutils html target Carlos O'Donell
  2006-02-17 12:47 ` Nick Clifton
  2006-02-18  0:02 ` Dave Korn
@ 2006-02-20 16:05 ` Nick Clifton
  2006-02-21  0:02   ` DJ Delorie
  2006-02-22  0:00   ` cvs write access request Carlos O'Donell
  2 siblings, 2 replies; 20+ messages in thread
From: Nick Clifton @ 2006-02-20 16:05 UTC (permalink / raw)
  To: Carlos O'Donell; +Cc: binutils

Hi Carlos,

> bfd/doc/
> 2006-10-14  Carlos O'Donell  <carlos@codesourcery.com>
> 
> 	* Makefile.am: Add html target.
> 	* Makefile.in: Regenerate.
> 
> bfd/
> 2006-10-14  Carlos O'Donell  <carlos@codesourcery.com>
> 
> 	* po/Make-in: Add html target.
> 
> binutils/
> 2006-10-14  Carlos O'Donell  <carlos@codesourcery.com>
> 
> 	* po/Make-in: Add html target.
> 
> gas/
> 2006-10-14  Carlos O'Donell  <carlos@codesourcery.com>
> 
> 	* doc/Makefile.am: Add html target.
> 	* doc/Makefile.in: Regenerate.
> 	* po/Make-in: Add html target.
> 
> gprof/
> 2006-10-14  Carlos O'Donell  <carlos@codesourcery.com>
> 
> 	* po/Make-in: Add html target.
> 
> ld/
> 2006-10-14  Carlos O'Donell  <carlos@codesourcery.com>
> 
> 	* Makefile.am: Add html target.
> 	* Makefile.in: Regenerate.
> 	* po/Make-in: Add html target.
> 
> opcodes/
> 2006-10-14  Carlos O'Donell  <carlos@codesourcery.com>
> 
> 	* po/Make-in: Add html target.

Approved - please apply.

Note however that these two directories are not part of the binutils 
project so they cannot be approved here.  You should "Ask DJ Delorie 
<dj@redhat.com> after reading the libiberty entry".

 > etc/
 > 2006-10-14  Carlos O'Donell  <carlos@codesourcery.com>
 >
 > 	* Makefile.in: TEXI2HTML uses makeinfo. Define
 > 	HTMLFILES. Add html targets.
 > 	* configure.texi: Use ifnottex. Add alternative
 > 	image format specifier as jpg.
 > 	* standards.texi: Use ifnottex.
 >
 > intl/
 > 2006-10-14  Carlos O'Donell  <carlos@codesourcery.com>
 >
 > 	* intl/Makefile.in: Add html target.

Cheers
   Nick

^ permalink raw reply	[flat|nested] 20+ messages in thread

* Re: [PATCH] Fix binutils html target.
  2006-02-20 16:05 ` Nick Clifton
@ 2006-02-21  0:02   ` DJ Delorie
  2006-02-21 19:46     ` Nick Clifton
  2006-02-22  4:14     ` Carlos O'Donell
  2006-02-22  0:00   ` cvs write access request Carlos O'Donell
  1 sibling, 2 replies; 20+ messages in thread
From: DJ Delorie @ 2006-02-21  0:02 UTC (permalink / raw)
  To: nickc; +Cc: carlos, binutils


> Note however that these two directories are not part of the binutils
> project so they cannot be approved here.  You should "Ask DJ Delorie
> <dj@redhat.com> after reading the libiberty entry".

I'm not even sure how I got that onus, though.  Those directories (or
at least their contents) are specific to the src/ repository.  I think
anyone who is a global maintainer in any src/ project should be able
to OK patches there, as the ChangeLogs seem to indicate these are the
people doing it anyway.

>  > etc/
>  > 2006-10-14  Carlos O'Donell  <carlos@codesourcery.com>
>  >
>  > 	* Makefile.in: TEXI2HTML uses makeinfo. Define
>  > 	HTMLFILES. Add html targets.
>  > 	* configure.texi: Use ifnottex. Add alternative
>  > 	image format specifier as jpg.
>  > 	* standards.texi: Use ifnottex.
>  >
>  > intl/
>  > 2006-10-14  Carlos O'Donell  <carlos@codesourcery.com>
>  >
>  > 	* intl/Makefile.in: Add html target.

Ok with me.

^ permalink raw reply	[flat|nested] 20+ messages in thread

* Re: [PATCH] Fix binutils html target.
  2006-02-21  0:02   ` DJ Delorie
@ 2006-02-21 19:46     ` Nick Clifton
  2006-02-21 20:23       ` DJ Delorie
  2006-02-22  4:14     ` Carlos O'Donell
  1 sibling, 1 reply; 20+ messages in thread
From: Nick Clifton @ 2006-02-21 19:46 UTC (permalink / raw)
  To: DJ Delorie; +Cc: carlos, binutils

Hi DJ,

>> Note however that these two directories are not part of the binutils
>> project so they cannot be approved here.  You should "Ask DJ Delorie
>> <dj@redhat.com> after reading the libiberty entry".
> 
> I'm not even sure how I got that onus, though.  Those directories (or
> at least their contents) are specific to the src/ repository.  I think
> anyone who is a global maintainer in any src/ project should be able
> to OK patches there, as the ChangeLogs seem to indicate these are the
> people doing it anyway.

We probably ought to update the top level MAINTAINERS file then.  How about:

   config-ml.in; install-sh; makefile.vms; makefile.vms; missing;
   mkdep; setup.com; ylwrap; config/; etc/; intl/ utils/;
	Any global maintainer can approve changes to these files and
	directories.

Cheers
   Nick

^ permalink raw reply	[flat|nested] 20+ messages in thread

* Re: [PATCH] Fix binutils html target.
  2006-02-21 19:46     ` Nick Clifton
@ 2006-02-21 20:23       ` DJ Delorie
  2006-02-28 12:50         ` Nick Clifton
  0 siblings, 1 reply; 20+ messages in thread
From: DJ Delorie @ 2006-02-21 20:23 UTC (permalink / raw)
  To: nickc; +Cc: carlos, binutils


>    config-ml.in; install-sh; makefile.vms; makefile.vms; missing;
>    mkdep; setup.com; ylwrap; config/; etc/; intl/ utils/;
> 	Any global maintainer can approve changes to these files and
> 	directories.

My toplevel sync scripts watch missing, ylwrap, and config/ though.

The whole list is: Makefile.tpl Makefile.def Makefile.in configure.in
  configure config/ install-sh missing depcomp config.guess config.sub
  compile ylwrap

Not that they actively sync those files, they just warn the build
maintainers when they get out of sync with gcc.

^ permalink raw reply	[flat|nested] 20+ messages in thread

* cvs write access request
  2006-02-20 16:05 ` Nick Clifton
  2006-02-21  0:02   ` DJ Delorie
@ 2006-02-22  0:00   ` Carlos O'Donell
  2006-02-22  1:03     ` Daniel Jacobowitz
  1 sibling, 1 reply; 20+ messages in thread
From: Carlos O'Donell @ 2006-02-22  0:00 UTC (permalink / raw)
  To: Nick Clifton; +Cc: binutils, Alan Modra

On Mon, Feb 20, 2006 at 10:12:57AM +0000, Nick Clifton wrote:
> Hi Carlos,
>
> Approved - please apply.
>

May I have an account on sourceware for "binutils" cvs write
access please?

I am not filling out the standard webform since I already 
have a gcc.gnu.org account.

I will forward this to overseers@sourcware.org once I have
approval.

Cheers,
Carlos O'Donell.
-- 
Carlos O'Donell
CodeSourcery
carlos@codesourcery.com
(650) 331-3385 x716

^ permalink raw reply	[flat|nested] 20+ messages in thread

* Re: cvs write access request
  2006-02-22  0:00   ` cvs write access request Carlos O'Donell
@ 2006-02-22  1:03     ` Daniel Jacobowitz
  2006-02-23 15:32       ` Carlos O'Donell
  0 siblings, 1 reply; 20+ messages in thread
From: Daniel Jacobowitz @ 2006-02-22  1:03 UTC (permalink / raw)
  To: Carlos O'Donell; +Cc: Nick Clifton, binutils, Alan Modra

On Tue, Feb 21, 2006 at 06:04:32PM -0500, Carlos O'Donell wrote:
> On Mon, Feb 20, 2006 at 10:12:57AM +0000, Nick Clifton wrote:
> > Hi Carlos,
> >
> > Approved - please apply.
> >
> 
> May I have an account on sourceware for "binutils" cvs write
> access please?
> 
> I am not filling out the standard webform since I already 
> have a gcc.gnu.org account.

They'll handle adding a group via the standard form too, I think.
Anyway, I can approve it too; so go ahead and ask overseers
to add you to src.  Might as well use my timezone advantage :-)

-- 
Daniel Jacobowitz
CodeSourcery

^ permalink raw reply	[flat|nested] 20+ messages in thread

* Re: [PATCH] Fix binutils html target.
  2006-02-21  0:02   ` DJ Delorie
  2006-02-21 19:46     ` Nick Clifton
@ 2006-02-22  4:14     ` Carlos O'Donell
  2006-02-22 13:27       ` DJ Delorie
  1 sibling, 1 reply; 20+ messages in thread
From: Carlos O'Donell @ 2006-02-22  4:14 UTC (permalink / raw)
  To: DJ Delorie; +Cc: nickc, binutils

On Mon, Feb 20, 2006 at 04:43:37PM -0500, DJ Delorie wrote:
> 
> > Note however that these two directories are not part of the binutils
> > project so they cannot be approved here.  You should "Ask DJ Delorie
> > <dj@redhat.com> after reading the libiberty entry".
> 
> I'm not even sure how I got that onus, though.  Those directories (or
> at least their contents) are specific to the src/ repository.  I think
> anyone who is a global maintainer in any src/ project should be able
> to OK patches there, as the ChangeLogs seem to indicate these are the
> people doing it anyway.
> 
> >  > etc/
> >  > 2006-10-14  Carlos O'Donell  <carlos@codesourcery.com>
> >  >
> >  > 	* Makefile.in: TEXI2HTML uses makeinfo. Define
> >  > 	HTMLFILES. Add html targets.
> >  > 	* configure.texi: Use ifnottex. Add alternative
> >  > 	image format specifier as jpg.
> >  > 	* standards.texi: Use ifnottex.
> >  >

Ok.

> >  > intl/
> >  > 2006-10-14  Carlos O'Donell  <carlos@codesourcery.com>
> >  >
> >  > 	* intl/Makefile.in: Add html target.
> 
> Ok with me.

The canonical source of etc/ looks to be the src/ repository.
Is the canonical source of intl/ from gcc?

Cheers,
Carlos.
-- 
Carlos O'Donell
CodeSourcery
carlos@codesourcery.com
(650) 331-3385 x716

^ permalink raw reply	[flat|nested] 20+ messages in thread

* Re: [PATCH] Fix binutils html target.
  2006-02-22  4:14     ` Carlos O'Donell
@ 2006-02-22 13:27       ` DJ Delorie
  0 siblings, 0 replies; 20+ messages in thread
From: DJ Delorie @ 2006-02-22 13:27 UTC (permalink / raw)
  To: carlos; +Cc: nickc, binutils


> The canonical source of etc/ looks to be the src/ repository.

They're rarely changed, and just documentation, so keeping them in
sync manually shouldn't be a problem.  I don't think there's anything
formal in place.  Beware changing texi2pod.pl though, it's a script.

> Is the canonical source of intl/ from gcc?

I think they're vastly different, and not kept in sync.

^ permalink raw reply	[flat|nested] 20+ messages in thread

* Re: cvs write access request
  2006-02-22  1:03     ` Daniel Jacobowitz
@ 2006-02-23 15:32       ` Carlos O'Donell
  0 siblings, 0 replies; 20+ messages in thread
From: Carlos O'Donell @ 2006-02-23 15:32 UTC (permalink / raw)
  To: Daniel Jacobowitz; +Cc: Nick Clifton, binutils, Alan Modra

On Tue, Feb 21, 2006 at 06:06:31PM -0500, Daniel Jacobowitz wrote:
> On Tue, Feb 21, 2006 at 06:04:32PM -0500, Carlos O'Donell wrote:
> > On Mon, Feb 20, 2006 at 10:12:57AM +0000, Nick Clifton wrote:
> > > Hi Carlos,
> > >
> > > Approved - please apply.
> > >
> > 
> > May I have an account on sourceware for "binutils" cvs write
> > access please?
> > 
> > I am not filling out the standard webform since I already 
> > have a gcc.gnu.org account.
> 
> They'll handle adding a group via the standard form too, I think.
> Anyway, I can approve it too; so go ahead and ask overseers
> to add you to src.  Might as well use my timezone advantage :-)

It says in bold not to fill out the form twice :-)
Thanks Dan!

Cheers,
Carlos.
-- 
Carlos O'Donell
CodeSourcery
carlos@codesourcery.com
(650) 331-3385 x716

^ permalink raw reply	[flat|nested] 20+ messages in thread

* Re: [PATCH] Fix binutils html target.
  2006-02-21 20:23       ` DJ Delorie
@ 2006-02-28 12:50         ` Nick Clifton
  2006-02-28 18:51           ` Hans-Peter Nilsson
  2006-02-28 19:54           ` DJ Delorie
  0 siblings, 2 replies; 20+ messages in thread
From: Nick Clifton @ 2006-02-28 12:50 UTC (permalink / raw)
  To: DJ Delorie; +Cc: carlos, binutils

Hi DJ,

>>   config-ml.in; install-sh; makefile.vms; makefile.vms; missing;
>>   mkdep; setup.com; ylwrap; config/; etc/; intl/ utils/;
>>	Any global maintainer can approve changes to these files and
>>	directories.
> 
> 
> My toplevel sync scripts watch missing, ylwrap, and config/ though.
> 
> The whole list is: Makefile.tpl Makefile.def Makefile.in configure.in
>   configure config/ install-sh missing depcomp config.guess config.sub
>   compile ylwrap
> 
> Not that they actively sync those files, they just warn the build
> maintainers when they get out of sync with gcc.

Ok, so how about this:

  config-ml.in; makefile.vms; mkdep; setup.com;
   etc/; intl/; utils/;

     Any global maintainer can approve changes to these
     files and directories.

   Makefile.def; Makefile.in; Makefile.tpl; compile;
   config.guess; config.sub; configure; configure.in;
   depcomp; install-sh; missing; ylwrap;
   config/

     Any global maintainer can approve changes to these
     files and directories, but they should be aware
     that they need to be kept in sync with their
     counterparts in the gcc repository.

Cheers
   Nick

^ permalink raw reply	[flat|nested] 20+ messages in thread

* Re: [PATCH] Fix binutils html target.
  2006-02-28 12:50         ` Nick Clifton
@ 2006-02-28 18:51           ` Hans-Peter Nilsson
  2006-02-28 19:41             ` Nick Clifton
  2006-02-28 19:54           ` DJ Delorie
  1 sibling, 1 reply; 20+ messages in thread
From: Hans-Peter Nilsson @ 2006-02-28 18:51 UTC (permalink / raw)
  To: Nick Clifton; +Cc: DJ Delorie, carlos, binutils

On Tue, 28 Feb 2006, Nick Clifton wrote:
>    Makefile.def; Makefile.in; Makefile.tpl; compile;
>    config.guess; config.sub; configure; configure.in;
>    depcomp; install-sh; missing; ylwrap;
>    config/
>
>      Any global maintainer can approve changes to these
>      files and directories, but they should be aware
>      that they need to be kept in sync with their
>      counterparts in the gcc repository.

At least config.sub and config.guess is covered by other rules
in MAINTAINERS.  Delete them above or point out the
alternativeness of the rule?

brgds, H-P

^ permalink raw reply	[flat|nested] 20+ messages in thread

* Re: [PATCH] Fix binutils html target.
  2006-02-28 18:51           ` Hans-Peter Nilsson
@ 2006-02-28 19:41             ` Nick Clifton
  2006-03-01 23:54               ` Ben Elliston
  0 siblings, 1 reply; 20+ messages in thread
From: Nick Clifton @ 2006-02-28 19:41 UTC (permalink / raw)
  To: Hans-Peter Nilsson; +Cc: DJ Delorie, carlos, binutils

Hi Hans-Peter,

> On Tue, 28 Feb 2006, Nick Clifton wrote:
> 
>>   Makefile.def; Makefile.in; Makefile.tpl; compile;
>>   config.guess; config.sub; configure; configure.in;
>>   depcomp; install-sh; missing; ylwrap;
>>   config/
>>
>>     Any global maintainer can approve changes to these
>>     files and directories, but they should be aware
>>     that they need to be kept in sync with their
>>     counterparts in the gcc repository.
> 
> 
> At least config.sub and config.guess is covered by other rules
> in MAINTAINERS.  Delete them above or point out the
> alternativeness of the rule?

Doh!  I think delete them from my suggested change and leave the already 
existing entries for them in the MAINTAINERS file.

Cheers
   Nick


^ permalink raw reply	[flat|nested] 20+ messages in thread

* Re: [PATCH] Fix binutils html target.
  2006-02-28 12:50         ` Nick Clifton
  2006-02-28 18:51           ` Hans-Peter Nilsson
@ 2006-02-28 19:54           ` DJ Delorie
  1 sibling, 0 replies; 20+ messages in thread
From: DJ Delorie @ 2006-02-28 19:54 UTC (permalink / raw)
  To: nickc; +Cc: carlos, binutils


Looks good.  Thanks!

>   config-ml.in; makefile.vms; mkdep; setup.com;
>    etc/; intl/; utils/;
> 
>      Any global maintainer can approve changes to these
>      files and directories.
> 
>    Makefile.def; Makefile.in; Makefile.tpl; compile;
>    config.guess; config.sub; configure; configure.in;
>    depcomp; install-sh; missing; ylwrap;
>    config/
> 
>      Any global maintainer can approve changes to these
>      files and directories, but they should be aware
>      that they need to be kept in sync with their
>      counterparts in the gcc repository.

^ permalink raw reply	[flat|nested] 20+ messages in thread

* Re: [PATCH] Fix binutils html target.
  2006-02-28 19:41             ` Nick Clifton
@ 2006-03-01 23:54               ` Ben Elliston
  2006-03-02  0:40                 ` DJ Delorie
  0 siblings, 1 reply; 20+ messages in thread
From: Ben Elliston @ 2006-03-01 23:54 UTC (permalink / raw)
  To: Nick Clifton; +Cc: Hans-Peter Nilsson, DJ Delorie, carlos, binutils

> Doh!  I think delete them from my suggested change and leave the
> already existing entries for them in the MAINTAINERS file.

I think the preference is to bring changes to config.* in from the
masters.  That way we minimise the possibility of changes local being
overwritten by a future sync-up with the masters.

Cheers, Ben

^ permalink raw reply	[flat|nested] 20+ messages in thread

* Re: [PATCH] Fix binutils html target.
  2006-03-01 23:54               ` Ben Elliston
@ 2006-03-02  0:40                 ` DJ Delorie
  0 siblings, 0 replies; 20+ messages in thread
From: DJ Delorie @ 2006-03-02  0:40 UTC (permalink / raw)
  To: bje; +Cc: nickc, hp, carlos, binutils


> I think the preference is to bring changes to config.* in from the
> masters.  That way we minimise the possibility of changes local
> being overwritten by a future sync-up with the masters.

Yup.  My script doesn't *do* a merge, it just complains when the two
toplevels differ.

^ permalink raw reply	[flat|nested] 20+ messages in thread

end of thread, other threads:[~2006-03-02  0:40 UTC | newest]

Thread overview: 20+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2006-02-17  1:29 [PATCH] Fix binutils html target Carlos O'Donell
2006-02-17 12:47 ` Nick Clifton
2006-02-17 15:48   ` Joseph S. Myers
2006-02-18 18:08     ` Carlos O'Donell
2006-02-18  0:02 ` Dave Korn
2006-02-20 16:05 ` Nick Clifton
2006-02-21  0:02   ` DJ Delorie
2006-02-21 19:46     ` Nick Clifton
2006-02-21 20:23       ` DJ Delorie
2006-02-28 12:50         ` Nick Clifton
2006-02-28 18:51           ` Hans-Peter Nilsson
2006-02-28 19:41             ` Nick Clifton
2006-03-01 23:54               ` Ben Elliston
2006-03-02  0:40                 ` DJ Delorie
2006-02-28 19:54           ` DJ Delorie
2006-02-22  4:14     ` Carlos O'Donell
2006-02-22 13:27       ` DJ Delorie
2006-02-22  0:00   ` cvs write access request Carlos O'Donell
2006-02-22  1:03     ` Daniel Jacobowitz
2006-02-23 15:32       ` Carlos O'Donell

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).