Thread: docs toolchain appears broke?

docs toolchain appears broke?

From
Larry Rosenman
Date:
Was just trying to recreate my docs from CVS, using the same tools
I've been using for months, and got the following:

gmake -C sgml clean
gmake[1]: Entering directory `/home/ler/pg-dev/pgsql/doc/src/sgml'
rm -f catalog
rm -f HTML.manifest *.html
rm -rf *.1 *.l man1 manl manpage.refs manpage.links manpage.log
rm -f *.rtf *.tex *.dvi *.aux *.log *.ps *.pdf
gmake[1]: Leaving directory `/home/ler/pg-dev/pgsql/doc/src/sgml'
gmake -C sgml programmer.html
gmake[1]: Entering directory `/home/ler/pg-dev/pgsql/doc/src/sgml'
(echo "PUBLIC \"-//Norman Walsh//DOCUMENT DocBook HTML
Stylesheet//EN\"
\"/usr/local/share/sgml/docbook/dsssl/modular/html/docbook.dsl\""; \
echo "PUBLIC \"-//Norman Walsh//DOCUMENT DocBook Print
Stylesheet//EN\"
\"/usr/local/share/sgml/docbook/dsssl/modular/print/docbook.dsl\"") >
catalog
jade  -D . -D ./ref -D ./../graphics -d stylesheet.dsl -i output-html
-t sgml book-decl.sgml programmer.sgml
ln -sf programmer.html index.html
gmake[1]: Leaving directory `/home/ler/pg-dev/pgsql/doc/src/sgml'
cd sgml && tar -cf ../programmer.tar --exclude=Makefile
--exclude='*.sgml' --exclude=ref *.html -C `cd . && pwd`/graphics
catalogs.gif connections.gif
tar: can't add file catalogs.gif : No such file or directory
tar: can't add file connections.gif : No such file or directory
gmake: *** [programmer.tar] Error 1
gmake: *** Deleting file `programmer.tar'
$ 

this was after making a graphics directory.

Did someone forget to add some files to CVS?

LER


-- 
Larry Rosenman                     http://www.lerctr.org/~ler
Phone: +1 972-414-9812                 E-Mail: ler@lerctr.org
US Mail: 1905 Steamboat Springs Drive, Garland, TX 75044-6749


Re: docs toolchain appears broke?

From
Tom Lane
Date:
Larry Rosenman <ler@lerctr.org> writes:
> gmake[1]: Leaving directory `/home/ler/pg-dev/pgsql/doc/src/sgml'
> cd sgml && tar -cf ../programmer.tar --exclude=Makefile
> --exclude='*.sgml' --exclude=ref *.html -C `cd . && pwd`/graphics
> catalogs.gif connections.gif
> tar: can't add file catalogs.gif : No such file or directory
> tar: can't add file connections.gif : No such file or directory
> gmake: *** [programmer.tar] Error 1

Kinda looks like Ian broke the compile-in-source-dir case while
making the compile-in-separate-dir case work.  Tut tut.
        regards, tom lane


Re: docs toolchain appears broke?

From
Ian Lance Taylor
Date:
Tom Lane <tgl@sss.pgh.pa.us> writes:

