Changeset 401 in MondoRescue for branches/stable/tools

Timestamp:

Feb 17, 2006, 3:37:04 PM (19 years ago)

Author:

bcornec

Message:

• Integrate some SuSE patches and spec tips
• all the doc is now under documentation (man pages, pdf, generated doc)
• delivery process adapted consequently

Location:

branches/stable/tools

Files:

• livwww (modified) (3 diffs)
• mkcommon (modified) (1 diff)

branches/stable/tools/livwww

@@ -9 +9 @@
 #
 LOCALDIR=/var/www/html/mondo
+LOCALDOC=/var/www/html/mondo-doc
 DESTUSER=apache
 MONDODIR=/mondo/www/html/mondo
 TESTDIR=/mondo/www/html/test
+
+force=0
+
+if [ "$1" = "-f" ]; then
+        force=1
+        shift
+fi
 
 /sbin/ifconfig | grep -q 10.3 2>&1 > /dev/null
@@ -30 +38 @@
 . $TOOLHOME/common-env
 
+cd ${BASE}/svn
+
 rm -rf $LOCALDIR
-cp -a ${BASE}/svn/${VER}/website $LOCALDIR
-(cd ${BASE}/svn/${VER}/documentation ; make)
-mkdir -p $LOCALDIR/docs
-cp -a ${BASE}/svn/${VER}/documentation/* $LOCALDIR/docs
+svn export ${VER}/website $LOCALDIR
+
+rm -rf $LOCALDOC
+svn export ${VER}/documentation $LOCALDOC
+cd $LOCALDOC
+make -f Makefile.howto
+make -f Makefile.man
+mv $LOCALDOC $LOCALDIR/docs
 #
 # Man pages corrections
@@ -41 +55 @@
 perl -pi -e 's~<A HREF[=./A-z0-9"]*/man1/[^<]*>([A-z0-9]*)</A>~$1~g' $LOCALDIR/docs/*.8.html
 perl -pi -e 's~/index.html~/index.shtml~' $LOCALDIR/docs/*.8.html 
+#
+# Version handling
+#
+perl -pi -e "s~VVV-rRRR~${VER}-r${REVISION}~g" $LOCALDIR/head.shtml
+
 find $LOCALDIR -type d | xargs chmod 755
 find $LOCALDIR -type f | xargs chmod 644

branches/stable/tools/mkcommon

@@ -52 +52 @@
     svn export ${VER}/documentation documentation-${MONDO_VER}
     cd documentation-${MONDO_VER}
-    make install INSTALLDIR=../mondo-${MONDO_VER}/mondo/docs/en
+    make -f Makefile.howto install INSTALLDIR=../mondo-${MONDO_VER}/mondo/docs/en
+    make -f Makefile.man install-mindi INSTALLDIR=../mindi-${MINDI_VER}
+    make -f Makefile.man install-mondo INSTALLDIR=../mondo-${MONDO_VER}/docs/man
     if [ $? != 0 ]; then
         exit -1