ordali_admin, outils

src/ordali.tcl

@@ -30,8 +30,13 @@ puts "GscopeDir $GscopeDir"
 } else {
     puts "Pas de GscopeDir"
 }
-set OrdLibDir [file join $OrdaliDir Build [::platform::generic] lib]
-set OrdEtcDir [file join $OrdaliDir etc]
+
+if {! $InStarPack} {
+    set OrdLibDir [file join $OrdaliDir Build [::platform::generic] lib]
+} else {
+    set OrdLibDir [file join $OrdaliDir lib]
+}
+    set OrdEtcDir [file join $OrdaliDir etc]
 set OrdSrcDir [file join $OrdaliDir src]
 
 puts "OrdaliDir $OrdaliDir"
@@ -39,7 +44,7 @@ puts "OrdLibDir $OrdLibDir"
 flush stdout
 
 set auto_path [linsert $auto_path 0 $OrdLibDir]
-
+    
 if {$tcl_version <= 8.5} {
     package require TclOO
 }

src/ordali_admin.tcl

@@ -3,20 +3,15 @@
 
 
 proc BuildDistrib {{plat ""}} {
-    if {$plat ne ""} {
-	if {$plat eq "all"} {
-	    foreach plat {"Linux-x86" "Linux-x86_64" "Windows" "Mac"} {
-		exec ordali BuildDisstrib $plat
-	    }
-
-	    exit
-	}
-    } else { 
-	# Definit plateform, et repertoire associes
+    # Define platform
+    if {$plat eq ""} {
 	package require platform
 	set plat [::platform::generic]
     }
+
     cd [file join $::OrdaliDir Build]
+
+    # initialize
     if {! [file exists $plat]} {
 	file mkdir $plat
     }
@@ -29,7 +24,7 @@ proc BuildDistrib {{plat ""}} {
 	file delete -force {*}$Lf
     }
 
-    # Create file system
+    # Create file-system
     file mkdir lib
     file mkdir etc
     file mkdir doc
@@ -248,17 +243,35 @@ proc PackLibrairies {plat} {
 }
 
 
-proc CreeOrdalieStarpack {plat} {
+proc CreeOrdalieStarpack {{plat ""}} {
+    if {$plat eq ""} {
+	package require platform
+	set plat [::platform::generic]
+    }
+    # output runtime tclkit :
+    # may be different for CROSS - BUILDING
+    set platout $plat
+    set plat [::platform::generic]
+
     file copy [file join .. TclKits sdx.kit] sdx.kit
+
+    # copy tclkit for building
     set fkit [glob [file join .. TclKits "tclkit-${plat}*"]]
-    set ext [file extension $fkit]
     set kit [file tail $fkit]
     file copy $fkit $kit
-    set frun [glob [file join .. TclKits "tcltkkit-${plat}*"]]
+    
+    # copy runtime for the target
+    set frun [glob [file join .. TclKits "tcltkkit-${platout}*"]]
     set run [file tail $frun]
     file copy $frun $run
+
+    # define executable extention
+    set ext ""
+    if {[string first "win" $platout] > -1} {
+	set ext ".exe"
+    }
     set target "ordalie$ext"
-    puts "CreeOrdaliStarpack"
+    puts "Creating starpack : $target"
 
     exec ./$kit sdx.kit qwrap  ordalie.tcl
     exec ./$kit sdx.kit unwrap ordalie.kit
@@ -620,5 +633,14 @@ proc CreateRmathLibrary {} {
     return
 }
 
+
+proc MyProc {name argList body} {
+    puts "$name"
+    _oldproc $name $argList $body
+}
+
+
+
+
 # http://kitcreator.rkeene.org/kitcreator
 

src/ordali_outils.tcl

@@ -982,11 +982,10 @@ proc InterpreteLaLigneDeCommande {Ligne} {
     # On execute et puis exit
     if {$Arg1 eq "admin"} {
 	puts [eval {*}[lrange [split $Ligne " "] 1 end]]
+
 	exit
     }
 
-    ###########################
-
     #LoadTclPackages
     namespace path {::tcl::mathop ::tcl::mathfunc}
 
@@ -996,7 +995,6 @@ proc InterpreteLaLigneDeCommande {Ligne} {
 	TaisToi 0
 	puts $reponse
 	exit
-	#return
     }
     if {$Arg1 eq "exe"} {
 	LesDefauts Mode batch
@@ -1004,8 +1002,6 @@ proc InterpreteLaLigneDeCommande {Ligne} {
 	return "dansexe"
     }
 
-    #LoadTclPackages
-
     # manage project, 
     if {$Arg1 eq "project"} {
 	if {$Val1 eq ""} {
@@ -1015,13 +1011,17 @@ proc InterpreteLaLigneDeCommande {Ligne} {
 
 	LoadTkAndPackages
 	CheckForProject $Val1
+
 	return "stop"
     }
     
     # traite help
     if {[string tolower $Arg1] eq "help"} {
 	set Ligne "-ordalihelp 1"
-    } elseif {[file exists $Arg1]} {
+    }
+
+    # Treat sequence file
+    if {[file exists $Arg1]} {
 	set ftype [file extension $Arg1]
 	switch $ftype {
 	    ".macsim" -
@@ -1046,6 +1046,7 @@ proc InterpreteLaLigneDeCommande {Ligne} {
     # a '-' character
     if {[string index $Ligne 0] ne "-"} {
 	FaireLire "\"$Ligne\" is not recognized or does not exists !"
+
 	return
     }
 
@@ -1084,6 +1085,9 @@ proc InterpreteLaLigneDeCommande {Ligne} {
 		}
 		LesDefauts DownloadPDB $what
 	    }
+	    "-echoproc" {
+		echoProc
+	    }
 	    "-balibase" {
 		LesDefauts Balibase $v
 		LesDefauts CheckSeq 0
@@ -4714,3 +4718,17 @@ proc tchar {} {
     exit
 }
 
+proc echoProc {} {
+    foreach name [info procs] {
+        trace add execution "::$name" enter LogProc
+    }
+
+    return
+}
+
+
+proc LogProc {name args} {
+    puts "$name"
+    update idletasks
+}
+