Changeset 0f71b65 in tol

Timestamp:

Nov 25, 2016, 9:34:48 AM (10 years ago)

Author:

Pedro Gea <pgea@…>

Branches:

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

Children:

0bf09a4

Parents:

f738c05

Message:

Refs #1933
Se revisa el archivo init_toltk.tcl y se soluciona el arranque de tolbase desde otro directorio cambiando el 'current directory'.

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

Location:

tolbase/lib/toltk

Files:

• editor.tcl (modified) (2 diffs)
• init_toltk.tcl (modified) (9 diffs)

tolbase/lib/toltk/editor.tcl

@@ -578 +578 @@
   $me add command -label [mc "Select all"] -accelerator CTRL+E \
                   -command [list ::Editor::CmdSelectAll $this]
-  
-  #CVS Utilities
-  #$m add separator
-  #set mc [menu $f.m.cvs -tearoff 0]
-  #$m add cascade -label [mc "CVS Utilities"] -menu $mc
-  #$mc add command -label [mc "TkCVS"] \
-  #                -command [list ::Editor::CmdTkcvs $this 0]
-  #$mc add command -label [mc "TkDiff"] \
-  #                -command [list ::Editor::CmdTkcvs $this  1]
-  
 
   bind $data(txt,ctext) <Button-3>  "tk_popup $m %X %Y"
@@ -1269 +1259 @@
 
 #/////////////////////////////////////////////////////////////////////////////
-  proc ::Editor::CmdTkcvs { this mode} {
-#
-# PURPOSE: Execute CVS utilities
-#
-# PARAMETERS:
-#   this -> Instance of editor 
-#   mode -> type of execution (0 -> tkCvs, 1 -> tkdiff)
-#
-#/////////////////////////////////////////////////////////////////////////////
-  global toltk_bin
-  global tkcvs_library
-  
-  variable options
-  upvar \#0 ${this}::data data
-  
-  if {$mode == 0} {
-    set cmd "[file join $toltk_bin wish84.exe] [file join $tkcvs_library tkcvs.tcl]"
-    #exec c:/TclTk/bin/wish84.exe c:/TclTk/bin/tkcvs.tcl -dir $options(lastDir) &
-    exec $cmd -dir $options(lastDir) &
-  } else {
-    set cmd "[file join $toltk_bin wish84.exe] [file join $tkcvs_library tkdiff.tcl]"
-    #exec c:/TclTk/bin/wish84.exe c:/TclTk/bin/tkdiff.tcl $data(nameFile) &
-    exec $cmd $data(nameFile) &
-  }
-
-  
-}
-
-#/////////////////////////////////////////////////////////////////////////////
 # Comandos de edición (deshacer, cortar, copiar, pegar, buscar, remplazar,...)
 #/////////////////////////////////////////////////////////////////////////////

tolbase/lib/toltk/init_toltk.tcl

@@ -11 +11 @@
 package require Tk
 
+# trace: muestra (o no) la ventana de trazas de TOL
 set trace 0
-#/////////////////////////////////////////////////////////////////////////////
-  proc Tolcon_Trace { msg {tags ""} {args ""} } {
+
+#/////////////////////////////////////////////////////////////////////////////
+proc Tolcon_Trace { msg {tags ""} {args ""} } {
 #
 # PURPOSE: Writes a trace message in a toplevel window. It's used for
@@ -54 +56 @@
 }
 
+#/////////////////////////////////////////////////////////////////////////////
 proc TraceMainGeometry { msg } {
+#/////////////////////////////////////////////////////////////////////////////
   puts "== $msg == wm geometry . == [wm geometry .]"
   puts "== $msg == winfo geometry . == [winfo geometry .]"
@@ -60 +64 @@
 
 #/////////////////////////////////////////////////////////////////////////////
-  proc LoadPackages {} {
+proc LoadPackages {} {
 #
 # PURPOSE: Load packages
@@ -83 +87 @@
 
 #/////////////////////////////////////////////////////////////////////////////
- proc OpenAssocFile {file {run 0} {inc 0}} {
+proc OpenAssocFile {file {run 0} {inc 0}} {
 #/////////////////////////////////////////////////////////////////////////////
   switch [string toupper [file extension $file]] {
@@ -127 +131 @@
 }
 
-
-#/////////////////////////////////////////////////////////////////////////////
-  proc loadInfoProjects { prjini } {
+#/////////////////////////////////////////////////////////////////////////////
+proc loadInfoProjects { prjini } {
 #
 # PURPOSE: Loads in a list the name and paths of each project to load
@@ -228 +231 @@
 }
 
+#/////////////////////////////////////////////////////////////////////////////
+# Main
+# Secuencia de instrucciones para la carga de tolbase
+# 
+
 if {[info exist ::env(DEBUG_TOLTCL)] && $::env(DEBUG_TOLTCL) eq "yes"} {
   set tt_debug "d"  
@@ -233 +241 @@
   set tt_debug ""  
 }
-
 
 set info_script [info script]
@@ -255 +262 @@
 }
 
+if { [string equal $tcl_platform(platform) "windows"] } {
+  #@ Cambia el 'current directory' al bin de tol para evitar problemas en la carga
+  set tolBin [file normalize [file join [file dir [info script]] .. .. .. bin]]
+  cd $tolBin
+}
+
 if { ![info exists toltk_library] } {
   set toltk_library [file normalize [file join $toltk_script_path ..]]
 }
-
-if { ![info exists toltk_bin] } {
-  set toltk_bin [file normalize [file join $toltk_library ../bin]]
-}
-
 if {[lsearch $auto_path $toltk_library] == -1} {
   set auto_path [linsert $auto_path 0 $toltk_library]
 }
 
-if { ![info exists rbc_libPath] } {
-  set rbc_libPath [file join $toltk_library rbc]
-}
-
-if { ![info exists env(RBC_LIBRARY)] } {
-  set env(RBC_LIBRARY) [file join $toltk_library rbc]
-}
-
-if { ![info exists tkTable_libPath] } {
-  set tkTable_libPath [file join $toltk_library Tktable]
-  set env(TK_TABLE_LIBRARY) [file join $toltk_library Tktable]
-}
-
-if { ![info exists byswidget_library] } {
-  set byswidget_library [file normalize [file join $toltk_script_path byswidget]]
-}
-# NOTE: necessary for TkCVS
-if { ![info exists tkcvs_library] } {
-  set tkcvs_library [file normalize [file join $toltk_script_path tkcvs]]
-}
-
-if {[lsearch $auto_path $toltk_library] == -1} {
-  set auto_path [linsert $auto_path end $byswidget_library]
-}
 
 # Load project
@@ -434 +418 @@
 
 #::TolConsole::ODBCShow
+
+#/////////////////////////////////////////////////////////////////////////////