Check-in [1a0dc6637d]
Overview
Comment:Updated to support disabling KitDLL
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:1a0dc6637d1eab9fc191453d1ef6dcc4bc0895e4
User & Date: rkeene on 2014-08-31 20:14:25
Other Links: manifest | tags
Context
2014-09-02
17:24
Clarified STATICMK4 notes in KitDLL check-in: fdef98f710 user: rkeene tags: trunk
2014-08-31
20:14
Updated to support disabling KitDLL check-in: 1a0dc6637d user: rkeene tags: trunk
19:57
Updated to build static, statically check-in: 529d975d29 user: rkeene tags: trunk
Changes

Modified build/web/kitcreator.vfs/index.rvt from [be27aa6090] to [3fb6bd8a35].

    43     43   	set packages(tcc4tcl) "tcc4tcl"
    44     44   	set packages(tls) TLS
    45     45   	set packages(dbus) D-BUS
    46     46   	set packages(tclx) TclX
    47     47   	set packages(itcl) {[incr Tcl]}
    48     48   
    49     49   	set disable {
    50         -		platform linux-mipsel {tk tcc4tcl}
    51         -		platform android-arm tk
    52         -		platform netbsd-amd64 {tk tcc4tcl}
    53         -		platform netbsd-i386 {tk tcc4tcl}
    54         -		platform solaris-sparc tcc4tcl
    55         -		platform solaris-sparc64 tcc4tcl
    56         -		platform hpux-hppa64 tcc4tcl
    57         -		platform linux-arm tk
    58         -		platform linux-amd64-static {tk dbus}
    59         -		platform linux-i386-static {tk dbus}
           50  +		platform linux-mipsel {package_tk package_tcc4tcl kitdll}
           51  +		platform android-arm package_tk
           52  +		platform netbsd-amd64 {package_tk package_tcc4tcl}
           53  +		platform netbsd-i386 {package_tk package_tcc4tcl}
           54  +		platform solaris-sparc package_tcc4tcl
           55  +		platform solaris-sparc64 package_tcc4tcl
           56  +		platform hpux-hppa64 package_tcc4tcl
           57  +		platform linux-arm package_tk
           58  +		platform linux-amd64-static {package_tk package_dbus kitdll}
           59  +		platform linux-i386-static {package_tk package_dbus kitdll}
    60     60   	}
    61     61   
    62     62   	set specific {
    63     63   		platform win32 file icon {Kit Icon}
    64     64   		platform win32 text description {Description}
    65     65   		platform win64 file icon {Kit Icon}
    66     66   		platform win64 text description {Description}
................................................................................
   207    207   <?
   208    208   	} else {
   209    209   ?><html>
   210    210     <head>
   211    211       <title>KitCreator, Web Interface</title>
   212    212       <script>
   213    213   <!--
   214         -	function enablePackage(package) {
          214  +	function enableOption(option) {
   215    215   		var obj;
   216    216   
   217         -		obj = document.getElementById('option_package_' + package);
          217  +		obj = document.getElementById('option_' + option);
   218    218   		obj.disabled = false;
   219    219   	}
   220    220   
   221         -	function disablePackage(package) {
          221  +	function disableOption(option) {
   222    222   		var obj;
   223    223   
   224         -		obj = document.getElementById('option_package_' + package);
          224  +		obj = document.getElementById('option_' + option);
   225    225   		obj.checked = false;
   226    226   		obj.disabled = true;
   227    227   	}
   228    228   
   229    229   	function verifyOptions() {
   230    230   		var kitcreator_version;
   231    231   		var tcl_version;
................................................................................
   232    232   		var platform;
   233    233   
   234    234   		kitcreator_version = document.getElementsByName('kitcreator_version')[0].value;
   235    235   		tcl_version = document.getElementsByName('tcl_version')[0].value;
   236    236   		platform = document.getElementsByName('platform')[0].value;
   237    237   
   238    238   <?
   239         -		set alldisabledpackages [list]
   240         -		foreach {keyword value disablepackages} $disable {
   241         -			foreach package $disablepackages {
   242         -				if {[lsearch -exact $alldisabledpackages $package] == -1} {
   243         -					lappend alldisabledpackages $package
          239  +		set alldisabledoptions [list]
          240  +		foreach {keyword value disableoptions} $disable {
          241  +			foreach option $disableoptions {
          242  +				if {[lsearch -exact $alldisabledoptions $option] == -1} {
          243  +					lappend alldisabledoptions $option
   244    244   				}
   245    245   			}
   246    246   		}
   247    247   
   248         -		foreach package $alldisabledpackages {
   249         -			puts "\t\tenablePackage(\"$package\");"
          248  +		foreach option $alldisabledoptions {
          249  +			puts "\t\tenableOption(\"$option\");"
   250    250   		}
   251    251   
   252         -		foreach {keyword value disablepackages} $disable {
          252  +		foreach {keyword value disableoptions} $disable {
   253    253   			puts "\t\tif ($keyword == \"$value\") \{"
   254    254   
   255         -			foreach package $disablepackages {
   256         -				puts "\t\t\tdisablePackage(\"$package\");"
          255  +			foreach option $disableoptions {
          256  +				puts "\t\t\tdisableOption(\"$option\");"
   257    257   			}
   258    258   
   259    259   			puts "\t\t\}"
   260    260   		}
   261    261   ?>
   262    262   	}
   263    263   -->
................................................................................
   317    317             <td>Kit Options:</td>
   318    318             <td>
   319    319   <?  foreach package [lsort -dictionary [array names packages]] { ?>
   320    320               <input type="checkbox" name="option_package_<? puts -nonewline $package ?>" id="option_package_<? puts -nonewline $package ?>">Package: <? puts -nonewline $packages($package) ?><br>
   321    321   <? } ?>
   322    322               <input type="checkbox" name="option_threaded">Kit: Threaded<br>
   323    323               <input type="checkbox" name="option_debug">Kit: Debugging Build<br>
   324         -            <input type="checkbox" name="option_kitdll">Kit: Build Library (KitDLL)<br>
          324  +            <input type="checkbox" name="option_kitdll" id="option_kitdll">Kit: Build Library (KitDLL)<br>
   325    325             </td>
   326    326           </tr>
   327    327   	<tr>
   328    328   		<td>Kit Storage:</td>
   329    329   		<td>
   330    330   			<select name="option_storage">
   331    331   				<option value="auto">Automatically Determined</option>