Check-in [70da029110]
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:70da02911018323d78cc5619a58342544693fdea
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    169   			if test "${proj}" = "mk4tcl"; then
   170    170   				AC_DEFINE(KIT_INCLUDES_MK4TCL, [1], [Specify this if you link against mkt4tcl])
   171    171   				DC_DO_STATIC_LINK_LIBCXX
   172    172   			fi
   173    173   			if test "${proj}" = "tk"; then
   174    174   				DC_DO_TK
   175    175   				AC_DEFINE(KIT_INCLUDES_TK, [1], [Specify this if we link statically to Tk])
          176  +				if test -n "${TK_VERSION}"; then
          177  +					AC_DEFINE_UNQUOTED(KIT_TK_VERSION, "${TK_VERSION}${TK_PATCH_LEVEL}", [Specify the version of Tk])
          178  +				fi
   176    179   
   177    180   				if test "$host_os" = "mingw32msvc" -o "$host_os" = "mingw32"; then
   178    181   					AC_DEFINE(KITSH_NEED_WINMAIN, [1], [Define if you need WinMain (Windows)])
   179    182   					CFLAGS="${CFLAGS} -mwindows"
   180    183   				fi
   181    184   			fi
   182    185   		fi

Modified kitsh/buildsrc/kitsh-0.0/kitInit.c from [04a2d744f1] to [daa56f5f14].

   141    141   #endif /* KIT_STORAGE_ZIP */
   142    142   	"if {![info exists s]} {\n"
   143    143   		"set f [open setup.tcl]\n"
   144    144   		"set s [read $f]\n"
   145    145   		"close $f\n"
   146    146   	"}\n"
   147    147   	"uplevel #0 $s\n"
          148  +#if defined(KIT_INCLUDES_TK) && defined(KIT_TK_VERSION)
          149  +#  ifndef _WIN32
          150  +	"package ifneeded Tk " KIT_TK_VERSION " {\n"
          151  +		"load {} Tk\n"
          152  +		"package provide Tk " KIT_TK_VERSION "\n"
          153  +	"}\n"
          154  +#  endif
          155  +#endif
   148    156   #ifdef _WIN32
   149    157   	"catch {load {} dde}\n"
   150    158   	"catch {load {} registry}\n"
   151    159   #endif /* _WIN32 */
   152    160   	"return 0\n"
   153    161   "}\n"
   154    162   "tclKitInit";