> Larry Rosenman <ler@lerctr.org> writes:
> > gmake[1]: Leaving directory `/home/ler/pg-dev/pgsql/doc/src/sgml'
> > cd sgml && tar -cf ../programmer.tar --exclude=Makefile
> > --exclude='*.sgml' --exclude=ref *.html -C `cd . && pwd`/graphics
> > catalogs.gif connections.gif
> > tar: can't add file catalogs.gif : No such file or directory
> > tar: can't add file connections.gif : No such file or directory
> > gmake: *** [programmer.tar] Error 1
>
> Kinda looks like Ian broke the compile-in-source-dir case while
> making the compile-in-separate-dir case work.  Tut tut.

Yes.  My apologies.  This patch is one way to fix things.

Ian

Index: Makefile
===================================================================
RCS file: /home/projects/pgsql/cvsroot/pgsql/doc/src/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- Makefile    2001/03/25 08:32:24    1.17
+++ Makefile    2001/03/26 07:03:23
@@ -43,17 +43,20 @@
 programmer.tar:
     $(MAKE) -C sgml clean
     $(MAKE) -C sgml programmer.html
-    cd sgml && $(TAR) -cf ../$@ $(TAREXCLUDE) *.html -C `cd $(srcdir) && pwd`/graphics catalogs.gif connections.gif
+    abssrcdir=`cd $(srcdir) && pwd`; \
+    cd sgml && $(TAR) -cf ../$@ $(TAREXCLUDE) *.html -C $$abssrcdir/graphics catalogs.gif connections.gif

 tutorial.tar:
     $(MAKE) -C sgml clean
     $(MAKE) -C sgml tutorial.html
-    cd sgml && $(TAR) -cf ../$@ $(TAREXCLUDE) *.html -C `cd $(srcdir) && pwd`/graphics clientserver.gif
+    abssrcdir=`cd $(srcdir) && pwd`; \
+    cd sgml && $(TAR) -cf ../$@ $(TAREXCLUDE) *.html -C $$abssrcdir/graphics clientserver.gif

 postgres.tar:
     $(MAKE) -C sgml clean
     $(MAKE) -C sgml postgres.html
-    cd sgml && $(TAR) -cf ../$@ $(TAREXCLUDE) *.html -C `cd $(srcdir) && pwd`/graphics catalogs.gif clientserver.gif
connections.gif
+    abssrcdir=`cd $(srcdir) && pwd`; \
+    cd sgml && $(TAR) -cf ../$@ $(TAREXCLUDE) *.html -C $$abssrcdir/graphics catalogs.gif clientserver.gif
connections.gif

 man.tar:
     $(MAKE) -C sgml man

Re: docs toolchain appears broke?

From
Larry Rosenman
Date:
* Ian Lance Taylor <ian@airs.com> [010326 01:14]:
> Tom Lane <tgl@sss.pgh.pa.us> writes:
>
> > Larry Rosenman <ler@lerctr.org> writes:
> > > gmake[1]: Leaving directory `/home/ler/pg-dev/pgsql/doc/src/sgml'
> > > cd sgml && tar -cf ../programmer.tar --exclude=Makefile
> > > --exclude='*.sgml' --exclude=ref *.html -C `cd . && pwd`/graphics
> > > catalogs.gif connections.gif
> > > tar: can't add file catalogs.gif : No such file or directory
> > > tar: can't add file connections.gif : No such file or directory
> > > gmake: *** [programmer.tar] Error 1
> >
> > Kinda looks like Ian broke the compile-in-source-dir case while
> > making the compile-in-separate-dir case work.  Tut tut.
>
> Yes.  My apologies.  This patch is one way to fix things.
>
This patch seems to work.  Thanks.

LER

--
Larry Rosenman                     http://www.lerctr.org/~ler
Phone: +1 972-414-9812                 E-Mail: ler@lerctr.org
US Mail: 1905 Steamboat Springs Drive, Garland, TX 75044-6749

Re: docs toolchain appears broke?

From
Larry Rosenman
Date:
Can Ian's patch be committed, please?

Thanks.
LER


>>>>>>>>>>>>>>>>>> Original Message <<<<<<<<<<<<<<<<<<

On 3/26/01, 5:13:39 AM, Larry Rosenman <ler@lerctr.org> wrote regarding Re:
[HACKERS] docs toolchain appears broke?:


