diff options
| author | Steve Bennett <steveb@workware.net.au> | 2011-07-12 09:02:32 +1000 |
|---|---|---|
| committer | Steve Bennett <steveb@workware.net.au> | 2011-07-13 11:30:29 +1000 |
| commit | e7e3cedcbde855a2f22ee9eb830b62c45b543836 (patch) | |
| tree | 82d43014a41de21a813a0f7df3accd5ef26b6721 /jimsh.c | |
| parent | 539f52a07c94d769e51d046d71903e4a2505edd7 (diff) | |
| download | jimtcl-e7e3cedcbde855a2f22ee9eb830b62c45b543836.zip jimtcl-e7e3cedcbde855a2f22ee9eb830b62c45b543836.tar.gz jimtcl-e7e3cedcbde855a2f22ee9eb830b62c45b543836.tar.bz2 | |
Add tcl_platform(pathSeparator)
Tcl compatible.
Also move jimsh initialisation script into initjimsh.tcl
Signed-off-by: Steve Bennett <steveb@workware.net.au>
Diffstat (limited to 'jimsh.c')
| -rw-r--r-- | jimsh.c | 32 |
1 files changed, 3 insertions, 29 deletions
@@ -26,34 +26,8 @@ #include "jim.h" #include "jimautoconf.h" -/* Script to help initialise jimsh */ -static const char jimsh_init[] = \ -"proc _init {} {\n" -"\trename _init {}\n" -/* XXX This is a big ugly */ -#if defined(__MINGW32__) -"\tlappend p {*}[split [env JIMLIB {}] {;}]\n" -#else -"\tlappend p {*}[split [env JIMLIB {}] :]\n" -#endif -"\tlappend p {*}$::auto_path\n" -"\tlappend p [file dirname [info nameofexecutable]]\n" -"\tset ::auto_path $p\n" -"\n" -"\tif {$::tcl_interactive && [env HOME {}] ne \"\"} {\n" -"\t\tforeach src {.jimrc jimrc.tcl} {\n" -"\t\t\tif {[file exists [env HOME]/$src]} {\n" -"\t\t\t\tuplevel #0 source [env HOME]/$src\n" -"\t\t\t\tbreak\n" -"\t\t\t}\n" -"\t\t}\n" -"\t}\n" -"}\n" -/* XXX This is a big ugly */ -#if defined(__MINGW32__) -"set jim_argv0 [string map {\\\\ /} $jim_argv0]\n" -#endif -"_init\n"; +/* From initjimsh.tcl */ +extern int Jim_initjimshInit(Jim_Interp *interp); static void JimSetArgv(Jim_Interp *interp, int argc, char *const argv[]) { @@ -93,7 +67,7 @@ int main(int argc, char *const argv[]) Jim_SetVariableStrWithStr(interp, "jim_argv0", argv[0]); Jim_SetVariableStrWithStr(interp, JIM_INTERACTIVE, argc == 1 ? "1" : "0"); - retcode = Jim_Eval(interp, jimsh_init); + retcode = Jim_initjimshInit(interp); if (argc == 1) { if (retcode == JIM_ERR) { |