Changeset 5f12935 in tol for tolbase/lib/toltk/project.tcl

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

File:

• tolbase/lib/toltk/project.tcl (modified) (1 diff)

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)