Changeset 872 in MondoRescue for branches/stable

Timestamp:

Oct 4, 2006, 3:08:01 PM (18 years ago)

Author:

Bruno Cornec

Message:

Fix bug #79 by removing use of SVNBRANCH and BASE variable in build process
WARNING: the build process doesn't allow anymore to use the script of one version for building another version

Location:

branches/stable

Files:

• mindi/deplist.txt (modified) (1 diff)
• tools/common-env (modified) (1 diff)
• tools/distro-env (modified) (1 diff)
• tools/livwww (modified) (3 diffs)
• tools/svn-env (modified) (1 diff)
• tools/svn2build (modified) (3 diffs)

branches/stable/mindi/deplist.txt

@@ -39 +39 @@
 devfsd burnBX burnK6 burnK7 burnMMX burnP5 burnP6 lucifer tiobench tiotest bonnie++ mprime ide-smart
 
+# For Debug  mode
+# gdb
+
 #----------------- For all you LVM users out there, much love -----------------
 LVMFILES:

branches/stable/tools/common-env

@@ -7 +7 @@
 
 # Adapt to your needs
-export BASE=${HOME}/mondo
-export TOPDIR=${BASE}/build
+d=`dirname ${TOOLHOME}`
+if [ _"`basename ${d}/..`" = _"trunk" ]; then
+    BASE=${TOOLHOME}/../..
+else
+    BASE=${TOOLHOME}/../../..
+fi
+export TOPDIR=${BASE}/delivery
 mkdir -p ${TOPDIR}
 export TMPDIR=/tmp

branches/stable/tools/distro-env

@@ -117 +117 @@
 # Additional exports and preparation for some distros
 #
+
+# Default
+export TOPBUILDDIR=${TOPDIR}/../build
+
 if [ _"$dtype" = _"rpm" ]; then
     export ARCH=`rpm --showrc | egrep "^build arch" | awk '{print $4}'`
     if [ -f ${HOME}/.rpmmacros ]; then
         export TOPBUILDDIR=`egrep '^%_topdir' ${HOME}/.rpmmacros | awk '{print $2}'`
-    else
-        export TOPBUILDDIR=${BASE}/build
     fi
     mkdir -p ${TOPBUILDDIR}/{RPMS,SRPMS,SPECS,SOURCES,BUILD}
 elif [ _"$dtype" = _"deb" ]; then
-    export TOPBUILDDIR=${BASE}/build
     mkdir -p ${TOPBUILDDIR}
 elif [ _"$dtype" = _"ebuild" ]; then
-    export TOPBUILDDIR=${BASE}/build
     mkdir -p ${TOPBUILDDIR}/portage
 fi

branches/stable/tools/livwww

@@ -49 +49 @@
 . $TOOLHOME/svn-env
 
-cd ${BASE}/svn
+# To be safe for SVN commands
+cd ${TOOLHOME}/..
 
 if [ $force -eq 1 ]; then
@@ -56 +57 @@
 fi
 
-svn export $optsvn ${SVNBRANCH}/website $LOCALDIR
+svn export $optsvn ${TOOLHOME}/../website $LOCALDIR
 
 if [ $force -eq 1 ]; then
@@ -63 +64 @@
 fi
 
-svn export $optsvn ${SVNBRANCH}/mondo-doc $LOCALDOC
+svn export $optsvn ${TOOLHOME}/../mondo-doc $LOCALDOC
 
 #

branches/stable/tools/svn-env

@@ -6 +6 @@
 #
 
-export SVNBRANCH="branches/`cat ${TOOLHOME}/../mondo/VERSION`"
-export VER=`cat ${BASE}/svn/${SVNBRANCH}/mondo/VERSION`
+export VER=`cat ${TOOLHOME}/../mondo/VERSION`
 
 # To be safe for SVN commands

branches/stable/tools/svn2build

@@ -33 +33 @@
 
 # Make it safe for SVN commands
-cd ${BASE}/svn
+cd ${TOOLHOME}/..
 
 for p in $c; do
-    v=`cat ${SVNBRANCH}/$p/VERSION`
+    v=`cat ${TOOLHOME}/../$p/VERSION`
     echo "Management of $p $v-$TAG (rev $REVISION)"
     dest="$p-$v"
     rm -fr $dest
-    svn export ${SVNBRANCH}/$p $dest
+    svn export ${TOOLHOME}/../$p $dest
     echo "$REVISION" > $dest/REVISION
     echo "Generating SVN log file ..."
-    svn log -v ${SVNBRANCH}/$p > $dest/svn.log
+    svn log -v ${TOOLHOME}/../$p > $dest/svn.log
 
     for d in `cat ${TOOLHOME}/DISTROS`; do
@@ -117 +117 @@
 
     if [ _"`echo $p | grep -vE 'kernel|busybox' | grep mindi`" != _"" ]; then
-        v1=`cat ${SVNBRANCH}/mondo-doc/VERSION`
+        v1=`cat ${TOOLHOME}/../mondo-doc/VERSION`
         if [ ! -d mondo-doc-$v1 ]; then
             echo "mondo-doc should be created before $p"
@@ -126 +126 @@
     fi
     if [ "`echo $p | grep -v doc | grep  mondo`" != "" ]; then
-        v1=`cat ${SVNBRANCH}/mondo-doc/VERSION`
+        v1=`cat ${TOOLHOME}/../mondo-doc/VERSION`
         if [ ! -d mondo-doc-$v1 ]; then
             echo "mondo-doc should be created before $p"