Overview
| Comment: | Updated to support static Tk on non-Windows platforms |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
70da02911018323d78cc5619a5834254 |
| User & Date: | rkeene on 2010-09-26 04:49:00 |
| Other Links: | manifest | tags |
Context
|
2010-09-26
| ||
| 04:49 |
Updated to invoke Xvfb with 24bpp depth to avoid segfault in FreeColormap()
Updated to invoke Xvfb in sub-shell to avoid bash message regarding the process being killed check-in: 3a9fc82d6e user: rkeene tags: trunk | |
| 04:49 | Updated to support static Tk on non-Windows platforms check-in: 70da029110 user: rkeene tags: trunk | |
| 04:48 |
Added support for starting Xvfb before beginning tests (to test Tk)
Added Tk test check-in: eaf3feab27 user: rkeene tags: trunk | |
Changes
Modified kitsh/buildsrc/kitsh-0.0/aclocal.m4 from [f592be87db] to [d6fff4a63c].
| ︙ | ︙ | |||
169 170 171 172 173 174 175 176 177 178 179 180 181 182 |
if test "${proj}" = "mk4tcl"; then
AC_DEFINE(KIT_INCLUDES_MK4TCL, [1], [Specify this if you link against mkt4tcl])
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 "$host_os" = "mingw32msvc" -o "$host_os" = "mingw32"; then
AC_DEFINE(KITSH_NEED_WINMAIN, [1], [Define if you need WinMain (Windows)])
CFLAGS="${CFLAGS} -mwindows"
fi
fi
fi
| > > > | 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 |
if test "${proj}" = "mk4tcl"; then
AC_DEFINE(KIT_INCLUDES_MK4TCL, [1], [Specify this if you link against mkt4tcl])
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])
fi
if test "$host_os" = "mingw32msvc" -o "$host_os" = "mingw32"; then
AC_DEFINE(KITSH_NEED_WINMAIN, [1], [Define if you need WinMain (Windows)])
CFLAGS="${CFLAGS} -mwindows"
fi
fi
fi
|
| ︙ | ︙ |
Modified kitsh/buildsrc/kitsh-0.0/kitInit.c from [04a2d744f1] to [daa56f5f14].
| ︙ | ︙ | |||
141 142 143 144 145 146 147 148 149 150 151 152 153 154 |
#endif /* KIT_STORAGE_ZIP */
"if {![info exists s]} {\n"
"set f [open setup.tcl]\n"
"set s [read $f]\n"
"close $f\n"
"}\n"
"uplevel #0 $s\n"
#ifdef _WIN32
"catch {load {} dde}\n"
"catch {load {} registry}\n"
#endif /* _WIN32 */
"return 0\n"
"}\n"
"tclKitInit";
| > > > > > > > > | 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 |
#endif /* KIT_STORAGE_ZIP */
"if {![info exists s]} {\n"
"set f [open setup.tcl]\n"
"set s [read $f]\n"
"close $f\n"
"}\n"
"uplevel #0 $s\n"
#if defined(KIT_INCLUDES_TK) && defined(KIT_TK_VERSION)
# ifndef _WIN32
"package ifneeded Tk " KIT_TK_VERSION " {\n"
"load {} Tk\n"
"package provide Tk " KIT_TK_VERSION "\n"
"}\n"
# endif
#endif
#ifdef _WIN32
"catch {load {} dde}\n"
"catch {load {} registry}\n"
#endif /* _WIN32 */
"return 0\n"
"}\n"
"tclKitInit";
|
| ︙ | ︙ |