Overview
| Comment: | Fixed issue with kitcreator including excluded packages after building with
them and then building without them
Fixed issue with Tcl pure-Tcl Metakit and Tcl 8.4 |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: | 32589cdef266b4d40a80d5ebf0eaaf30b7a40868 |
| User & Date: | rkeene on 2010-09-26 04:41:40 |
| Other Links: | manifest | tags |
Context
|
2010-09-26
| ||
| 04:41 | Fixed typo in previous commit check-in: 12229dcfc4 user: rkeene tags: trunk | |
| 04:41 |
Fixed issue with kitcreator including excluded packages after building with
them and then building without them
Fixed issue with Tcl pure-Tcl Metakit and Tcl 8.4 check-in: 32589cdef2 user: rkeene tags: trunk | |
| 04:41 | Added support for specifying a list of optional packages check-in: a8386e13ed user: rkeene tags: trunk | |
Changes
Modified kitcreator from [fd4b02e79e] to [69556eb898].
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
..
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
|
if echo "$1" | grep '^[0-9][0-9]*\.' >/dev/null || echo "$1" | grep '^cvs_' >/dev/null; then TCLVERS="$1" shift fi export TCLVERS # Add packages implied by the additional arguments if [ -z "${KITCREATOR_PKGS}" ]; then KITCREATOR_PKGS="tk itcl mk4tcl" fi mode="build" if [ "$1" = "clean" ]; then shift mode="clean" fi if [ "$1" = "distclean" ]; then shift mode="distclean" fi if [ "${mode}" = "clean" -o "${mode}" = "distclean" ]; then # List all additional packages here so that they get cleaned up KITCREATOR_PKGS="${KITCREATOR_PKGS} thread" fi CONFIGUREEXTRA="$@" export CONFIGUREEXTRA if echo " ${CONFIGUREEXTRA} " | grep ' --enable-threads' >/dev/null 2>/dev/null; then KITCREATOR_PKGS="${KITCREATOR_PKGS} thread" ................................................................................ failedpkgs="" buildfailed="0" for pkg in tcl tclvfs zlib ${KITCREATOR_PKGS} kitsh; do if [ "${mode}" = "distclean" ]; then rm -rf "${pkg}/src" fi if [ "${mode}" = "clean" -o "${mode}" = "distclean" ]; then rm -f "${pkg}/build.log" rm -rf "${pkg}/out" "${pkg}/inst" "${pkg}/build" continue fi echo -n "Building ${pkg} ..." failed="0" ( cd "${pkg}" >/dev/null 2>/dev/null || exit 1 ./build.sh > build.log 2>&1 || exit 1 |
|
<
<
<
<
>
>
>
>
>
>
>
>
>
>
>
>
<
>
>
>
>
|
>
<
<
<
<
<
<
<
|
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
..
52
53
54
55
56
57
58
59
60
61
62
63
64
65
|
if echo "$1" | grep '^[0-9][0-9]*\.' >/dev/null || echo "$1" | grep '^cvs_' >/dev/null; then TCLVERS="$1" shift fi export TCLVERS # Determine appropriate mode mode="build" if [ "$1" = "clean" ]; then shift mode="clean" fi if [ "$1" = "distclean" ]; then shift mode="distclean" fi # Define the list of all packages, for cleaning purposes KITCREATOR_ALLPKGS="tcl tclvfs zlib tk itcl mk4tcl threads" for pkg in ${KITCREATOR_ALLPKGS}; do rm -f "${pkg}/build.log" rm -rf "${pkg}/out" "${pkg}/inst" "${pkg}/build" if [ "${mode}" = "distclean" ]; then rm -rf "${pkg}/src" fi done # We're all done if we're in clean or distclean mode if [ "${mode}" = "clean" -o "${mode}" = "distclean" ]; then exit 0 fi # Add packages implied by the additional arguments if [ -z "${KITCREATOR_PKGS}" ]; then KITCREATOR_PKGS="tk itcl mk4tcl" fi CONFIGUREEXTRA="$@" export CONFIGUREEXTRA if echo " ${CONFIGUREEXTRA} " | grep ' --enable-threads' >/dev/null 2>/dev/null; then KITCREATOR_PKGS="${KITCREATOR_PKGS} thread" ................................................................................ failedpkgs="" buildfailed="0" for pkg in tcl tclvfs zlib ${KITCREATOR_PKGS} kitsh; do if [ "${mode}" = "distclean" ]; then rm -rf "${pkg}/src" fi echo -n "Building ${pkg} ..." failed="0" ( cd "${pkg}" >/dev/null 2>/dev/null || exit 1 ./build.sh > build.log 2>&1 || exit 1 |
Modified kitsh/buildsrc/kitsh-0.0/mk4tcl.tcl from [77305dd8a0] to [0c7aa42b6c].
2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 |
# ReadKit, a viewer/extractor/converter for starkits which does not
# require TclKit or MetaKit. This file was generated by "rkgen.tcl".
#
# June 2002, Jean-Claude Wippler <jcw@equi4.com>
# this is needed so often that I just drop copies of it all over the place
if {![info exists auto_index(lassign)] && [info commands lassign] == ""} {
set auto_index(lassign) {
proc lassign {l args} {
foreach v $l a $args { uplevel 1 [list set $a $v] }
}
}
}
catch {
load {} zlib
package require zlib
}
|
< | | < |
2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 |
# ReadKit, a viewer/extractor/converter for starkits which does not
# require TclKit or MetaKit. This file was generated by "rkgen.tcl".
#
# June 2002, Jean-Claude Wippler <jcw@equi4.com>
# this is needed so often that I just drop copies of it all over the place
if {![info exists auto_index(lassign)] && [info commands lassign] == ""} {
proc lassign {l args} {
foreach v $l a $args { uplevel 1 [list set $a $v] }
}
}
catch {
load {} zlib
package require zlib
}
|