Overview
Comment: | Added web interface knob for statically linking to LibSSL |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
1c335dfe360b3c811cdb53a6b5e824bb |
User & Date: | rkeene on 2015-01-20 19:16:23 |
Other Links: | manifest | tags |
Context
2015-01-29
| ||
14:30 | Updated to set default Tcl version to latest check-in: 028aff64c2 user: rkeene tags: trunk | |
2015-01-20
| ||
19:16 | Added web interface knob for statically linking to LibSSL check-in: 1c335dfe36 user: rkeene tags: trunk | |
19:10 | Added better hack for linking to SSL library statically check-in: 33b255b77a user: rkeene tags: trunk | |
Changes
Modified build/web/building.cgi from [a012cc8bc9] to [ceea8a8659].
︙ | ︙ | |||
42 43 44 45 46 47 48 | switch -- $option { "kitdll" { if {$value} { append description ", Built as a Library" } } "dynamictk" { | > | | > > > > > > | 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 | switch -- $option { "kitdll" { if {$value} { append description ", Built as a Library" } } "dynamictk" { if {$value} { if {[lsearch -exact $buildinfo(packages) "tk"] != -1} { append description ", Forced Tk Dynamic Linking" } } } "threaded" { if {$value} { append description ", Threaded" } else { append description ", Unthreaded" } } "debug" { if {$value} { append description ", With Symbols" } } "minbuild" { if {$value} { append description ", Without Tcl pkgs/ and all encodings" } } "staticlibssl" { if {$value} { append description ", Statically linked to LibSSL" } } "storage" { switch -- $value { "mk4" { append description ", Metakit-based" } "zip" { |
︙ | ︙ |
Modified build/web/kitcreator.vfs/index.rvt from [f2fd1993e0] to [3a64763ae0].
︙ | ︙ | |||
104 105 106 107 108 109 110 111 112 113 114 115 116 117 | } "option_dynamictk" { set build_options(dynamictk) 1 } "option_minbuild" { set build_options(minbuild) 1 } "option_storage" { switch -- $args($arg) { "mk4" - "zip" - "cvfs" { set build_options(storage) $args($arg) } } } | > > > | 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 | } "option_dynamictk" { set build_options(dynamictk) 1 } "option_minbuild" { set build_options(minbuild) 1 } "option_staticlibssl" { set build_options(staticlibssl) 1 } "option_storage" { switch -- $args($arg) { "mk4" - "zip" - "cvfs" { set build_options(storage) $args($arg) } } } |
︙ | ︙ | |||
333 334 335 336 337 338 339 | <? foreach package [lsort -dictionary [array names packages]] { ?> <input type="checkbox" name="option_package_<? puts -nonewline $package ?>" id="option_package_<? puts -nonewline $package ?>">Package: <? puts -nonewline $packages($package) ?><br> <? } ?> <input type="checkbox" name="option_threaded">Kit: Threaded<br> <input type="checkbox" name="option_debug">Kit: Debugging Build<br> <input type="checkbox" name="option_kitdll" id="option_kitdll">Kit: Build Library (KitDLL)<br> <input type="checkbox" name="option_dynamictk" id="option_dynamictk">Kit: Always link Tk dynamically (if Tk is built)<br> | | > | 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 | <? foreach package [lsort -dictionary [array names packages]] { ?> <input type="checkbox" name="option_package_<? puts -nonewline $package ?>" id="option_package_<? puts -nonewline $package ?>">Package: <? puts -nonewline $packages($package) ?><br> <? } ?> <input type="checkbox" name="option_threaded">Kit: Threaded<br> <input type="checkbox" name="option_debug">Kit: Debugging Build<br> <input type="checkbox" name="option_kitdll" id="option_kitdll">Kit: Build Library (KitDLL)<br> <input type="checkbox" name="option_dynamictk" id="option_dynamictk">Kit: Always link Tk dynamically (if Tk is built)<br> <input type="checkbox" name="option_minbuild">Kit: "Minimal" build (remove extra packages shipped as part of Tcl and reduce encodings)<br> <input type="checkbox" name="option_staticlibssl">TLS: Statically link to LibSSL </td> </tr> <tr> <td>Kit Storage:</td> <td> <select name="option_storage"> <option value="auto">Automatically Determined</option> |
︙ | ︙ |
Modified build/web/process_queue from [83cf154aae] to [02c92ac8e0].
︙ | ︙ | |||
87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 | } } "minbuild" { if {$value} { set ::env(KITCREATOR_MINENCODINGS) 1 set ::env(KITCREATOR_MINBUILD) 1 } } "staticmk4" { } } } catch { exec ./build/pre.sh } catch { file delete "${outfile}.log" } catch { set cmd [list $script $buildinfo(tcl_version) {*}$args] set fd [open "${outfile}.log" w+] puts $fd "Running: export KITCREATOR_PKGS=\"$::env(KITCREATOR_PKGS)\"" | > > > > > | | 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 | } } "minbuild" { if {$value} { set ::env(KITCREATOR_MINENCODINGS) 1 set ::env(KITCREATOR_MINBUILD) 1 } } "staticlibssl" { if {$value} { set ::env(KC_TLS_LINKSSLSTATIC) 1 } } "staticmk4" { } } } catch { exec ./build/pre.sh } catch { file delete "${outfile}.log" } catch { set cmd [list $script $buildinfo(tcl_version) {*}$args] set fd [open "${outfile}.log" w+] puts $fd "Running: export KITCREATOR_PKGS=\"$::env(KITCREATOR_PKGS)\"" foreach variable [list STRIP STATICTK KITCREATOR_MINENCODINGS KITCREATOR_MINBUILD KC_TLS_LINKSSLSTATIC] { if {[info exists ::env($variable)]} { puts $fd "Running: export $variable=\"$::env($variable)\"" } } puts $fd "Running: $cmd" close $fd |
︙ | ︙ |