Check-in [070af23daa]
Overview
Comment:Added support for building pkgs directory statically to KitCreator Web UI
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:070af23daa5fc28f2f6ce6fb48b583e3c8a6ec95
User & Date: rkeene on 2016-03-07 20:27:06
Other Links: manifest | tags
Context
2016-03-07
20:27
Fixed typo in last commit check-in: 341b02a3b1 user: rkeene tags: trunk
20:27
Added support for building pkgs directory statically to KitCreator Web UI check-in: 070af23daa user: rkeene tags: trunk
04:42
Added Tcl 8.6.5 everywhere check-in: bd11da21e3 user: rkeene tags: trunk
Changes

Modified build/web/building.cgi from [ceea8a8659] to [c7e1a0c441].

    69     69   					append description ", Without Tcl pkgs/ and all encodings"
    70     70   				}
    71     71   			}
    72     72   			"staticlibssl" {
    73     73   				if {$value} {
    74     74   					append description ", Statically linked to LibSSL"
    75     75   				}
           76  +			}
           77  +			"staticpkgs" {
           78  +				if {$value} {
           79  +					append description ", With Tcl 8.6+ pkgs/ directory all packages statically linked in"
           80  +				}
    76     81   			}
    77     82   			"storage" {
    78     83   				switch -- $value {
    79     84   					"mk4" {
    80     85   						append description ", Metakit-based"
    81     86   					}
    82     87   					"zip" {

Modified build/web/kitcreator.vfs/index.rvt from [67294d073d] to [3549fd9d4a].

   120    120   				}
   121    121   				"option_minbuild" {
   122    122   					set build_options(minbuild) 1
   123    123   				}
   124    124   				"option_staticlibssl" {
   125    125   					set build_options(staticlibssl) 1
   126    126   				}
          127  +				"option_staticpkgs" {
          128  +					set build_options(staticpkgs) 1
          129  +				}
   127    130   				"option_storage" {
   128    131   					switch -- $args($arg) {
   129    132   						"mk4" - "zip" - "cvfs" {
   130    133   							set build_options(storage) $args($arg)
   131    134   						}
   132    135   					}
   133    136   				}
................................................................................
   360    363   <? } ?>
   361    364               <input type="checkbox" name="option_threaded">Kit: Threaded<br>
   362    365               <input type="checkbox" name="option_debug">Kit: Debugging Build<br>
   363    366               <input type="checkbox" name="option_kitdll" id="option_kitdll">Kit: Build Library (KitDLL)<br>
   364    367               <input type="checkbox" name="option_dynamictk" id="option_dynamictk">Kit: Always link Tk dynamically (if Tk is built)<br>
   365    368               <input type="checkbox" name="option_minbuild">Kit: "Minimal" build (remove extra packages shipped as part of Tcl and reduce encodings)<br>
   366    369               <input type="checkbox" name="option_staticlibssl">TLS: Statically link to LibSSL
          370  +            <input type="checkbox" name="option_staticpkgs">Kit: Statically link packages in pkgs directory
   367    371             </td>
   368    372           </tr>
   369    373   	<tr>
   370    374   		<td>Kit Storage:</td>
   371    375   		<td>
   372    376   			<select name="option_storage">
   373    377   				<option value="auto">Automatically Determined</option>

Modified build/web/process_queue from [213ef78771] to [7535fa5b61].

   104    104   					set ::env(KITCREATOR_MINBUILD) 1
   105    105   				}
   106    106   			}
   107    107   			"staticlibssl" {
   108    108   				if {$value} {
   109    109   					set ::env(KC_TLS_LINKSSLSTATIC) 1
   110    110   				}
          111  +			}
          112  +			"staticpkgs" {
          113  +				if {$value} {
          114  +					set ::env(KC_TCL_STATICPKGS) 1
          115  +				}
   111    116   			}
   112    117   			"staticmk4" {
   113    118   			}
   114    119   		}
   115    120   	}
   116    121   
   117    122   	catch {
................................................................................
   123    128   	}
   124    129   
   125    130   	catch {
   126    131   		set cmd [list $script $buildinfo(tcl_version) {*}$args]
   127    132   		set fd [open "${outfile}.log" w+]
   128    133   		puts $fd "Running: export KITCREATOR_PKGS=\"$::env(KITCREATOR_PKGS)\""
   129    134   
   130         -		foreach variable [list STRIP STATICTK KITCREATOR_MINENCODINGS KITCREATOR_MINBUILD KC_TLS_LINKSSLSTATIC] {
          135  +		foreach variable [list STRIP STATICTK KITCREATOR_MINENCODINGS KITCREATOR_MINBUILD KC_TLS_LINKSSLSTATIC KC_TCL_STATICPKGS] {
   131    136   			if {[info exists ::env($variable)]} {
   132    137   				puts $fd "Running: export $variable=\"$::env($variable)\""
   133    138   			}
   134    139   		}
   135    140   
   136    141   		puts $fd "Running: $cmd"
   137    142   		close $fd