Author: biurrun Date: Wed Sep 2 14:41:52 2009 New Revision: 903 Log: whitespace cosmetics: fix indentation Modified: trunk/tools/subversion/pisa_runautobuild Modified: trunk/tools/subversion/pisa_runautobuild ============================================================================== --- trunk/tools/subversion/pisa_runautobuild Wed Sep 2 14:39:34 2009 (r902) +++ trunk/tools/subversion/pisa_runautobuild Wed Sep 2 14:41:52 2009 (r903) @@ -27,30 +27,30 @@ CHECKOUT_DIR=$BUILD_DIR/$(date +"%Y-%m-%d-%H%M") - svn co -q svn+ssh://pride/srv/projects/pisa/svn/trunk "$CHECKOUT_DIR" - cd "$CHECKOUT_DIR" - AUTOBUILD_VERSION=$(svnversion .) - test $(cat $BUILD_DIR/PISA_HEAD_REVISION) != $AUTOBUILD_VERSION || cleanup 0 - # This commands test that our trunk compiles - run_program ./autogen.sh && run_program ./configure && run_program make -j16 - # Now we are looking at the openwrt-build - # Create tarball - run_program make -j16 dist - # delete old PISA tarballs - run_program rm -f $BUILD_DIR/openwrt/dl/pisa*.tar.gz - PISA_TARBALL=$(ls pisa*tar.gz) - run_program cp $PISA_TARBALL $BUILD_DIR/openwrt/dl - cd $BUILD_DIR/openwrt - run_program make -j 16 package/pisa-clean V=99 - run_program rm -rf package/pisa - run_program cp -r $CHECKOUT_DIR/openwrt/trunk/package/pisa package/ - # Patch the Pisa package OpenWRT Makefile - # We have no error handling here - we expect them to be caught - # as soon as make is called - WRT_PISA_VERSION=$(echo $PISA_TARBALL | cut -d . -f 1,2,3 | cut -d - -f 2) - sed -i -e "s/PKG_VERSION:=.*/PKG_VERSION:=$WRT_PISA_VERSION/" package/pisa/Makefile - # Build - run_program make -j16 package/pisa-install V=99 - echo $AUTOBUILD_VERSION > $BUILD_DIR/PISA_HEAD_REVISION +svn co -q svn+ssh://pride/srv/projects/pisa/svn/trunk "$CHECKOUT_DIR" +cd "$CHECKOUT_DIR" +AUTOBUILD_VERSION=$(svnversion .) +test $(cat $BUILD_DIR/PISA_HEAD_REVISION) != $AUTOBUILD_VERSION || cleanup 0 +# This commands test that our trunk compiles +run_program ./autogen.sh && run_program ./configure && run_program make -j16 +# Now we are looking at the openwrt-build +# Create tarball +run_program make -j16 dist +# delete old PISA tarballs +run_program rm -f $BUILD_DIR/openwrt/dl/pisa*.tar.gz +PISA_TARBALL=$(ls pisa*tar.gz) +run_program cp $PISA_TARBALL $BUILD_DIR/openwrt/dl +cd $BUILD_DIR/openwrt +run_program make -j16 package/pisa-clean V=99 +run_program rm -rf package/pisa +run_program cp -r $CHECKOUT_DIR/openwrt/trunk/package/pisa package/ +# Patch the Pisa package OpenWRT Makefile +# We have no error handling here - we expect them to be caught +# as soon as make is called +WRT_PISA_VERSION=$(echo $PISA_TARBALL | cut -d . -f 1,2,3 | cut -d - -f 2) +sed -i -e "s/PKG_VERSION:=.*/PKG_VERSION:=$WRT_PISA_VERSION/" package/pisa/Makefile +# Build +run_program make -j16 package/pisa-install V=99 +echo $AUTOBUILD_VERSION > $BUILD_DIR/PISA_HEAD_REVISION cleanup 0