Index: bin/Compile =================================================================== RCS file: /sources/goboscripts/tools/Compile/bin/Compile,v retrieving revision 1.247 diff -u -r1.247 Compile --- bin/Compile 1 Mar 2008 07:24:44 -0000 1.247 +++ bin/Compile 10 Mar 2008 06:43:07 -0000 @@ -600,6 +600,10 @@ then versionnumber=`date +%Y%m%d`"-GIT" fi +if [ "$versionnumber" = "BZR" -o "$versionnumber" = "bzr" ] +then versionnumber=`date +%Y%m%d`"-BZR" +fi + target=`Get_Dir runtime $appname $versionnumber` settings_target=`Get_Dir runtimeSettings $appname $versionnumber` variable_target="${goboVariable}" @@ -758,8 +762,8 @@ # Construct some variable arrays ################################################## -if ! [ -n "${cvs}${svn}${git}${url}${urls[*]}" ] -then Die "Missing URL, CVS, SVN or GIT in recipe '$recipe'." +if ! [ -n "${cvs}${svn}${git}${bzr}${url}${urls[*]}" ] +then Die "Missing URL, CVS, SVN, GIT, or BZR in recipe '$recipe'." fi for var in url file file_size file_md5 @@ -775,7 +779,7 @@ then files=(`Map basename "${urls[@]}"`) fi -if [ "${cvs}" -o "${svn}" -o "${git}" ] +if [ "${cvs}" -o "${svn}" -o "${git}" -o "${bzr}" ] then if [ -z "${dir}" ] then @@ -846,6 +850,11 @@ [ "${dir}" -a -d "${dir}" ] && skippatching=yes Boolean "no-web" || in_host FetchArchive $verbose $batch $savedir "$recipe" "$archrecipe" || Die "Error fetching GIT snapshot." Boolean "no-build" && exit 0 +elif [ "$bzr" ] +then + [ "${dir}" -a -d "${dir}" ] && skippatching=yes + Boolean "no-web" || in_host FetchArchive $verbose $batch $savedir "$recipe" "$archrecipe" || Die "Error fetching BZR snapshot." + Boolean "no-build" && exit 0 else if ! Boolean "no-web" then Index: bin/FetchArchive =================================================================== RCS file: /sources/goboscripts/tools/Compile/bin/FetchArchive,v retrieving revision 1.39 diff -u -r1.39 FetchArchive --- bin/FetchArchive 6 Jan 2008 10:13:20 -0000 1.39 +++ bin/FetchArchive 10 Mar 2008 06:43:07 -0000 @@ -98,6 +98,15 @@ else cd "${sourcedir}" && git-pull fi exit $? +elif [ "$bzr" ] +then + cd "$savedir" + [ -z "${sourcedir}" ] && sourcedir="$(echo ${recipe} | sed 's,.*/\([^/]*\)/\([^/]*\)/Recipe,\1-\2,')" + if [ ! -d "${sourcedir}" ] + then bzr branch $bzr "${sourcedir}" + else cd "${sourcedir}" && bzr pull + fi + exit $? elif ! [ -n "$url${urls[*]}" ] then Die "Missing URL in recipe '$recipe'." Index: bin/RecipeLint =================================================================== RCS file: /sources/goboscripts/tools/Compile/bin/RecipeLint,v retrieving revision 1.63 diff -u -r1.63 RecipeLint --- bin/RecipeLint 9 Feb 2008 07:01:00 -0000 1.63 +++ bin/RecipeLint 10 Mar 2008 06:43:08 -0000 @@ -128,7 +128,7 @@ echo "$pureversion" | egrep -q "^[0-9a-z_.]+$" || { ERROR "Version $pureversion contains invalid characters (only [0-9a-z._] allowed)." } -echo "$pureversion" | grep -q "[0-9]\|^cvs$\|^svn$\|^git$" || { +echo "$pureversion" | grep -q "[0-9]\|^cvs$\|^svn$\|^git|^bzr$" || { WARN "Version $pureversion does not contain digits, may be incorrect." } [ "$revision" ] && { @@ -275,6 +275,7 @@ cvs_rsh => "string", svn => "string", git => "string", + bzr => "string", unmanaged_files => "array", perl_options => "array", part_of => "string", @@ -562,7 +563,7 @@ done return } - [ "$url" -o "${urls[0]}" -o "$cvs" -o "$svn" -o "$git" ] || { + [ "$url" -o "${urls[0]}" -o "$cvs" -o "$svn" -o "$git" -o "$bzr" ] || { ERROR "No download location specified in recipe." } if [ "$compile_version" ] @@ -696,11 +697,11 @@ if [ "$test_recipe" = "yes" ] then - grep -q "url=\|urls=\|cvs=\|svn=\|git=" Recipe && test_recipe + grep -q "url=\|urls=\|cvs=\|svn=\|git=\|bzr=" Recipe && test_recipe for arch in "${arches[@]}" do [ -e "$arch/Recipe" ] || continue - grep -q "url=\|urls=\|cvs=\|svn=\|git=" "$arch/Recipe" && test_recipe "$arch" + grep -q "url=\|urls=\|cvs=\|svn=\|git=\|bzr=" "$arch/Recipe" && test_recipe "$arch" done fi