Overview
Comment: | Updated to not reference "main" for KitDLL, which likely prevents getting the executable path |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
de3dbf5d8c8e90c114fea324dd2175bb |
User & Date: | rkeene on 2013-05-13 23:43:56 |
Other Links: | manifest | tags |
Context
2013-05-14
| ||
20:14 | Updated to produce "Android.mk" in the SDK if the compile looks like Android check-in: b0fcd7911d user: rkeene tags: trunk | |
2013-05-13
| ||
23:43 | Updated to not reference "main" for KitDLL, which likely prevents getting the executable path check-in: de3dbf5d8c user: rkeene tags: trunk | |
01:27 | Updated version numbers to test check-in: 037aa51865 user: rkeene tags: trunk | |
Changes
Modified kitsh/buildsrc/kitsh-0.0/kitInit.c from [0cfdc14cf7] to [9bfdc99cac].
︙ | ︙ | |||
87 88 89 90 91 92 93 | # define TCLKIT_MOUNTPOINT "/.KITDLL_TCL" # define TCLKIT_VFSSOURCE "$::tclKitFilename" #else # define TCLKIT_MOUNTPOINT "[info nameofexecutable]" # define TCLKIT_VFSSOURCE "[info nameofexecutable]" #endif /* TCLKIT_DLL */ | > | | | | | | | > | 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 | # define TCLKIT_MOUNTPOINT "/.KITDLL_TCL" # define TCLKIT_VFSSOURCE "$::tclKitFilename" #else # define TCLKIT_MOUNTPOINT "[info nameofexecutable]" # define TCLKIT_VFSSOURCE "[info nameofexecutable]" #endif /* TCLKIT_DLL */ #ifndef TCLKIT_DLL # ifdef HAVE_ACCEPTABLE_DLADDR # ifdef KITSH_NEED_WINMAIN # ifdef _WIN32_WCE int wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpszCmdLine, int nCmdShow); # else int WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpszCmdLine, int nCmdShow); # endif /* _WIN32_WCE */ # endif /* KITSH_NEED_WINMAIN */ int main(int argc, char **argv); # endif /* HAVE_ACCEPTABLE_DLADDR */ #endif /* !TCLKIT_DLL */ #ifdef TCLKIT_REQUIRE_TCLEXECUTABLENAME char *tclExecutableName; #endif /* * Attempt to load a "boot.tcl" entry from the embedded MetaKit file. |
︙ | ︙ | |||
295 296 297 298 299 300 301 | dladdr_ret = dladdr(&SetExecName, &syminfo); if (dladdr_ret != 0) { SetExecName(interp, syminfo.dli_fname); return; } } | < < | | | | | > | 297 298 299 300 301 302 303 304 305 306 307 308 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 334 335 | dladdr_ret = dladdr(&SetExecName, &syminfo); if (dladdr_ret != 0) { SetExecName(interp, syminfo.dli_fname); return; } } # ifdef KITSH_NEED_WINMAIN if (Tcl_GetNameOfExecutable() == NULL) { # ifdef _WIN32_WCE dladdr_ret = dladdr(&WinMain, &syminfo); # else dladdr_ret = dladdr(&wWinMain, &syminfo); # endif /* _WIN32_WCE */ if (dladdr_ret != 0) { SetExecName(interp, syminfo.dli_fname); return; } } # endif /* KITSH_NEED_WINMAIN */ if (Tcl_GetNameOfExecutable() == NULL) { dladdr_ret = dladdr(&main, &syminfo); if (dladdr_ret != 0) { SetExecName(interp, syminfo.dli_fname); return; } } # endif /* !TCLKIT_DLL */ #endif /* HAVE_ACCEPTABLE_DLADDR */ if (Tcl_GetNameOfExecutable() == NULL) { lobjv[0] = Tcl_GetVar2Ex(interp, "argv0", NULL, TCL_GLOBAL_ONLY); execNameObj = Tcl_FSJoinToPath(Tcl_FSGetCwd(interp), 1, lobjv); SetExecName(interp, Tcl_GetStringFromObj(execNameObj, &len)); |
︙ | ︙ |