Merge branch 'master' of master.kernel.org:git/Meta/

[git.git] / DoKernelOrg

diff --git a/DoKernelOrg b/DoKernelOrg
index 54fae2e..1c10ea6 100755 (executable)
--- a/DoKernelOrg
+++ b/DoKernelOrg
@@ -1,32 +1,43 @@
 #!/bin/sh
 
+J='-l 4 -j'
+G=/pub/software/scm/git &&
+
 cd $HOME/git &&
-make clean &&
+make clean >/dev/null 2>&1 &&
 git reset --hard &&
-make clean &&
+make clean >/dev/null 2>&1 &&
 git checkout master &&
 git pull . origin &&
-make clean test doc install &&
-make clean
-git checkout pu &&
-make test clean &&
+make clean >/dev/null 2>&1 &&
+
 case "$1" in
+'')
+       echo "* Building all"
+       {
+               make $J install &&
+               make test &&
+               make clean &&
+               git checkout pu &&
+               make $J clean &&
+               make test clean
+       } >:all.log 2>&1
+       ;;
 maint | master)
+       mkdir -p $G/RPMS/i386 $G/RPMS/SRPMS &&
+
+       echo "* Building $1"
        git checkout "$1" &&
-       make rpm &&
-       cp git-*.tar.gz $HOME/tarpit/ &&
+       make rpm >./:rpm.log 2>&1 &&
+       make $J git >>./:rpm.log 2>&1 &&
+       V=`./git --version | sed -e 's/git version //'` &&
+       ln git-$V.tar.gz $G/. &&
+       ln $HOME/rpms/RPMS/i386/git*-$V-* $G/RPMS/i386/. &&
+       ln $HOME/rpms/SRPMS/git-$V-* $G/RPMS/SRPMS/. &&
+       rm -fr ./:rpm.log &&
        make clean &&
-       make git doc &&
-       V=$(./git --version | sed -e 's/git version //') &&
-       D=`pwd` &&
-       M="git-man-pages-$V" &&
-       rm -rf "$M" &&
-       rm -f "$M".tar.gz &&
-       ./Make man1="$D/$M/man1" man7="$D/$M/man7" -C Documentation install &&
-       tar zcf "$HOME/tarpit/$M".tar.gz "$M" &&
-       rm -fr "$M" &&
-       make clean ||
-       exit $?
-       ;;
-esac
+
+       : ;;
+esac || exit $?
+
 git checkout master