Modified build/web/process_queue from [02c92ac8e0] to [1edd04d78d].

     1      1   #! /usr/bin/env tclsh
     2      2   
     3      3   set queue "/home/rkeene/devel/kitcreator/build/web/queue"
     4      4   set outdir "/web/customers/kitcreator.rkeene.org/kits"
            5  +set builddir "/tmp/kitcreator-web/builds"
     5      6   
     6      7   if {![file exists "${queue}.old"]} {
     7      8   	if {![file exists $queue]} {
     8      9   		exit 0
     9     10   	}
    10     11   
    11     12   	file rename "$queue" "${queue}.old"
................................................................................
    35     36   	}
    36     37   
    37     38   	# Skip if build failed
    38     39   	if {[file exists $outfile.buildfail]} {
    39     40   		continue
    40     41   	}
    41     42   
    42         -	set workdir [file join $outdir $buildinfo(key) build]
    43         -	file delete -force $workdir
           43  +	# Set the build directory
           44  +	file delete -force -- $builddir
           45  +	set workdir [file join $builddir $buildinfo(key) build]
    44     46   	file mkdir $workdir
    45     47   	cd $workdir
    46     48   
    47         -	set fd [open ../buildinfo w]
           49  +	# Find place to store build info
           50  +	set keydir [file join $outdir $buildinfo(key)]
           51  +	file mkdir $keydir
           52  +	set fd [open [file join $keydir buildinfo] w]
    48     53   	puts $fd [array get buildinfo]
    49     54   	close $fd
    50     55   
    51     56   	set tarball kitcreator-${buildinfo(kitcreator_version)}.tar.gz
    52         -	exec wget -q -O $tarball http://kitcreator.rkeene.org/fossil/tarball/${tarball}?uuid=${buildinfo(kitcreator_version)}
    53         -	exec gzip -dc $tarball | tar -xf -
    54         -	cd kitcreator-${buildinfo(kitcreator_version)}
           57  +
           58  +	if {[catch {
           59  +		exec wget -q -O $tarball http://kitcreator.rkeene.org/fossil/tarball/${tarball}?uuid=${buildinfo(kitcreator_version)}
           60  +		exec gzip -dc $tarball | tar -xf -
           61  +		cd kitcreator-${buildinfo(kitcreator_version)}
           62  +	}]} {
           63  +		continue
           64  +	}
    55     65   
    56     66   	set script "./build/make-kit-${buildinfo(platform)}"
    57     67   	set args [list]
    58     68   
    59     69   	set ::env(KITCREATOR_PKGS) " [join $buildinfo(packages) " "] "
    60     70   
    61     71   	foreach {option value} $buildinfo(options) {
................................................................................
   126    136   	}
   127    137   
   128    138   	catch {
   129    139   		exec {*}$cmd >> "${outfile}.log" 2>@1
   130    140   	}
   131    141   
   132    142   	catch {
   133         -		exec grep ^ {*}[glob */build.log] >> "${outfile}.log"
          143  +		exec grep ^ {*}[lsort -dictionary [glob */build.log]] >> "${outfile}.log"
   134    144   	}
   135    145   
   136    146   	foreach file [list tclkit-$buildinfo(tcl_version) {*}[glob -nocomplain libtclkit*]] {
   137    147   		switch -glob -- $file {
   138    148   			"*.dylib" - "*.so" - "*.sl" - "*.dll" { }
   139    149   			"tclkit-*" {}
   140    150   			default {