Changeset 59323be in tol

Timestamp:

Dec 15, 2015, 1:10:30 PM (11 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

da2804ff

Parents:

ada6d64

Message:

fixes #1903, nos apoyamos en un script auxiliar para que tk se inicialice en modo no interactivo, para ello hacemos uso de la función Tcl_SetStartupScript, por ahora WIN32 sigue como antes pero hay que validar como responde cuando se invoca con argumentos por linea de comandos, cambiamos /bin/sh por /bin/bash

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@7119 be4846ae-f051-483a-831f-b64e7d08527f

Location:

tolbase

Files:

• bin/CMakeLists.txt (modified) (1 diff)
• bin/tolbase.sh (modified) (2 diffs)
• bin/tolbase.tcl (added)
• generic/tolbase.c (modified) (4 diffs)

tolbase/bin/CMakeLists.txt

@@ -5 +5 @@
                 GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE
                 WORLD_EXECUTE )
+install( FILES tolbase.tcl DESTINATION "bin"
+    PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ 
+                GROUP_WRITE WORLD_READ WORLD_WRITE )

tolbase/bin/tolbase.sh

@@ -1 @@
-#!/bin/sh
+#!/bin/bash
 # Shell wrapper for TOL executable.
 
@@ -12 +12 @@
 fi
 
-exec ${SCRIPTPATH}/tolbase "${@}"
+#TFILE="/tmp/$(basename $0).$$.tmp.tcl"
+#echo lappend auto_path file normalize [file join [ file dir [info script] ] .. lib ] ]
+#echo package require TolbaseApp > ${TFILE}
+#echo after idle {file delete ${TFILE}} >> ${TFILE}
+
+${SCRIPTPATH}/tolbase ${SCRIPTPATH}/tolbase.tcl "${@}"

tolbase/generic/tolbase.c

@@ -16 +16 @@
 #ifdef WIN32
 #include <windows.h>
+#endif
+
+// Tcl_SetStartupScript
+#if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION <= 5
+//#include "tclIntDecls.h"
 #endif
 
@@ -130 +135 @@
         return TCL_ERROR;
     }
-    Tcl_StaticPackage(interp, "Tk", Tk_Init, Tk_SafeInit);
-#ifdef TK_TEST
-    if (Tktest_Init(interp) == TCL_ERROR) {
-        return TCL_ERROR;
-    }
-    Tcl_StaticPackage(interp, "Tktest", Tktest_Init,
-            (Tcl_PackageInitProc *) NULL);
-#endif /* TK_TEST */
+    // Tcl_StaticPackage(interp, "Tk", Tk_Init, Tk_SafeInit);
 
 
@@ -163 +161 @@
      */
 
+#if defined(WIN32)
     SetupArgv( interp );
     Tcl_VarEval( interp, "lappend", " auto_path", " [file join",
@@ -173 +172 @@
       }
     //Tcl_PkgRequire( interp, "TolbaseApp", TOLBASE_VERSION, 1);
+#else
+    const char* exeName = Tcl_GetNameOfExecutable();
+    Tcl_VarEval( interp, "file join",
+                 " [ file dir ", Tcl_GetNameOfExecutable(),
+                 " ] tolbase.tcl", NULL );
+    Tcl_Obj *objPath = Tcl_GetObjResult( interp );
+    Tcl_SetStartupScript( Tcl_GetObjResult( interp ), NULL ); 
+#endif
     return TCL_OK;
 }