X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=admin%2Fbuild.sh;h=d976a2c4716ba4539273f58d7fcebe695ceb977a;hb=532240d72e09e19e57fac9bb55c2560b9c9e5b97;hp=ac3fdefc829df36a39c41c90bd1378638889113b;hpb=dbb053aa51bcb27e32f6e7426c6d13808035950e;p=senf.git

diff --git a/admin/build.sh b/admin/build.sh
index ac3fdef..d976a2c 100755
--- a/admin/build.sh
+++ b/admin/build.sh
@@ -1,56 +1,63 @@
-#!/bin/sh -e
+#!/bin/bash -e
+
+PATH=${HOME}/bin:${PATH}
+LOGDIR=${HOME}/log
 
 cd /home/senf/src
 
-rm -f build.log ../upload.log
-touch build.log ../upload.log
+rm -f ${LOGDIR}/build.log ${LOGDIR}/upload.log
+touch ${LOGDIR}/build.log ${LOGDIR}/upload.log
 
-trap 'exec >/dev/null 2>&1; cat build.log ../upload.log 1>&3; exit 1' ERR
+trap 'exec >/dev/null 2>&1; cat ${LOGDIR}/build.log ${LOGDIR}/upload.log 1>&3; exit 1' ERR
 
-exec 3>&1 >build.log 2>&1
+exec 3>&1 > ${LOGDIR}/build.log 2>&1
 
 echo -n '# Starting build at '; date --utc
 
 if [ "$1" == "-c" ]; then
     echo '$ find -mindepth 1 -maxdepth 1 ! -name .svn | xargs rm -rf'
-    find -mindepth 1 -maxdepth 1 ! -name .svn ! -name build.log | xargs rm -rf
+    find -mindepth 1 -maxdepth 1 ! -name .svn | xargs rm -rf
 fi
 
 echo '$ svn update'
-svn update | tee ../svn-update.log
-if grep -qv '^At ' ../svn-update.log; then
+svn update | tee ${LOGDIR}/svn-update.log
+if grep -qv '^At ' ${LOGDIR}/svn-update.log; then
     echo '$ rm -f doc/html/html.stamp'
     rm -f doc/html/html.stamp
 fi
-rm -f ../svn-update.log
-
-echo '$ scons -k all'
-scons -k all
-echo '$ scons linklint'
-scons linklint
-echo '$ scons fixlinks'
-scons fixlinks
+rm -f ${LOGDIR}/svn-update.log
+
+echo "\$ nice ${SCONS:-scons} -kj2 all ${DOXYGEN:+DOXYGEN="$DOXYGEN"}"
+nice ${SCONS:-scons} -kj2 all ${DOXYGEN:+DOXYGEN="$DOXYGEN"}
+echo "\$ nice ${SCONS:-scons} all ${DOXYGEN:+DOXYGEN="$DOXYGEN"}"
+nice ${SCONS:-scons} all ${DOXYGEN:+DOXYGEN="$DOXYGEN"}
+echo "\$ nice ${SCONS:-scons} linklint ${DOXYGEN:+DOXYGEN="$DOXYGEN"}"
+nice ${SCONS:-scons} linklint ${DOXYGEN:+DOXYGEN="$DOXYGEN"}
+echo "\$ nice ${SCONS:-scons} fixlinks ${DOXYGEN:+DOXYGEN="$DOXYGEN"}"
+nice ${SCONS:-scons} fixlinks ${DOXYGEN:+DOXYGEN="$DOXYGEN"}
 echo -n '# Build completed at '; date --utc
 
-exec >../upload.log 2>&1
+exec > ${LOGDIR}/upload.log 2>&1
 
 if [ "$1" == "-c" ]; then
-    cp build.log build-full.log
+    cp ${LOGDIR}/build.log ${LOGDIR}/build-full.log
 fi
 
 echo -n '# Upload started at '; date --utc
 rsync -rzv --del --delete-excluded \
-	--filter="- .svn" \
-	--filter="+ */" \
-	--filter="+ *.html" \
-	--filter="+ *.css" \
-	--filter="+ *.png" \
-	--filter="+ *.php" \
-	--filter="+ *.idx" \
-	--filter="+ *.log" \
-	--filter="- *" \
-	. g0dil@shell.berlios.de://home/groups/senf/htdocs/src
+    --filter="- .svn" \
+    --filter="- linklint" \
+    --filter="- debian" \
+    --filter="+ */" \
+    --filter="+ *.html" \
+    --filter="+ *.css" \
+    --filter="+ *.png" \
+    --filter="+ *.php" \
+    --filter="+ *.idx" \
+    --filter="+ *.log" \
+    --filter="- *" \
+    . g0dil@shell.berlios.de://home/groups/senf/htdocs/src
 echo -n '# Upload completed at '; date --utc
 
 exec >/dev/null 2>&1
-scp ../upload.log g0dil@shell.berlios.de:/home/groups/senf/htdocs/upload.log
+scp ${LOGDIR}/upload.log g0dil@shell.berlios.de:/home/groups/senf/htdocs/upload.log