X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=id-deb-build%2Fid-pbuild.sh;h=51cb8e0164beba1ede7bb558bc41b2d0777f84fe;hb=9ff30a5385c71b11235c920bfca597ea40a338ff;hp=656b37475e23a608cc079745faceb1b557215b05;hpb=59853e1a8164b9fab87c694f63076796849da3ac;p=git-tools-moved-to-github.git

diff --git a/id-deb-build/id-pbuild.sh b/id-deb-build/id-pbuild.sh
index 656b374..51cb8e0 100755
--- a/id-deb-build/id-pbuild.sh
+++ b/id-deb-build/id-pbuild.sh
@@ -10,6 +10,7 @@ Usage: id-pbuild.sh [OPTIONS]
 Options:
 	[--debian=distros]
 	[--ubuntu=distros]
+	[--centos=distros]
 	[--upload]
 	[--concurrency=N]
 	[--product=X]
@@ -21,6 +22,7 @@ EOF
 upload=false
 do_help=false
 concurrency=4
+ARCHS="i386 amd64"
 
 if test -f IDMETA; then
     . ./IDMETA
@@ -38,6 +40,9 @@ while test $# -gt 0; do
 	--ubuntu=*)
 	    UBUNTU_DIST=$optarg
 	    ;;
+	--centos=*)
+	    CENTOS_DIST=$optarg
+	    ;;
         --upload)
 	    upload=true
 	    ;;
@@ -108,7 +113,6 @@ fi
 if test -z "$PRODUCT"; then
     PRODUCT=`echo *.dsc|sed 's/_.*//g'`
 fi
-ARCHS="i386 amd64"
 if grep "Architecture: all" $PKG >/dev/null; then
     USE_ARCHS=i386
 else
@@ -117,6 +121,7 @@ fi
 echo "Dsc $PKG . Product $PRODUCT"
 echo "Ubuntu distros: $UBUNTU_DIST"
 echo "Debian distros: $DEBIAN_DIST"
+echo "Centos distros: $CENTOS_DIST"
 if test "${SUDO_USER}"; then
     echo "Running as sudo."
     echo "Tip: You can avoid it by adding the following in /etc/sudoers"
@@ -132,6 +137,16 @@ if test ! -f ${HOME_EXPORT}/.pbuilderrc; then
 fi
 
 if $upload; then
+    for dist in ${CENTOS_DIST}; do
+	arch=amd64
+	prodver=${PRODUCT}-${VERSION}
+	if ssh $dist "cd rpmbuild/SOURCES/${prodver} && ../../../proj/git-tools/id-rpm-build/upload-rpms.sh ${PRODUCT}.spec"; then
+	    :
+	    else
+	    echo "Upload failed for $dist"
+	    exit 1
+	fi
+    done
     for dist in ${UBUNTU_DIST}; do
 	scp ${dist}-*/* ftp.indexdata.dk:/home/ftp/pub/${PRODUCT}/ubuntu/${dist}
     done
@@ -140,17 +155,52 @@ if $upload; then
     done
     echo ""
     echo "===================================================="
-    echo "Remember to update APT on ftp.indexdata.dk !!!"
+    echo "Remember to update APT/YUM on ftp.indexdata.dk !!!"
     echo ""
     echo "ssh ftp.indexdata.dk"
     echo "cd ~/proj/git-tools/update-archive"
     echo "sudo su"
     echo "./update-archive.sh"
+    if test ${CENTOS_DIST}; then
+	echo "./update-yum-archive.sh"
+    fi
     echo "===================================================="
     exit 0
 fi
+
 rm -f *.log
 
+# copy tars to centos build hosts
+for dist in ${CENTOS_DIST}; do
+    arch=amd64
+    prodver=${PRODUCT}-${VERSION}
+    tarname=${prodver}.tar.gz
+    if test ! -f ../${tarname}; then
+	echo "$tarname: missing"
+	exit 1
+    fi
+
+    if ssh $dist "test -f .rpmmacros && test -d rpmbuild/SOURCES && test -d rpmbuild/RPMS && test -d rpmbuild/SRPMS && test -x proj/git-tools/id-rpm-build/upload-rpms.sh"; then
+	:
+    else
+	echo "Host $dist does not seem to be prepared with git-tools and rpmbuild directories"
+	exit 1
+    fi
+
+    if scp ../${tarname} $dist:rpmbuild/SOURCES/ ; then
+	:
+    else
+	echo "Could not copy $tarname to $dist"
+	exit 1
+    fi
+    if ssh $dist "cd rpmbuild/SOURCES && rm -fr $prodver && tar zxf $tarname && cd ${prodver} && rpmbuild -ba ${PRODUCT}.spec" >${dist}-${arch}.log 2>&1; then
+	:
+    else
+	echo "FAILED: See ${dist}-${arch}.log"
+	exit 1
+    fi
+done
+
 # call our privileged wrapper to clean the directories, no --dsc option
 for dist in ${DEBIAN_DIST} ${UBUNTU_DIST}; do
     for arch in ${USE_ARCHS}; do
@@ -195,6 +245,7 @@ for dist in ${DEBIAN_DIST} ${UBUNTU_DIST}; do
 	fi
     done
 done
+
 date
 echo "Done"
 # Local Variables: