Overview
Comment: | More work on consolidating KitSH and KitDLL and supporting C-VFS |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | merge-kitdll-kitsh-common |
Files: | files | file ages | folders |
SHA1: |
df550ab43e08326bab54c4eafc7625a8 |
User & Date: | rkeene on 2011-05-23 03:14:38 |
Other Links: | branch diff | manifest | tags |
Context
2011-05-23
| ||
10:53 | Integrated KitDLL into KitSH check-in: a1a14e0aba user: rkeene tags: merge-kitdll-kitsh-common | |
03:14 | More work on consolidating KitSH and KitDLL and supporting C-VFS check-in: df550ab43e user: rkeene tags: merge-kitdll-kitsh-common | |
2011-05-21
| ||
15:57 | Added file missing from last commit check-in: ef0c50058f user: rkeene tags: merge-kitdll-kitsh-common | |
Changes
Modified kitsh/buildsrc/kitsh-0.0/Makefile.common.in from [b5f1011747] to [3d3c56cfe6].
|
Modified kitsh/buildsrc/kitsh-0.0/Makefile.kitdll.in from [9cd9dc1edd] to [d50a3331ee].
| 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 | - - - - - - - - - - - - - - - - - - - - - + - + - - - - - - - - - - - - - - - - - - - |
|
Modified kitsh/buildsrc/kitsh-0.0/Makefile.tclkit.in from [2493fcdddc] to [fe7827b4fe].
| 1 2 3 4 5 6 7 8 | - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - |
|
Modified kitsh/buildsrc/kitsh-0.0/aclocal.m4 from [c050f768b5] to [4ab5fc6711].
︙ | |||
164 165 166 167 168 169 170 171 172 173 174 175 176 177 | 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 | + + + | ARCHS="${ARCHS} ${libfiles}" AC_MSG_RESULT([${libfiles}]) if test "${libfilesnostub}" != ""; then if test "${proj}" = "mk4tcl"; then AC_DEFINE(KIT_INCLUDES_MK4TCL, [1], [Specify this if you link against mkt4tcl]) kc_cv_feature_kit_includes_mk4tcl='1' DC_DO_STATIC_LINK_LIBCXX fi if test "${proj}" = "tk"; then DC_DO_TK AC_DEFINE(KIT_INCLUDES_TK, [1], [Specify this if we link statically to Tk]) if test -n "${TK_VERSION}"; then AC_DEFINE_UNQUOTED(KIT_TK_VERSION, "${TK_VERSION}${TK_PATCH_LEVEL}", [Specify the version of Tk]) |
︙ |
Modified kitsh/buildsrc/kitsh-0.0/configure.ac from [c9dbeb54a1] to [a84d1ae23f].
1 2 3 4 5 6 7 8 9 10 11 12 13 14 | 1 2 3 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 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 | + - - + + - - + + - - + - - + + - + - + + + + - + - - + + - - + + | dnl What are we running AC_INIT(kitsh, 0.0) dnl Checks for programs. AC_PROG_CC AC_PROG_MAKE_SET AC_PROG_INSTALL AC_AIX AC_GNU_SOURCE dnl Find out if we should build a DLL or an Executable TARGET="tclkit" EXTRA_KIT_DEPS="" AC_MSG_CHECKING([what target to build]) AC_ARG_ENABLE(kitdll, AC_HELP_STRING([--enable-kitdll], [Enable building KitDLL instead of Tclkit (default: no)]), [ |
︙ | |||
96 97 98 99 100 101 102 | 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 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 | - + - + - - + + - + - - - + - + - - - + - + - - - + - - + + - - + + - - + + + + + - - - + + + + + + + + + + + + + + + - + - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - + | AC_ARG_WITH(zlib, AC_HELP_STRING([--with-zlib], [directory containing zlib]), [ CPPFLAGS="${CPPFLAGS} -I${with_zlib}/include -I${with_zlib}" CFLAGS="${CFLAGS} -I${with_zlib}/include -I${with_zlib}" LDFLAGS="${LDFLAGS} -L${with_zlib}/lib -L${with_zlib}" ]) dnl Only needed for Tclkit |
Modified kitsh/buildsrc/kitsh-0.0/installvfs.tcl from [d2ae77312e] to [2fb8a7d1f7].
︙ | |||
11 12 13 14 15 16 17 | 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 | - - - - - - - - - | set kitfile [lindex $argv 0] set vfsdir [lindex $argv 1] if {[lindex $argv 2] != ""} { set opt_compression [lindex $argv 2] } # Determine what storage mechanism is being used |
︙ | |||
116 117 118 119 120 121 122 123 | 107 108 109 110 111 112 113 114 115 116 117 118 | + + - + + | if {[catch { close $zipfd } err]} { puts stderr "Error while updating executable: $err" exit 1 } } "cvfs" { # No-op |
Modified kitsh/buildsrc/kitsh-0.0/kitInit.c from [dd6f45df03] to [ae720616f1].
︙ | |||
57 58 59 60 61 62 63 | 57 58 59 60 61 62 63 64 65 66 67 68 69 70 | - - - - - - - - - - - - - - - - - - - - - - - | #if 10 * TCL_MAJOR_VERSION + TCL_MINOR_VERSION < 85 # define KIT_INCLUDES_PWB 1 #endif #if 10 * TCL_MAJOR_VERSION + TCL_MINOR_VERSION < 86 # define KIT_INCLUDES_ZLIB 1 #endif |
︙ |