Changeset 3093

Timestamp:

10/11/11 00:29:32 (20 months ago)

Author:

azerttyu

Message:

Correction sur la compilation des paquets

• On compile en utilisant chroot_run

File:

• alternc/trunk/nightlybuild/mchroot.sh (modified) (5 diffs)

alternc/trunk/nightlybuild/mchroot.sh

@@ -1 +1 @@
 #! /bin/bash
 
-CHROOT_DIR="/root/chroot"
-BUILD_AREA="/root/build-area"
-SRC_DIR="/root/src"
+#Les systeme à compiler
+CHROOT_DIR="/root/compilation/chroot"
+#repertoire cible des compilations
+BUILD_AREA="/root/compilation/build-area"
+#le repertoire contenant les sources
+SRC_DIR="/root/vcs"
 
-SOURCES[0]='svn https://www.alternc.org/svn/ /home/root/test/'
-#SOURCES[1]='vcs url_ressource target_directory'
+SOURCES[0]='svn https://www.alternc.org/svn/ /root/vcs/'
+#SOURCES[1]='vcs url_ressource target_directory_in_chroot'
 
 function get_sources() {
@@ -39 +42 @@
                 -d $DIR \
 #               -- "${COMMAND}"
-
-
 }
 
@@ -53 +54 @@
                 arch=$(echo $dir | sed 's/.*-//' )
 
-#               if [[ $dist != 'squeeze' ]]; then
-#                       continue
-#               fi
-        
+
                 #Ouvrir un chroot
                 SCHROOT_SESSION=$(schroot -b -c $dir)
@@ -74 +72 @@
 
                 #Trouver les paquets
-                for paquet in $(find /root/src/alternc-all/ -ipath \*/debian -printf %h\\n); do
-                        SVN_DIR=$paquet
+                for paquet in $(find $CHROOT_SRC -ipath \*/debian -printf %h\\n); do
+                        SVN_DIR=${paquet#$CHROOT_SRC}
                         STATUT=$(basename $SVN_DIR)
+
+                        chroot_run $SCHROOT_SESSION "svn revert ./ -R" $SRC_DIR/$SVN_DIR
+
 
                         if [[ $STATUT != "trunk" ]]; then
                                 STATUT=$(basename $(dirname $SVN_DIR))
                         else
-                                echo "dch -l \"`date +%Y-%m-%d`\" nightly" | \
-                                schroot \
-                                        -r \
-                                        --chroot $SCHROOT_SESSION \
-                                        -d $SVN_DIR \
-                                        -p
+                                version=( `schroot -p -r --chroot $SCHROOT_SESSION -d $SRC_DIR/$SVN_DIR -- egrep -o '\(.*\)' -m 1 debian/changelog | sed 's/(//'|sed s'/)//'` )
+                                chroot_run $SCHROOT_SESSION "dch -v ${version}.1~`date +%Y-%m-%d` nightly" $SRC_DIR/$SVN_DIR
+                                #echo "dch -l \"`date +%Y-%m-%d`\" nightly" | \
                         fi
-
-                        continue
 
                         #Construire le package                          
                         echo $STATUT
-                        mkdir -p $CHROOT_BUILD_AREA/$STATUT
-
-                        echo "svn-buildpackage -us -uc -rfakeroot --svn-move-to=$BUILD_AREA/$STATUT" | \
-                        schroot \
-                                -r \
-                                --chroot $SCHROOT_SESSION \
-                                -d $SVN_DIR \
-                                -p
-
-                        echo "svn revert * -R" | \
-                        schroot \
-                                -r \
-                                --chroot $SCHROOT_SESSION \
-                                -d $SVN_DIR \
-                                -p
-
-                        
-
+                        mkdir -p /build-area/$STATUT
+                        chroot_run $SCHROOT_SESSION "svn-buildpackage -us -uc -rfakeroot --svn-move-to='/build-area/$STATUT'" $SRC_DIR/$SVN_DIR
+                        exit
+                        chroot_run $SCHROOT_SESSION "svn revert ./ -R" $SRC_DIR/$SVN_DIR
                 done
 
@@ -123 +105 @@
 
         #Nettoyer les build-area dans les sources
-        find $SRC_DIR -iname build-area -exec rm -r {} \;
+#       find $SRC_DIR -iname build-area -exec rm -r {} \;
 }