> * Ian Lance Taylor <ian@airs.com> [010326 01:14]:
> > Tom Lane <tgl@sss.pgh.pa.us> writes:
> >
> > > Larry Rosenman <ler@lerctr.org> writes:
> > > > gmake[1]: Leaving directory `/home/ler/pg-dev/pgsql/doc/src/sgml'
> > > > cd sgml && tar -cf ../programmer.tar --exclude=Makefile
> > > > --exclude='*.sgml' --exclude=ref *.html -C `cd . && pwd`/graphics
> > > > catalogs.gif connections.gif
> > > > tar: can't add file catalogs.gif : No such file or directory
> > > > tar: can't add file connections.gif : No such file or directory
> > > > gmake: *** [programmer.tar] Error 1
> > >
> > > Kinda looks like Ian broke the compile-in-source-dir case while
> > > making the compile-in-separate-dir case work.  Tut tut.
> >
> > Yes.  My apologies.  This patch is one way to fix things.
> >
> This patch seems to work.  Thanks.

> LER

> --
> Larry Rosenman                     http://www.lerctr.org/~ler
> Phone: +1 972-414-9812                 E-Mail: ler@lerctr.org
> US Mail: 1905 Steamboat Springs Drive, Garland, TX 75044-6749

> ---------------------------(end of broadcast)---------------------------
> TIP 5: Have you checked our extensive FAQ?

> http://www.postgresql.org/users-lounge/docs/faq.html

Re: docs toolchain appears broke?

From
Bruce Momjian
Date:
I still have it.  I am waiting for someone to comment on it.  Seems you
are the one to comment.  Applying now.


[ Charset ISO-8859-1 unsupported, converting... ]
> Can Ian's patch be committed, please?
>
> Thanks.
> LER
>
>
> >>>>>>>>>>>>>>>>>> Original Message <<<<<<<<<<<<<<<<<<
>
> On 3/26/01, 5:13:39 AM, Larry Rosenman <ler@lerctr.org> wrote regarding Re:
> [HACKERS] docs toolchain appears broke?:
>
>
> > * Ian Lance Taylor <ian@airs.com> [010326 01:14]:
> > > Tom Lane <tgl@sss.pgh.pa.us> writes:
> > >
> > > > Larry Rosenman <ler@lerctr.org> writes:
> > > > > gmake[1]: Leaving directory `/home/ler/pg-dev/pgsql/doc/src/sgml'
> > > > > cd sgml && tar -cf ../programmer.tar --exclude=Makefile
> > > > > --exclude='*.sgml' --exclude=ref *.html -C `cd . && pwd`/graphics
> > > > > catalogs.gif connections.gif
> > > > > tar: can't add file catalogs.gif : No such file or directory
> > > > > tar: can't add file connections.gif : No such file or directory
> > > > > gmake: *** [programmer.tar] Error 1
> > > >
> > > > Kinda looks like Ian broke the compile-in-source-dir case while
> > > > making the compile-in-separate-dir case work.  Tut tut.
> > >
> > > Yes.  My apologies.  This patch is one way to fix things.
> > >
> > This patch seems to work.  Thanks.
>
> > LER
>
> > --
> > Larry Rosenman                     http://www.lerctr.org/~ler
> > Phone: +1 972-414-9812                 E-Mail: ler@lerctr.org
> > US Mail: 1905 Steamboat Springs Drive, Garland, TX 75044-6749
>
> > ---------------------------(end of broadcast)---------------------------
> > TIP 5: Have you checked our extensive FAQ?
>
> > http://www.postgresql.org/users-lounge/docs/faq.html
>
> ---------------------------(end of broadcast)---------------------------
> TIP 4: Don't 'kill -9' the postmaster
>


--
  Bruce Momjian                        |  http://candle.pha.pa.us
  pgman@candle.pha.pa.us               |  (610) 853-3000
  +  If your life is a hard drive,     |  830 Blythe Avenue
  +  Christ can be your backup.        |  Drexel Hill, Pennsylvania 19026

Re: docs toolchain appears broke?

From
Bruce Momjian
Date:
Applied.  Thanks.

