Changeset 882 in MondoRescue for branches/stable/tools/svn2build

Timestamp:

Oct 8, 2006, 11:48:30 AM (18 years ago)

Author:

Bruno Cornec

Message:

• Build process reviewed to fix again bug #79
• MONDOTMP now used uniformaly across all scripts
• mandriva has its own set of variables
• svn2build should now generate directories in the right place

File:

• branches/stable/tools/svn2build (modified) (7 diffs)

branches/stable/tools/svn2build

@@ -38 +38 @@
     v=`cat ${TOOLHOME}/../$p/VERSION`
     echo "Management of $p $v-$TAG (rev $REVISION)"
-    dest="$p-$v"
+    dest="$DEST/$p-$v"
     rm -fr $dest
     svn export ${TOOLHOME}/../$p $dest
@@ -51 +51 @@
         . $TOOLHOME/distro-env
 
-        # Create conf file dir
-        mkdir -p ${BUILDDIR}
-
         ddd=`LANG=C ; date '+%Y-%m-%d'`
-        cat > $TMP/mondorescue.mc << EOF
+        cat > $MONDOTMP/mondorescue.mc << EOF
 define(\`TTT', ${TAG})dnl
 define(\`RRR', ${TAG}${suf})dnl
@@ -74 +71 @@
             echo "Using $inc customization to build SPEC file"
 
-            $TOOLHOME/mkchangelog.pl $dtype $p $TMP/$p.spec
+            $TOOLHOME/mkchangelog.pl $dtype $p $MONDOTMP/$p.spec
             if [ $? -ne 0 ]; then
                 echo "Unable to create changelog for ${ddir}-$dver/$p.spec"
                 exit -1
             fi
-            m4 $TMP/mondorescue.mc $inc $dest/distributions/rpm/$p.spec $TMP/$p.spec > $dest/distributions/${ddir}-$dver/$p.spec
+            m4 $MONDOTMP/mondorescue.mc $inc $dest/distributions/rpm/$p.spec $MONDOTMP/$p.spec > $dest/distributions/${ddir}-$dver/$p.spec
 
-            rm -f $TMP/$p.spec
+            rm -f $MONDOTMP/$p.spec
         elif [ "$dtype" = "ebuild" ]; then
-            m4 $TMP/mondorescue.mc $dest/distributions/$dfam/$p.ebuild > $dest/distributions/${ddir}-$dver/$p-$v.ebuild
+            m4 $MONDOTMP/mondorescue.mc $dest/distributions/$dfam/$p.ebuild > $dest/distributions/${ddir}-$dver/$p-$v.ebuild
         elif [ "$dtype" = "deb" ]; then
-            # To be developped
-            #m4 $TMP/mondorescue.mc $dest/distributions/$dfam/$p > /dev/null
             cp -a $dest/distributions/$ddir/* $dest/distributions/${ddir}-$dver
-            m4 $TMP/mondorescue.mc $dest/distributions/$ddir/rules > $dest/distributions/${ddir}-$dver/rules
+            m4 $MONDOTMP/mondorescue.mc $dest/distributions/$ddir/rules > $dest/distributions/${ddir}-$dver/rules
             $TOOLHOME/mkchangelog.pl $dtype $p $dest/distributions/${ddir}-$dver/changelog
             if [ $? -ne 0 ]; then
@@ -99 +94 @@
     done
 
+    # The rest is done there
+    cd $DEST
     if [ _"`echo $p | grep mondo-doc`" != _"" ]; then
         cd $dest
         for f in mondorescue-howto.sgml *8; do
-            m4 $TMP/mondorescue.mc $f > ${f}.new
+            m4 $MONDOTMP/mondorescue.mc $f > ${f}.new
             mv ${f}.new $f
         done
@@ -122 +119 @@
             exit -1
         fi
-        (cd mondo-doc-$v1 ; make -f Makefile.man install-$p INSTALLDIR=../$dest)
+        (cd mondo-doc-$v1 ; make -f Makefile.man install-$p INSTALLDIR=../$p-$v)
         rm -f $dest/rootfs/sbin/parted2fdisk-ia64 
     fi
@@ -131 +128 @@
             exit -1
         fi
-        (cd mondo-doc-$v1 ; make -f Makefile.howto install INSTALLDIR=../$dest/docs/en ; make -f Makefile.man install-$p INSTALLDIR=../$dest/docs/man)
+        (cd mondo-doc-$v1 ; make -f Makefile.howto install INSTALLDIR=../$p-$v/docs/en ; make -f Makefile.man install-$p INSTALLDIR=../$p-$v/docs/man)
         (cd $dest ; echo "Bootstraping mondo ... " ; ./bootstrap)
     fi
@@ -137 +134 @@
     # Finally creates the tar files
     echo -n "Creating $p tar files (gzip... "
-    tar cfphz ${DEST}/$p-$v.tar.gz $dest
+    tar cfphz ${DEST}/$p-$v.tar.gz $p-$v
     echo -n " bzip2..."
-    tar cfphj ${DEST}/$p-$v.tar.bz2 $dest
+    tar cfphj ${DEST}/$p-$v.tar.bz2 $p-$v
     echo " )"
 done
 
-rm -rf $TMP
+rm -rf $MONDOTMP
 
 echo "Version delivered :"