Changeset eb559d7 in tol

Timestamp:

Dec 5, 2016, 11:27:22 AM (10 years ago)

Author:

Pedro Gea <pgea@…>

Branches:

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

Children:

cc45a10

Parents:

4059600

Message:

Refs #1938
La versión de tolsh (ejecutable) y toltcl (paquete tcl) se gestionan desde CMakeLists.txt.
Se traslada la versión de tolsh.tcl (que estaba manual) a pkgIndex.tcl.in que usa lo definido en CMakeLists.txt.

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

Location:

toltcl

Files:

• CMakeLists.txt (modified) (1 diff)
• library/pkgIndex.tcl.in (modified) (1 diff)
• library/tolsh.tcl (modified) (2 diffs)

toltcl/CMakeLists.txt

@@ -12 +12 @@
 # The version number.
 set (TOLTCL_VERSION_MAJOR 3)
-set (TOLTCL_VERSION_MINOR 3)
+set (TOLTCL_VERSION_MINOR 4)
 
 # look for tol

toltcl/library/pkgIndex.tcl.in

@@ -28 +28 @@
     [ string map [list %d $dir] {
       source [ file join {%d} tolsh.tcl ]
+      package provide TolshApp @TOLTCL_VERSION_MAJOR@.@TOLTCL_VERSION_MINOR@      
     } ]

toltcl/library/tolsh.tcl

@@ -7 +7 @@
 ###############################################################################
 
-package provide TolshApp 3.3
+#@ Se lleva al pkgIndex.tcl.in para gestionar mejor las versiones.
+#@ package provide TolshApp 3.3
 
 ###############################################################################
@@ -400 +401 @@
   #
   if {$options(runmode) != "server" && $options(runmode) != "shared"} {
-    package require -exact Toltcl 3.3
+    package require Toltcl
     #puts "tol::initkernel $options(lang) $options(vmode)"
     tol::initkernel $options(lang) $options(vmode)