Changeset 41890bb in tol for toltcl

Timestamp:

Sep 18, 2015, 11:54:03 AM (11 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

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

Children:

9e177ec

Parents:

c987a37

Message:

refs #1866, tolsh cortocircuita el procesamiento de argv para evitar que tcl procese e interprete nuestras opciones de linea de comandos, se corrigen algunos aspectos de instalación en Linux

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

Location:

toltcl

Files:

• CMakeLists.txt (modified) (1 diff)
• generic/CMakeLists.txt (modified) (1 diff)
• generic/tolsh.c (modified) (3 diffs)
• library/tolsh.tcl (modified) (1 diff)

toltcl/CMakeLists.txt

@@ -55 +55 @@
   message( STATUS ${TCL_INCLUDE_PATH} )
   message( STATUS ${TCL_LIBRARY_PATH} )
-  get_filename_component( CMAKE_INSTALL_PREFIX ${TCL_LIBRARY_PATH} PATH )
+  if ( NOT CMAKE_INSTALL_PREFIX )
+    get_filename_component( CMAKE_INSTALL_PREFIX ${TCL_LIBRARY_PATH} PATH )
+  endif( )
   message( STATUS "Using CMAKE_INSTALL_PREFIX = ${CMAKE_INSTALL_PREFIX}" )
 else( TCL_FOUND )

toltcl/generic/CMakeLists.txt

@@ -32 +32 @@
   toltableset.cpp toltime.cpp
 )
+
+set_target_properties( toltcl PROPERTIES OUTPUT_NAME 
+  toltcl${TOLTCL_VERSION_MAJOR}.${TOLTCL_VERSION_MINOR} )
+
 set_target_properties( toltcl PROPERTIES COMPILE_FLAGS "-DBUILD_TOLTCL -DUSE_TCL_STUBS")
 

toltcl/generic/tolsh.c

@@ -1 +1 @@
 #include <tcl.h>
 #include "toltcl.h"
+
+static int g_argc = 0;
+static char **g_argv = NULL;
+
+static
+void SetupArgv( Tcl_Interp *interp )
+{
+  Tcl_Obj *argvPtr = Tcl_NewListObj(0, NULL);
+  int i;
+  for( i = 1; i < g_argc; i++ )
+    {
+      Tcl_DString ds;
+      Tcl_ExternalToUtfDString(NULL, g_argv[i], -1, &ds);
+      Tcl_ListObjAppendElement(NULL, argvPtr, 
+                               Tcl_NewStringObj(Tcl_DStringValue(&ds),
+                                                Tcl_DStringLength(&ds)));
+      Tcl_DStringFree(&ds);
+    }
+    Tcl_SetVar2Ex(interp, "argv", NULL, argvPtr, TCL_GLOBAL_ONLY);
+    Tcl_SetVar2Ex(interp, "argc", NULL, Tcl_NewIntObj(g_argc-1), TCL_GLOBAL_ONLY);
+}
 
 int AppInit(Tcl_Interp *interp)
@@ -8 +29 @@
     return TCL_ERROR;
     }
+  SetupArgv( interp );
   Tcl_PkgRequire( interp, "TolshApp", TOLTCL_VERSION, 1);
   return TCL_OK;
@@ -14 +36 @@
 int main(int argc, char *argv[])
 {
-  Tcl_Main( argc, argv, AppInit );
+  g_argc = argc;
+  g_argv = argv;
+  Tcl_Main( 1, argv, AppInit );
   return 0;
 }

toltcl/library/tolsh.tcl

@@ -592 +592 @@
 
 puts "voy ::tolsh::run $argv"
-::tolsh::run $argv
+::tolsh::run $::argv
 exit