[Lunar-commits] CVS: moonbase/doc-tools/docbook-dsssl BUILD, 1.2, 1.3 Makefile, 1.5, 1.6 POST_INSTALL, 1.7, 1.8 PRE_REMOVE, 1.6, 1.7

[Moritz Heiber]

Update of /var/cvs/lunar/moonbase/doc-tools/docbook-dsssl
In directory espresso.foo-projects.org:/tmp/cvs-serv13315/docbook-dsssl

Modified Files:
	BUILD Makefile POST_INSTALL PRE_REMOVE 
Log Message:
Well, what can I say. I've been working on this for 10 hours straight
(Yes, ten hours). I just couldn't stand how broken docbook* was.

Everything is now updatable independently, there is nothing left behind
in any global configuration file. I also updated a couple of those modules
as they really deserved it.

Scheme change:

docbook-3.1 replaces any docbook-3.x module
docbook-sgml replaces any docbook-4.x module

iso832943-whatever was deprecated.
The /etc/xml/catalog rebuild is now done by a dynamic file fetched from
docbook.org (yeah, I know Nick, you modified it to fit in with Lunar ..
unfortunately you didn't catch up).

sgml-common has been sanitized.

Tested with gcc 3.3.3, 2.6.x and scrollkeeper, docbook-utils, glade2, gtk-doc
and a hell lot of others I probably forgot. Enjoy.

Oh and .. bow before your god.
(j/k)

PS: Thanks to the folks at BLFS .. without them I would have been clueless
(occasionally)


Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/doc-tools/docbook-dsssl/BUILD,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- BUILD	1 Aug 2003 13:42:32 -0000	1.2
+++ BUILD	16 Feb 2005 02:19:58 -0000	1.3
@@ -1,4 +1,10 @@
 (
+  # We need to remove the old catalog entries
+  if module_is_expired $MODULE ; then
+        set_module_config OLD_VER "`installed_version $MODULE`"
+  fi &&
+
+  prepare_install				   &&
   mkdir -p /usr/share/sgml/dsssl                   &&
   cp $SCRIPT_DIRECTORY/Makefile $SOURCE_DIRECTORY  &&
   default_make                                     

Index: Makefile
===================================================================
RCS file: /var/cvs/lunar/moonbase/doc-tools/docbook-dsssl/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile	7 Nov 2004 16:12:41 -0000	1.5
+++ Makefile	16 Feb 2005 02:19:58 -0000	1.6
@@ -5,24 +5,6 @@
 
 install:
 	mkdir -p $(BINDIR)
-	mkdir -p $(DESTDIR)/dtds/decls
-	mkdir -p $(DESTDIR)/lib
-	mkdir -p $(DESTDIR)/common
-	mkdir -p $(DESTDIR)/frames
-	mkdir -p $(DESTDIR)/olink
-	mkdir -p $(DESTDIR)/html
-	mkdir -p $(DESTDIR)/print
-	mkdir -p $(DESTDIR)/images
-	install bin/collateindex.pl $(BINDIR)
-	cp catalog $(DESTDIR)
-	cp VERSION $(DESTDIR)
-	cp dtds/decls/docbook.dcl $(DESTDIR)/dtds/decls
-	cp lib/dblib.dsl $(DESTDIR)/lib
-	cp common/*.dsl $(DESTDIR)/common
-	cp common/*.ent $(DESTDIR)/common
-	cp frames/* $(DESTDIR)/frames
-	cp olink/*.dsl $(DESTDIR)/olink
-	cp html/*.dsl $(DESTDIR)/html
-	cp lib/*.dsl $(DESTDIR)/lib
-	cp print/*.dsl $(DESTDIR)/print
-	cp images/*.gif $(DESTDIR)/images
+	mkdir -p $(DESTDIR)
+	install -m755 bin/collateindex.pl $(BINDIR)
+	cp -a ./* $(DESTDIR)	

Index: POST_INSTALL
===================================================================
RCS file: /var/cvs/lunar/moonbase/doc-tools/docbook-dsssl/POST_INSTALL,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- POST_INSTALL	10 Sep 2003 18:47:35 -0000	1.7
+++ POST_INSTALL	16 Feb 2005 02:19:58 -0000	1.8
@@ -1,12 +1,18 @@
-centralized="/etc/sgml/catalog"
-VER=$VERSION
-if ! [ -e "$centralized" ]; then
-     echo "Creating $centralized!"
-     touch $centralized
+OLD_VER=`get_module_config OLD_VER`
+CENTRALIZED=/etc/sgml/catalog 
+CATALOGDIR=/usr/share/sgml/dsssl/dsssl-stylesheets-$VERSION
+CATALOGDIR_OLD=/usr/share/sgml/dsssl/dsssl-stylesheets-$OLD_VER
+
+if [ ! -z $OLD_VER ]; then
+  install-catalog --remove $CENTRALIZED $CATALOGDIR_OLD/catalog
 fi
 
-install-catalog --add $centralized /usr/share/sgml/dsssl/dsssl-stylesheets-$VER/catalog
-install-catalog -r $centralized /etc/sgml/catalog
+install-catalog --remove $CENTRALIZED $CATALOGDIR/catalog
 
-cp $SOURCE_CACHE/$SOURCE2 /usr/share/sgml/dsssl/dsssl-stylesheets-$VER/html
-cp $SOURCE_CACHE/$SOURCE2 /usr/share/sgml/dsssl/dsssl-stylesheets-$VER/print
+install-catalog --add $CENTRALIZED $CATALOGDIR/catalog
+install-catalog --remove $CENTRALIZED $CENTRALIZED
+
+cp $SOURCE_CACHE/$SOURCE2 $CATALOGDIR/html
+cp $SOURCE_CACHE/$SOURCE2 $CATALOGDIR/print
+
+unset_module_config OLD_VER

Index: PRE_REMOVE
===================================================================
RCS file: /var/cvs/lunar/moonbase/doc-tools/docbook-dsssl/PRE_REMOVE,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- PRE_REMOVE	9 Sep 2003 01:52:17 -0000	1.6
+++ PRE_REMOVE	16 Feb 2005 02:19:58 -0000	1.7
@@ -1,5 +1,6 @@
-centralized="/etc/sgml/catalog"
-VER=$VERSION
-install-catalog -r $centralized /usr/share/sgml/docbook/dsssl-stylesheets-$VER/catalog
-install-catalog -r $centralized /usr/share/sgml/dsssl/dsssl-stylesheets-$VER/catalog
-install-catalog -r $centralized /usr/share/sgml/dsssl/catalog
+CENTRALIZED="/etc/sgml/catalog"
+CATALOGDIR="/usr/share/sgml/dsssl/dsssl-stylesheets-$VERSION"
+
+install-catalog --remove $CENTRALIZED $CATALOGDIR/catalog
+
+rm -rf $CATALOGDIR