> Tom Lane <tgl@sss.pgh.pa.us> writes:
>
> > Larry Rosenman <ler@lerctr.org> writes:
> > > gmake[1]: Leaving directory `/home/ler/pg-dev/pgsql/doc/src/sgml'
> > > cd sgml && tar -cf ../programmer.tar --exclude=Makefile
> > > --exclude='*.sgml' --exclude=ref *.html -C `cd . && pwd`/graphics
> > > catalogs.gif connections.gif
> > > tar: can't add file catalogs.gif : No such file or directory
> > > tar: can't add file connections.gif : No such file or directory
> > > gmake: *** [programmer.tar] Error 1
> >
> > Kinda looks like Ian broke the compile-in-source-dir case while
> > making the compile-in-separate-dir case work.  Tut tut.
>
> Yes.  My apologies.  This patch is one way to fix things.
>
> Ian
>
> Index: Makefile
> ===================================================================
> RCS file: /home/projects/pgsql/cvsroot/pgsql/doc/src/Makefile,v
> retrieving revision 1.17
> diff -u -r1.17 Makefile
> --- Makefile    2001/03/25 08:32:24    1.17
> +++ Makefile    2001/03/26 07:03:23
> @@ -43,17 +43,20 @@
>  programmer.tar:
>      $(MAKE) -C sgml clean
>      $(MAKE) -C sgml programmer.html
> -    cd sgml && $(TAR) -cf ../$@ $(TAREXCLUDE) *.html -C `cd $(srcdir) && pwd`/graphics catalogs.gif connections.gif
> +    abssrcdir=`cd $(srcdir) && pwd`; \
> +    cd sgml && $(TAR) -cf ../$@ $(TAREXCLUDE) *.html -C $$abssrcdir/graphics catalogs.gif connections.gif
>
>  tutorial.tar:
>      $(MAKE) -C sgml clean
>      $(MAKE) -C sgml tutorial.html
> -    cd sgml && $(TAR) -cf ../$@ $(TAREXCLUDE) *.html -C `cd $(srcdir) && pwd`/graphics clientserver.gif
> +    abssrcdir=`cd $(srcdir) && pwd`; \
> +    cd sgml && $(TAR) -cf ../$@ $(TAREXCLUDE) *.html -C $$abssrcdir/graphics clientserver.gif
>
>  postgres.tar:
>      $(MAKE) -C sgml clean
>      $(MAKE) -C sgml postgres.html
> -    cd sgml && $(TAR) -cf ../$@ $(TAREXCLUDE) *.html -C `cd $(srcdir) && pwd`/graphics catalogs.gif clientserver.gif
connections.gif
> +    abssrcdir=`cd $(srcdir) && pwd`; \
> +    cd sgml && $(TAR) -cf ../$@ $(TAREXCLUDE) *.html -C $$abssrcdir/graphics catalogs.gif clientserver.gif
connections.gif
>
>  man.tar:
>      $(MAKE) -C sgml man
>
> ---------------------------(end of broadcast)---------------------------
> TIP 6: Have you searched our list archives?
>
> http://www.postgresql.org/search.mpl
>


--
  Bruce Momjian                        |  http://candle.pha.pa.us
  pgman@candle.pha.pa.us               |  (610) 853-3000
  +  If your life is a hard drive,     |  830 Blythe Avenue
  +  Christ can be your backup.        |  Drexel Hill, Pennsylvania 19026

Re: docs toolchain appears broke?

From
Tom Lane
Date:
Bruce Momjian <pgman@candle.pha.pa.us> writes:
> I still have it.  I am waiting for someone to comment on it.  Seems you
> are the one to comment.  Applying now.

I was waiting for Peter E. to comment ...

            regards, tom lane

Re: docs toolchain appears broke?

From
Bruce Momjian
Date:
> Bruce Momjian <pgman@candle.pha.pa.us> writes:
> > I still have it.  I am waiting for someone to comment on it.  Seems you
> > are the one to comment.  Applying now.
>
> I was waiting for Peter E. to comment ...

Yea, me too.

--
  Bruce Momjian                        |  http://candle.pha.pa.us
  pgman@candle.pha.pa.us               |  (610) 853-3000
  +  If your life is a hard drive,     |  830 Blythe Avenue
  +  Christ can be your backup.        |  Drexel Hill, Pennsylvania 19026