Changeset d7aca32 in tol for tolbase

Timestamp:

Dec 7, 2015, 10:23:36 PM (11 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

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

Children:

63b6642

Parents:

b61a88b

Message:

refs #1860, scripts de arranque para tolbase similar a tolsh, se copia logica de #1884

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

Location:

tolbase

Files:

• CMakeLists.txt (modified) (3 diffs)
• bin/CMakeLists.txt (added)
• bin/tolbase.sh (added)
• generic/CMakeLists.txt (modified) (1 diff)
• generic/tolbase.c (modified) (3 diffs)
• lib/pkgIndex.tcl.in (modified) (1 diff)

tolbase/CMakeLists.txt

@@ -1 +1 @@
 cmake_minimum_required( VERSION 2.8 )
 project( TOLBASE )
+
+set( INSTALL_WITH_TOL 1 )
 
 set( CMAKE_MODULE_PATH
@@ -52 +54 @@
 
 if( TCL_FOUND )
+  message( STATUS "TK_LIBRARY_PATH = ${TK_LIBRARY_PATH}" )
+  message( STATUS ${TCL_STUB_LIBRARY} )
   message( STATUS ${TCL_INCLUDE_PATH} )
-  get_filename_component( CMAKE_INSTALL_PREFIX ${TCL_LIBRARY_PATH} PATH )
+  message( STATUS ${TCL_LIBRARY_PATH} )
+  if( INSTALL_WITH_TOL )
+    set( CMAKE_INSTALL_PREFIX ${TOL_PREFIX_PATH} )
+  else( INSTALL_WITH_TOL )
+    get_filename_component( CMAKE_INSTALL_PREFIX ${TCL_LIBRARY_PATH} PATH )
+  endif( INSTALL_WITH_TOL )
   if( WIN32 )
     string( REPLACE "\\" "/" CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} ) 
@@ -65 +74 @@
   CACHE INTERNAL "" )
 
+if( UNIX )
+  add_subdirectory( bin )
+endif( UNIX )
+
 add_subdirectory( generic )
 add_subdirectory( lib )

tolbase/generic/CMakeLists.txt

@@ -8 +8 @@
 if ( WIN32 )
   set( CMAKE_EXE_LINKER_FLAGS  "${CMAKE_EXE_LINKER_FLAGS} -mwindows" )
-else ( WIN32 )
-        # use, i.e. don't skip the full RPATH for the build tree
-  SET(CMAKE_SKIP_BUILD_RPATH  FALSE)
-
-  # when building, don't use the install RPATH already
-  # (but later on when installing)
-  SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) 
-
-  SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
-
-  # add the automatically determined parts of the RPATH
-  # which point to directories outside the build tree to the install RPATH
-  SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-
-  # the RPATH to be used when installing, but only if it's not a system directory
-  LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib" isSystemDir)
-  IF("${isSystemDir}" STREQUAL "-1")
-     SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
-  ENDIF("${isSystemDir}" STREQUAL "-1")
 endif( WIN32 )
 

tolbase/generic/tolbase.c

@@ -14 +14 @@
 #include "tk.h"
 #include "locale.h"
+#ifdef WIN32
 #include <windows.h>
+#endif
 
+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);
+}
 
 #ifdef TK_TEST
@@ -39 +61 @@
  */
 
+#ifdef WIN32
 #pragma comment(linker, "/SUBSYSTEM:windows /ENTRY:mainCRTStartup")
+#endif
 
 int
@@ -139 +163 @@
      */
 
-    Tcl_PkgRequire( interp, "TolbaseApp", TOLBASE_VERSION, 1);
+    SetupArgv( interp );
+    Tcl_VarEval( interp, "lappend", " auto_path", " [file join",
+                 " [file dir [file dir ", Tcl_GetNameOfExecutable(),
+                 " ] ] lib ]", NULL );
+    if ( !Tcl_PkgRequire( interp, "TolbaseApp", TOLBASE_VERSION, 1) )
+      {
+        printf( "%s\n", Tcl_GetStringResult( interp ) );
+        Tcl_Exit( -1 );
+      }
+    //Tcl_PkgRequire( interp, "TolbaseApp", TOLBASE_VERSION, 1);
     return TCL_OK;
 }

tolbase/lib/pkgIndex.tcl.in

@@ -5 +5 @@
       lappend auto_path {%d}
       source [ file join {%d} toltk init_toltk.tcl ]
+      package provide TolbaseApp @TOLBASE_VERSION_MAJOR@.@TOLBASE_VERSION_MINOR@
     } ]