Check-in [dea912723e]
Overview
SHA1:dea912723ea624765ee3c883be5cba2272d1dc11
Date: 2014-07-20 15:56:10
User: rkeene
Comment:Added storage option and printing of build command
Timelines: family | ancestors | descendants | both | trunk
Downloads: Tarball | ZIP archive
Other Links: files | file ages | folders | manifest
Tags And Properties
Context
2014-07-20
16:15
[9a27037143] Added support for a debug build (user: rkeene, tags: trunk)
15:56
[dea912723e] Added storage option and printing of build command (user: rkeene, tags: trunk)
15:23
[541903ae15] Updated to include log if available (user: rkeene, tags: trunk)
Changes

Modified build/web/kitcreator.vfs/index.rvt from [1d7c1123ef] to [c8faa1ee8b].

80
81
82
83
84
85
86







87
88
89
90
91
92
93
...
302
303
304
305
306
307
308











309
310
311
312
313
314
315
				}
				"option_threaded" {
					set build_options(threaded) 1
				}
				"option_kitdll" {
					set build_options(kitdll) 1
				}







			}
		}
		set build_packages [lsort -dictionary $build_packages]

		# Validate arguments
		if {![info exists platforms($build_platform)]} {
			unset build_platform
................................................................................
<?  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_kitdll">Kit: Build Library (KitDLL)<br>
          </td>
        </tr>











<!--
        <tr>
          <td>Kit Icon:</td>
          <td>
            <input type="file" name="option_icon">
          </td>
        </tr>







>
>
>
>
>
>
>







 







>
>
>
>
>
>
>
>
>
>
>







80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
...
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
				}
				"option_threaded" {
					set build_options(threaded) 1
				}
				"option_kitdll" {
					set build_options(kitdll) 1
				}
				"option_storage" {
					switch -- $args($arg) {
						"mk4" - "zip" - "cvfs" {
							set build_options(storage) $args($arg)
						}
					}
				}
			}
		}
		set build_packages [lsort -dictionary $build_packages]

		# Validate arguments
		if {![info exists platforms($build_platform)]} {
			unset build_platform
................................................................................
<?  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_kitdll">Kit: Build Library (KitDLL)<br>
          </td>
        </tr>
	<tr>
		<td>Kit Storage:</td>
		<td>
			<select name="option_storage">
				<option value="auto">Automatically Determined</option>
				<option value="mk4">Metakit</option>
				<option value="zip">Zip</option>
				<option value="cvfs">C-VFS</option>
			</select>
		</td>
	</tr>
<!--
        <tr>
          <td>Kit Icon:</td>
          <td>
            <input type="file" name="option_icon">
          </td>
        </tr>

Modified build/web/process_queue from [02e30b0d8d] to [15e2d8c10c].

66
67
68
69
70
71
72







73
74
75
76
77
78
79
80



81
82
83
84
85
86
87
			"threaded" {
				if {$value} {
					lappend args "--enable-threads"
				} else {
					lappend args "--disable-threads"
				}
			}







		}
	}

	catch {
		exec ./build/pre.sh
	}

	catch {



		exec $script $buildinfo(tcl_version) {*}$args > "${outfile}.log" 2>@1
	}

	catch {
		exec grep ^ {*}[glob */build.log] >> "${outfile}.log"
	}








>
>
>
>
>
>
>








>
>
>







66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
			"threaded" {
				if {$value} {
					lappend args "--enable-threads"
				} else {
					lappend args "--disable-threads"
				}
			}
			"storage" {
				lappend args "--enable-kit-storage=$value"
			}
			"staticmk4" {
			}
			"statictk" {
			}
		}
	}

	catch {
		exec ./build/pre.sh
	}

	catch {
		set fd [open "${outfile}.log" w]
		puts $fd "Running: [list $script $buildinfo(tcl_version) {*}$args]"
		close $fd
		exec $script $buildinfo(tcl_version) {*}$args > "${outfile}.log" 2>@1
	}

	catch {
		exec grep ^ {*}[glob */build.log] >> "${outfile}.log"
	}