Check-in [18e328360d]
Overview
Comment:Fixed bug building SDK
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | trunk
Files: files | file ages | folders
SHA1:18e328360d2d9ec5d8a021b1632d76cef488c766
User & Date: rkeene on 2020-05-02 21:00:49
Other Links: manifest | tags
Context
2020-05-02
21:00
Fixed bug building SDK Leaf check-in: 18e328360d user: rkeene tags: trunk
2020-04-15
05:19
Improved Critcl support check-in: a461844cd4 user: rkeene tags: trunk
Changes

Modified build/web/building.cgi from [9e4625490c] to [4b99f287de].

   214    214   puts "\t\t<title>KitCreator, Web Interface</title>"
   215    215   puts "\t</head>"
   216    216   puts "\t<body>"
   217    217   puts "\t\t<h1>KitCreator Web Interface</h1>"
   218    218   puts "\t\t<p><b>Status:</b> $status"
   219    219   if {[info exists url]} {
   220    220   	puts "\t\t<p><b>URL:</b> <a href=\"$url\">$url</a>"
          221  +
          222  +	if {[info exists sdk_url]} {
          223  +		puts "\t\t<p><b>SDK URL:</b> <a href=\"$sdk_url\">$sdk_url</a>"
          224  +	}
   221    225   }
   222    226   if {[info exists description]} {
   223    227   	puts "\t\t<p><b>Description:</b> $description"
   224    228   }
   225    229   if {[info exists logfile]} {
   226    230   	catch {
   227    231   		set fd [open $logfile]

Modified build/web/process_queue from [3c4d307b06] to [83b4c114b0].

    92     92   
    93     93   	set ::env(KITCREATOR_PKGS) " [join $buildinfo(packages) " "] "
    94     94   
    95     95   	foreach {option value} $buildinfo(options) {
    96     96   		switch -- $option {
    97     97   			"kitdll" {
    98     98   				if {$value} {
    99         -					set ::env(KITCREATOR_PKGS) "$::env(KITCREATOR_PKGS) kitdll"
           99  +					set ::env(KITCREATOR_PKGS) "$::env(KITCREATOR_PKGS) kitdll "
   100    100   				}
   101    101   			}
   102    102   			"threaded" {
   103    103   				if {$value} {
   104    104   					lappend args "--enable-threads"
   105    105   				} else {
   106    106   					lappend args "--disable-threads"
................................................................................
   182    182   		exec {*}$cmd >> "${outfile}.log" 2>@1
   183    183   	}
   184    184   
   185    185   	catch {
   186    186   		exec grep ^ {*}[lsort -dictionary [glob */build.log]] >> "${outfile}.log"
   187    187   	}
   188    188   
          189  +	set errfd [open "${outfile}.log" a+]
   189    190   	foreach file [list tclkit-$buildinfo(tcl_version) {*}[glob -nocomplain libtclkit*]] {
   190    191   		set isSDK false
   191    192   		switch -glob -- $file {
   192    193   			"*.dylib" - "*.so" - "*.sl" - "*.dll" { }
   193    194   			"tclkit-*" {}
   194    195   			"libtclkit-sdk-*.tar.gz" {
   195    196   				set isSDK true
................................................................................
   200    201   		}
   201    202   
   202    203   		if {$isSDK} {
   203    204   			if {[info exists outsdkfile]} {
   204    205   				if {[catch {
   205    206   					handleSDK $workdir $file $outsdkfile
   206    207   				}]} {
          208  +					puts $errfd "Error creating SDK: $::errorInfo"
   207    209   					puts stderr "Error creating SDK: $::errorInfo"
   208    210   				}
   209    211   			}
   210    212   
   211    213   			continue
   212    214   		}
   213    215   
   214    216   		if {[file exists $file]} {
   215    217   			file rename $file $outfile
   216    218   
   217    219   			break
   218    220   		}
   219    221   	}
          222  +
          223  +	if {[info exists outsdkfile]} {
          224  +		if {![file exists $outsdkfile]} {
          225  +			puts $errfd "Error: Should have built an SDK, but didn't ?!?"
          226  +		}
          227  +	}
          228  +
          229  +	close $errfd
   220    230   
   221    231   	if {![file exists $outfile]} {
   222    232   		set fd [open $outfile.buildfail "w+"]
   223    233   		puts $fd "$line"
   224    234   		close $fd
   225    235   	}
   226    236