Changeset 5f12935 in tol for tolbase/lib/toltk

Timestamp:

Feb 2, 2012, 8:39:53 PM (15 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

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

Children:

b83a49e

Parents:

fa8b47d

Message:

refs #1408

• se implementa la opción -project path_to_project.ini
• -project "" implica que no se carga _iniproject.tol ni project.ini
• -project <path>/project.ini implica que se carga <path>/project.ini y <path>/_iniproject.tol, no se carga _iniproject.tol que suele estar en TOLHOME.
• se recuerda que existe la opción -np que implica que no se carga _iniproject.tol, esta opcion es compartida con tol.exe y tolsh.exe

refs #1409

• se require la versión 3.1 de toltcl.

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

Location:

tolbase/lib/toltk

Files:

• init_toltk.tcl (modified) (7 diffs)
• project.tcl (modified) (1 diff)

tolbase/lib/toltk/init_toltk.tcl

@@ -77 +77 @@
     load $::env(USE_TOLTCL)
   } else {
-    package require Toltcl 2.0.2
+    package require Toltcl 3.1
   }
   package require rmtps_client
@@ -134 +134 @@
 
 #/////////////////////////////////////////////////////////////////////////////
-  proc loadInfoProjects { dir } {
+  proc loadInfoProjects { prjini } {
 #
 # PURPOSE: Loads in a list the name and paths of each project to load
@@ -145 +145 @@
   global toltk_script_path
   
+  set values {}
   # File exists ?
   set ok 0
-  set dirPrjIni "[file normalize $dir]/../../../"
-  set fileProject [file join $dirPrjIni "project.ini"]
-  if {[file exists $fileProject]} {
-    set ok [ file writable $fileProject ] 
+  if { [ file isfile $prjini ] } {
+    if { [ file readable $prjini ] } {
+      set ok 1
+      set fileProject [ file normalize $prjini ]
+      # se intentara leer el iniproject.tol desde este sitio
+      lappend values Project,path,root [ file dir $fileProject ]
+    } else {
+      tk_messageBox -default ok -icon error \
+          -message [ mc "The project does not exist, file not found or not readable: %s" $prj ] \
+          -parent . -title "Error" -type ok
+      return ""
+    }
   } else {
-    set fileProject [file join $dir "project.ini"]
+    # comportamiento anterior, pudiera limpiarse
+    lappend values Project,path,root ""
+    set pathInitTol ""
+    set dir $prjini
+    set dirPrjIni "[file normalize $dir]/../../../"
+    set fileProject [file join $dirPrjIni "project.ini"]
     if {[file exists $fileProject]} {
-      set ok [ file writable $fileProject ]  
+      set ok [ file writable $fileProject ] 
+    } else {
+      set fileProject [file join $dir "project.ini"]
+      if {[file exists $fileProject]} {
+        set ok [ file writable $fileProject ]  
+      }
     }
   }
@@ -161 +180 @@
     set id [iniparse:openfile $fileProject]
     catch { ::iniFile::Create $fileProject }
-    set values {}
     foreach prj $iniparse($id,sections) {
       if { $prj eq "Project" } {
@@ -211 +229 @@
     }
     iniparse:closefile $id
-    return $values
-  }
-  return ""
+  }
+  return $values
 }
 
@@ -280 +297 @@
 }
 
+# Load project
+namespace import project::*
+set project::data(iniproject) 1
+set state ""
+set project::data(-project) $toltk_script_path
+foreach option $argv {
+  if { $state eq "" } {
+    switch -- $option {
+      -b {
+        set project::data(oculto) 1
+      }
+      -np {
+        set project::data(iniproject) 0
+      }
+      -project {
+        set state "project"
+      }
+      default {
+        puts "unknown option $option"
+      }
+    }
+  } else {
+    switch $state {
+      project {
+        set project::data(-project) [ file normalize $option ]
+      }
+      default {
+        puts "unknown state $state"
+      }
+    }
+    set state ""
+  }
+}
+
 # Get info about project
-set infoProjects [loadInfoProjects $toltk_script_path]
+set infoProjects [ loadInfoProjects $project::data(-project) ]
+project::project $infoProjects
 
 # load iniFile
@@ -295 +347 @@
 
 Tolcon_Trace "toltk_script_path=$toltk_script_path"
-# Load project
-namespace import project::*
-set project::data(iniproject) 1
-foreach option $argv {
-  if { [string equal $option "-b"] } {
-    set project::data(oculto) 1
-  } elseif { $option eq "-np" } {
-    set project::data(iniproject) 0
-  }
-}
-project::project $infoProjects
-
 
 Tolcon_Trace "begin"

tolbase/lib/toltk/project.tcl

@@ -165 +165 @@
   }
 #   update
-  tol::initlibrary $data(iniproject)
+  if { $projects(Project,path,root) ne "" } {
+    set initol 0
+    set iniproject [ file join $projects(Project,path,root) "_iniproject.tol" ]
+  } else {
+    set initol $data(iniproject)
+    set iniproject ""
+  }
+  tol::initlibrary $initol
+  if { $iniproject ne "" } {
+    # incluyo _iniproject.tol relativo a -project
+    tol::include $iniproject
+  }
   foreach prj $projects(Project,names) {
     set prjname $projects(${prj},name)