wok rev 3527
tazbb: Minor edits
author | Paul Issott <paul@slitaz.org> |
---|---|
date | Sun Jun 21 21:30:25 2009 +0000 (2009-06-21) |
parents | 002c0837316f |
children | bcae4cfaa7e5 |
files | tazbb/description.txt tazbb/receipt tazbb/stuff/README tazbb/stuff/tazbb tazbb/stuff/web/index.php |
line diff
1.1 --- a/tazbb/description.txt Sun Jun 21 20:40:37 2009 +0000 1.2 +++ b/tazbb/description.txt Sun Jun 21 21:30:25 2009 +0000 1.3 @@ -1,8 +1,8 @@ 1.4 1.5 -SliTaz Build Bot. Tazbb is a tool to automate and test SliTaz building. 1.6 -Please read the Cookbook documentation for more information and put your 1.7 -on Tazz Wiki page on the Labs. The package provide tazbb script, config 1.8 -file and the web interface. 1.9 +SliTaz Build Bot. Tazbb is a tool to automate and test SliTaz package 1.10 +building. Please read the Cookbook documentation for more information 1.11 +and put your ideas on the Tazbb Wiki page on the Labs. The package 1.12 +provides the tazbb script, a config file and a web interface. 1.13 1.14 Tank Build Bot : http://bb.slitaz.org/ 1.15 Tazbb Wiki : http://labs.slitaz.org/wiki/distro/Tazbb
2.1 --- a/tazbb/receipt Sun Jun 21 20:40:37 2009 +0000 2.2 +++ b/tazbb/receipt Sun Jun 21 21:30:25 2009 +0000 2.3 @@ -34,8 +34,8 @@ 2.4 ln -s $1/var/lib/tazbb/web $1/var/www/vhosts/bb 2.5 cat << _EOT_ 2.6 2.7 -To have Tazbb web interface on your local system you can add a vhost 2.8 -to Lighttp (or Apache) and the hostname to /etc/hosts. Example for Lighty: 2.9 +To have a Tazbb web interface on your local system, you can add a vhost 2.10 +to Lighttpd (or Apache) and the hostname to /etc/hosts. Example for Lighty: 2.11 2.12 $HTTP["host"] =~ "bb" { 2.13 server.document-root = "/var/www/vhost/bb"
3.1 --- a/tazbb/stuff/README Sun Jun 21 20:40:37 2009 +0000 3.2 +++ b/tazbb/stuff/README Sun Jun 21 21:30:25 2009 +0000 3.3 @@ -2,7 +2,7 @@ 3.4 =============================================================================== 3.5 3.6 3.7 -Check the description.txt for a brief overview of Tazbb, read the Cookbook doc 3.8 +Check the description.txt for a brief overview of Tazbb, read the Cookbook docs 3.9 and collaborate on the Labs. 3.10 3.11
4.1 --- a/tazbb/stuff/tazbb Sun Jun 21 20:40:37 2009 +0000 4.2 +++ b/tazbb/stuff/tazbb Sun Jun 21 21:30:25 2009 +0000 4.3 @@ -22,7 +22,7 @@ 4.4 echo -e "\nYou must be root to run: `basename $0`.\n" && exit 0 4.5 fi 4.6 4.7 -# Let tazbb finish is work and make sure needed files exist. 4.8 +# Let tazbb finish its work and make sure needed files exist. 4.9 if [ -f $LOCK_FILE ]; then 4.10 case $1 in 4.11 usage|list-*|*block) 4.12 @@ -43,7 +43,7 @@ 4.13 \033[1mCommands: \033[0m\n 4.14 usage Print this short usage and command list. 4.15 list-pkgs List last cooked packages with date. 4.16 - report Run in report mode and dont cook anything [--verbose]. 4.17 + report Run in report mode and don't cook anything [--verbose]. 4.18 cook-all Cook all missing, modified or unbuilt packages. 4.19 cook-commit Cook all packages affected by a commit in the last update. 4.20 test-pkgs Execute a test suite on all packages [--verbose]. 4.21 @@ -129,7 +129,7 @@ 4.22 echo -e "Build wok : $BUILD_WOK ($LAST_REV)\n" 4.23 top_summary 4.24 # Copy Hg wok if new revision or exit to stop process since nothing 4.25 - # have change (--forced can be used). 4.26 + # has changed (--forced can be used). 4.27 if [ "$NEW_REV" != "$LAST_REV" ]; then 4.28 size=`du -sh $HG_WOK | awk '{ print $1 }'` 4.29 echo -n "Copying Hg wok to the build wok ($size)... " 4.30 @@ -169,13 +169,13 @@ 4.31 echo "Blocked : $PACKAGE ($VERSION)" && continue 4.32 fi 4.33 4.34 - # Bristuff hack until the receipt are improved... 4.35 + # Bristuff hack until the receipts are improved... 4.36 #[ "$VERSION" = "bristuff" ] && VERSION=`get_version` 4.37 if [ "$VERSION" = "bristuff" ]; then 4.38 . $BUILD_WOK/$PACKAGE/taz/*/receipt 4.39 fi 4.40 4.41 - # First check if package exit. Package naming _must_ be in the form of: 4.42 + # First check if package exists. Package naming _must_ be in the form of: 4.43 # $PACKAGE-$VERSION or $PACKAGE-${VERSION}$EXTRAVERSION (Kernel string). 4.44 if [ ! -f $PACKAGES_REPOSITORY/$PACKAGE-$VERSION.tazpkg ]; then 4.45 [ -z "$EXTRAVERSION" ] && EXTRAVERSION="_$KERNEL" 4.46 @@ -198,14 +198,14 @@ 4.47 fi 4.48 done 4.49 fi 4.50 - # Now check if package is built and not already in the list. 4.51 + # Now check if package is built and not already on the list. 4.52 if [ ! -d $BUILD_WOK/$PACKAGE/taz ] && ! grep -q $PACKAGE $DB_DIR/cooklist; then 4.53 [ "$1" = "report" ] && echo "Unbuilt : $PACKAGE ($VERSION)" 4.54 echo "Unbuilt : $PACKAGE ($VERSION)" >> $DB_DIR/report 4.55 echo "$PACKAGE" >> $DB_DIR/cooklist 4.56 fi 4.57 # Rebuild unbuilt packages list with link to log file. This list 4.58 - # is also generated by cook_inslall to have real time stats. 4.59 + # is also generated by cook_install to have real time stats. 4.60 if [ ! -d $BUILD_WOK/$PACKAGE/taz ]; then 4.61 echo "<a href=\"log.php?package=$PACKAGE\">$PACKAGE</a>" \ 4.62 >> $DB_DIR/unbuilt 4.63 @@ -214,7 +214,7 @@ 4.64 packages_summary 4.65 } 4.66 4.67 -# Create a new cooklist and summary (dont modify report) so 'tazbb cook-commit' 4.68 +# Create a new cooklist and summary (don't modify report) so 'tazbb cook-commit' 4.69 # can cook last changes. 4.70 check_commit() 4.71 { 4.72 @@ -223,7 +223,7 @@ 4.73 # Clean up last results. 4.74 rm -f $DB_DIR/cooklist && touch $DB_DIR/cooklist 4.75 # Get the name of modified packages by the revision range. +1 last 4.76 - # commit was build by the previous build. 4.77 + # commit was built by the previous build. 4.78 LAST_REV=$(($LAST_REV+1)) 4.79 echo -e "Will cook from revision $LAST_REV to $NEW_REV\n" 4.80 for file in `hg log --rev=$LAST_REV:$NEW_REV --template '{files}\n'` 4.81 @@ -253,7 +253,7 @@ 4.82 tazwok clean $pkg 4.83 script -c "echo 'install' | tazwok cook $pkg" $LOG_DIR/$pkg.log 4.84 # Install new package (important for new shared libs). Note 4.85 - # that tests are done separatly with 'test_packages' and should 4.86 + # that tests are done separately with 'test_packages' and should 4.87 # be done by tazwok. 4.88 if [ -f $BUILD_WOK/$pkg/taz/*/receipt ]; then 4.89 . $BUILD_WOK/$pkg/taz/*/receipt 4.90 @@ -276,7 +276,7 @@ 4.91 # Remove old packages in the build wok and clean pkgs repository. The 4.92 # Hg wok is copied into the build wok so packages removed by hg must be 4.93 # removed. To remove old packages in the repository we look into the 4.94 -# build wok and dont remove unbuilt packages. Clean-up will also remove 4.95 +# build wok and don't remove unbuilt packages. Clean-up will also remove 4.96 # all corrupted packages. 4.97 clean_up() 4.98 { 4.99 @@ -471,10 +471,10 @@ 4.100 blocked_urls 4.101 echo "" ;; 4.102 test-pkgs) 4.103 - # Start a test suite on all builded packages. 4.104 + # Start a test suite on all built packages. 4.105 test_packages $@ ;; 4.106 test-suite) 4.107 - # Start a test suite on all builded package and the wok using 4.108 + # Start a test suite on all built packages and the wok using 4.109 # the great 'tazwok check'. 4.110 # 4.111 # test_packages > $LOG_DIR/test-suite.log
5.1 --- a/tazbb/stuff/web/index.php Sun Jun 21 20:40:37 2009 +0000 5.2 +++ b/tazbb/stuff/web/index.php Sun Jun 21 21:30:25 2009 +0000 5.3 @@ -45,13 +45,13 @@ 5.4 <h2><font color="#DF8F06">/usr/bin/tazbb</font></h2> 5.5 5.6 <p> 5.7 -Tazbb is <a href="http://www.slitaz.org/">SliTaz GNU/Linux</a> Build Bot, 5.8 -it automaticaly cook and test packages commited in the wok. SliTaz 5.9 +Tazbb is a <a href="http://www.slitaz.org/">SliTaz GNU/Linux</a> Build Bot, 5.10 +it automatically cooks and tests packages commited in the wok. SliTaz 5.11 <a href="http://pkgs.slitaz.org/">packages</a> are cooked on the project 5.12 main server: code name <a href="http://tank.slitaz.org">Tank</a>. This 5.13 -web interface give the current status of the build bot and the last report 5.14 -about all packages modified by SliTaz contributors in the Mercurial 5.15 -repository, aka <a href="http://hg.slitaz.org/">Hg repos</a>. 5.16 +web interface gives the current status of the build bot and the last report 5.17 +about any packages modified by the SliTaz contributors in the Mercurial 5.18 +<a href="http://hg.slitaz.org/">Hg repos</a>. 5.19 </p> 5.20 5.21 <p>