Check-in [2ffc7ae71a]
Overview
Comment:Added support for specifying that Tk should be linked dynamically
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:2ffc7ae71a34751c7a7ecb2aa5093deef3b704e6
User & Date: rkeene on 2014-10-27 05:31:19
Other Links: manifest | tags
Context
2014-10-29
18:28
Updated to clean all packages prior to startup, even if they are not known packages check-in: 3bf152ce99 user: rkeene tags: trunk
2014-10-27
05:31
Added support for specifying that Tk should be linked dynamically check-in: 2ffc7ae71a user: rkeene tags: trunk
05:30
Updated to support using "kitcreator-build.sh" if it exists, instead of "build.sh" in a project directory check-in: ea06c960df user: rkeene tags: trunk
Changes

Modified build/web/building.cgi from [b893b1086f] to [8d9092ef0d].

    41     41   	foreach {option value} $buildinfo(options) {
    42     42   		switch -- $option {
    43     43   			"kitdll" {
    44     44   				if {$value} {
    45     45   					append description ", Built as a Library"
    46     46   				}
    47     47   			}
           48  +			"dynamictk" {
           49  +				append description ", Forced Tk Dynamic Linking"
           50  +			}
    48     51   			"threaded" {
    49     52   				if {$value} {
    50     53   					append description ", Threaded"
    51     54   				} else {
    52     55   					append description ", Unthreaded"
    53     56   				}
    54     57   			}

Modified build/web/kitcreator.vfs/index.rvt from [e966c50630] to [21c6da1f90].

    76     76   		set build_kitcreator_version $args(kitcreator_version)
    77     77   
    78     78   		## Optional Arguments
    79     79   		set build_packages [list]
    80     80   		set build_options(threaded) 0
    81     81   		set build_options(kitdll) 0
    82     82   		set build_options(debug) 0
           83  +		set build_options(dynamictk) 0
    83     84   		foreach arg [array names args] {
    84     85   			switch -glob -- $arg {
    85     86   				"option_package_*" {
    86     87   					set package [join [lrange [split $arg _] 2 end] _]
    87     88   
    88     89   					lappend build_packages $package
    89     90   				}
................................................................................
    92     93   				}
    93     94   				"option_kitdll" {
    94     95   					set build_options(kitdll) 1
    95     96   				}
    96     97   				"option_debug" {
    97     98   					set build_options(debug) 1
    98     99   				}
          100  +				"option_dynamictk" {
          101  +					set build_options(dynamictk) 1
          102  +				}
    99    103   				"option_storage" {
   100    104   					switch -- $args($arg) {
   101    105   						"mk4" - "zip" - "cvfs" {
   102    106   							set build_options(storage) $args($arg)
   103    107   						}
   104    108   					}
   105    109   				}
................................................................................
   320    324             <td>
   321    325   <?  foreach package [lsort -dictionary [array names packages]] { ?>
   322    326               <input type="checkbox" name="option_package_<? puts -nonewline $package ?>" id="option_package_<? puts -nonewline $package ?>">Package: <? puts -nonewline $packages($package) ?><br>
   323    327   <? } ?>
   324    328               <input type="checkbox" name="option_threaded">Kit: Threaded<br>
   325    329               <input type="checkbox" name="option_debug">Kit: Debugging Build<br>
   326    330               <input type="checkbox" name="option_kitdll" id="option_kitdll">Kit: Build Library (KitDLL)<br>
          331  +            <input type="checkbox" name="option_dynamictk" id="option_dynamictk">Kit: Always link Tk dynamically (if Tk is built)
   327    332             </td>
   328    333           </tr>
   329    334   	<tr>
   330    335   		<td>Kit Storage:</td>
   331    336   		<td>
   332    337   			<select name="option_storage">
   333    338   				<option value="auto">Automatically Determined</option>

Modified build/web/process_queue from [ad31dc7738] to [8bca0940c8].

    77     77   					lappend args "--enable-symbols"
    78     78   					set ::env(STRIP) true
    79     79   				}
    80     80   			}
    81     81   			"storage" {
    82     82   				lappend args "--enable-kit-storage=$value"
    83     83   			}
    84         -			"staticmk4" {
           84  +			"dynamictk" {
           85  +				set ::env(STATICTK) -1
    85     86   			}
    86         -			"statictk" {
           87  +			"staticmk4" {
    87     88   			}
    88     89   		}
    89     90   	}
    90     91   
    91     92   	catch {
    92     93   		exec ./build/pre.sh
    93     94   	}
................................................................................
   100    101   		set cmd [list $script $buildinfo(tcl_version) {*}$args]
   101    102   		set fd [open "${outfile}.log" w+]
   102    103   		puts $fd "Running: export KITCREATOR_PKGS=\"$::env(KITCREATOR_PKGS)\""
   103    104   
   104    105   		if {[info exists ::env(STRIP)]} {
   105    106   			puts $fd "Running: export STRIP=\"$::env(STRIP)\""
   106    107   		}
          108  +		if {[info exists ::env(STATICTK)]} {
          109  +			puts $fd "Running: export STATICTK=\"$::env(STATICTK)\""
          110  +		}
   107    111   
   108    112   		puts $fd "Running: $cmd"
   109    113   		close $fd
   110    114   	}
   111    115   
   112    116   	catch {
   113    117   		exec {*}$cmd >> "${outfile}.log" 2>@1