Skip to content

Commit

Permalink
Modified the build scripts in the examples to handle compile/link fai…
Browse files Browse the repository at this point in the history
…lures more graceful. Instead of throwing whatever error occured, or trying to install something which does not exist bypass the latter, and let the log shown speak for itself.
  • Loading branch information
andreas-kupries committed Oct 19, 2011
1 parent 57589c1 commit 6846070
Show file tree
Hide file tree
Showing 5 changed files with 80 additions and 25 deletions.
21 changes: 16 additions & 5 deletions examples/clist/build.tcl
Expand Up @@ -70,6 +70,10 @@ proc log {args} {
set chan stdout
}
# chan <=> tag, if not overriden
if {[string match {Files left*} $text]} {
set tag warn
set text \n$text
}
if {$tag eq {}} { set tag $chan }
#::_puts $tag/$text

Expand Down Expand Up @@ -133,6 +137,11 @@ proc _install {{ldir {}}} {
file delete -force [pwd]/BUILD
critcl::app::main [list -cache [pwd]/BUILD -libdir $ldir -includedir $idir -pkg $src]

if {![file exists $ldir/$p]} {
set ::NOTE {warn {DONE, with FAILURES}}
break
}

file delete -force $ldir/$p$version
file rename $ldir/$p $ldir/$p$version

Expand All @@ -159,8 +168,9 @@ proc _gui {} {
.st setwidget .t

.t tag configure stdout -font {Helvetica 8}
.t tag configure stderr -background red -font {Helvetica 12}
.t tag configure ok -background green -font {Helvetica 8}
.t tag configure stderr -background red -font {Helvetica 12}
.t tag configure ok -background green -font {Helvetica 8}
.t tag configure warn -background yellow -font {Helvetica 12}

grid .l -row 0 -column 0 -sticky new
grid .e -row 0 -column 1 -sticky new
Expand All @@ -187,15 +197,16 @@ proc _gui {} {
return
}
proc Install {} {
global INSTALLPATH
global INSTALLPATH NOTE
.i configure -state disabled

set NOTE {ok DONE}
set fail [catch {
_install $INSTALLPATH

puts ""
tag ok
puts DONE
tag [lindex $NOTE 0]
puts [lindex $NOTE 1]
} e o]

.i configure -state normal
Expand Down
21 changes: 16 additions & 5 deletions examples/random/build.tcl
Expand Up @@ -72,6 +72,10 @@ proc log {args} {
set chan stdout
}
# chan <=> tag, if not overriden
if {[string match {Files left*} $text]} {
set tag warn
set text \n$text
}
if {$tag eq {}} { set tag $chan }
#::_puts $tag/$text

Expand Down Expand Up @@ -135,6 +139,11 @@ proc _install {{ldir {}}} {
file delete -force [pwd]/BUILD
critcl::app::main [list -cache [pwd]/BUILD -libdir $ldir -includedir $idir -pkg $src]

if {![file exists $ldir/$p]} {
set ::NOTE {warn {DONE, with FAILURES}}
break
}

file delete -force $ldir/$p$version
file rename $ldir/$p $ldir/$p$version

Expand All @@ -161,8 +170,9 @@ proc _gui {} {
.st setwidget .t

.t tag configure stdout -font {Helvetica 8}
.t tag configure stderr -background red -font {Helvetica 12}
.t tag configure ok -background green -font {Helvetica 8}
.t tag configure stderr -background red -font {Helvetica 12}
.t tag configure ok -background green -font {Helvetica 8}
.t tag configure warn -background yellow -font {Helvetica 12}

grid .l -row 0 -column 0 -sticky new
grid .e -row 0 -column 1 -sticky new
Expand All @@ -189,15 +199,16 @@ proc _gui {} {
return
}
proc Install {} {
global INSTALLPATH
global INSTALLPATH NOTE
.i configure -state disabled

set NOTE {ok DONE}
set fail [catch {
_install $INSTALLPATH

puts ""
tag ok
puts DONE
tag [lindex $NOTE 0]
puts [lindex $NOTE 1]
} e o]

.i configure -state normal
Expand Down
21 changes: 16 additions & 5 deletions examples/selfcompanion/build.tcl
Expand Up @@ -70,6 +70,10 @@ proc log {args} {
set chan stdout
}
# chan <=> tag, if not overriden
if {[string match {Files left*} $text]} {
set tag warn
set text \n$text
}
if {$tag eq {}} { set tag $chan }
#::_puts $tag/$text

Expand Down Expand Up @@ -133,6 +137,11 @@ proc _install {{ldir {}}} {
file delete -force [pwd]/BUILD
critcl::app::main [list -cache [pwd]/BUILD -libdir $ldir -includedir $idir -pkg $src]

if {![file exists $ldir/$p]} {
set ::NOTE {warn {DONE, with FAILURES}}
break
}

file delete -force $ldir/$p$version
file rename $ldir/$p $ldir/$p$version

Expand All @@ -159,8 +168,9 @@ proc _gui {} {
.st setwidget .t

.t tag configure stdout -font {Helvetica 8}
.t tag configure stderr -background red -font {Helvetica 12}
.t tag configure ok -background green -font {Helvetica 8}
.t tag configure stderr -background red -font {Helvetica 12}
.t tag configure ok -background green -font {Helvetica 8}
.t tag configure warn -background yellow -font {Helvetica 12}

grid .l -row 0 -column 0 -sticky new
grid .e -row 0 -column 1 -sticky new
Expand All @@ -187,15 +197,16 @@ proc _gui {} {
return
}
proc Install {} {
global INSTALLPATH
global INSTALLPATH NOTE
.i configure -state disabled

set NOTE {ok DONE}
set fail [catch {
_install $INSTALLPATH

puts ""
tag ok
puts DONE
tag [lindex $NOTE 0]
puts [lindex $NOTE 1]
} e o]

.i configure -state normal
Expand Down
21 changes: 16 additions & 5 deletions examples/stack/build.tcl
Expand Up @@ -72,6 +72,10 @@ proc log {args} {
set chan stdout
}
# chan <=> tag, if not overriden
if {[string match {Files left*} $text]} {
set tag warn
set text \n$text
}
if {$tag eq {}} { set tag $chan }
#::_puts $tag/$text

Expand Down Expand Up @@ -135,6 +139,11 @@ proc _install {{ldir {}}} {
file delete -force [pwd]/BUILD
critcl::app::main [list -cache [pwd]/BUILD -libdir $ldir -includedir $idir -pkg $src]

if {![file exists $ldir/$p]} {
set ::NOTE {warn {DONE, with FAILURES}}
break
}

file delete -force $ldir/$p$version
file rename $ldir/$p $ldir/$p$version

Expand All @@ -161,8 +170,9 @@ proc _gui {} {
.st setwidget .t

.t tag configure stdout -font {Helvetica 8}
.t tag configure stderr -background red -font {Helvetica 12}
.t tag configure ok -background green -font {Helvetica 8}
.t tag configure stderr -background red -font {Helvetica 12}
.t tag configure ok -background green -font {Helvetica 8}
.t tag configure warn -background yellow -font {Helvetica 12}

grid .l -row 0 -column 0 -sticky new
grid .e -row 0 -column 1 -sticky new
Expand All @@ -189,15 +199,16 @@ proc _gui {} {
return
}
proc Install {} {
global INSTALLPATH
global INSTALLPATH NOTE
.i configure -state disabled

set NOTE {ok DONE}
set fail [catch {
_install $INSTALLPATH

puts ""
tag ok
puts DONE
tag [lindex $NOTE 0]
puts [lindex $NOTE 1]
} e o]

.i configure -state normal
Expand Down
21 changes: 16 additions & 5 deletions examples/zlibwrap/build.tcl
Expand Up @@ -70,6 +70,10 @@ proc log {args} {
set chan stdout
}
# chan <=> tag, if not overriden
if {[string match {Files left*} $text]} {
set tag warn
set text \n$text
}
if {$tag eq {}} { set tag $chan }
#::_puts $tag/$text

Expand Down Expand Up @@ -138,6 +142,11 @@ proc _install {{ldir {}} {mode {}}} {
critcl::app::main [list -with-mode $mode -cache [pwd]/BUILD -libdir $ldir -includedir $idir -pkg $src]
}

if {![file exists $ldir/$p]} {
set ::NOTE {warn {DONE, with FAILURES}}
break
}

file delete -force $ldir/$p$version
file rename $ldir/$p $ldir/$p$version

Expand All @@ -164,8 +173,9 @@ proc _gui {} {
.st setwidget .t

.t tag configure stdout -font {Helvetica 8}
.t tag configure stderr -background red -font {Helvetica 12}
.t tag configure ok -background green -font {Helvetica 8}
.t tag configure stderr -background red -font {Helvetica 12}
.t tag configure ok -background green -font {Helvetica 8}
.t tag configure warn -background yellow -font {Helvetica 12}

grid .l -row 0 -column 0 -sticky new
grid .e -row 0 -column 1 -sticky new
Expand All @@ -192,15 +202,16 @@ proc _gui {} {
return
}
proc Install {} {
global INSTALLPATH
global INSTALLPATH NOTE
.i configure -state disabled

set NOTE {ok DONE}
set fail [catch {
_install $INSTALLPATH

puts ""
tag ok
puts DONE
tag [lindex $NOTE 0]
puts [lindex $NOTE 1]
} e o]

.i configure -state normal
Expand Down

0 comments on commit 6846070

Please sign in to comment.