Commit 0f0e3a77 authored by luc.moulinier's avatar luc.moulinier

update admin

parent 0ba9eee0
/home/ripp/gscope/gscope_glossaire
\ No newline at end of file
This diff is collapsed.
......@@ -9,8 +9,7 @@ if {! $InStarPack} {
if {[info exists env(ORDALIDIR)]} {
set OrdaliDir $env(ORDALIDIR)
} else {
puts "je suis la"
set OrdaliDir [file join {*}[lrange [file split [info script]] 0 end-2]]
set OrdaliDir [file join {*}[lrange [file split [file normalize [info script]]] 0 end-2]]
}
if {[info exists env(GSCOPEDIR)]} {
set GscopeDir $env(GSCOPEDIR)
......@@ -26,7 +25,7 @@ if {! $InStarPack} {
}
set OrdLibDir [file join $OrdaliDir lib]
set OrdEtcDir [file join $OrdaliDir etc]
set OrdSrcDir [file join $OrdaliDir src]
set auto_path [linsert $auto_path 0 $OrdLibDir]
......
proc BuildDistrib {{plat ""}} {
if {$plat ne ""} {
if {$plat eq "all"} {
foreach plat {"Linux-x86" "Linux-x86_64" "Windows" "Mac"} {
......@@ -13,52 +16,55 @@ proc BuildDistrib {{plat ""}} {
package require platform
set plat [::platform::generic]
}
set rep CreeExe
# Tout se passe dans ordali/Build
cd [file join $::OrdaliDir Build]
# menage avant d'attaquer
# - dans Build/
catch {file delete -force ordalie.tcl}
catch {file delete -force LesProcsDeGscope.tcl}
# - dans Build/$rep
catch {file delete -force {*}[glob [file join $rep ordalie*]]}
# - dans ToPack
catch {file delete -force [file join ToPack lib]}
catch {file delete -force [file join ToPack etc]}
catch {file delete -force {*}[glob [file join ToPack ordalie*]]}
# Met a jour les libs en fonction de la platform
if {! [file exists $plat]} {
file mkdir $plat
}
cd $plat
puts "working dir : [pwd]"
# Clean directory
set Lf [glob -nocomplain *]
if {$Lf != {}} {
file delete -force {*}$Lf
}
# Create file system
file mkdir lib
file mkdir etc
file mkdir doc
# 1 -- libraries --
cd lib
# copying libraries
puts ""
puts "On met le bon environnement"
PackLibrairies $plat
CreeOrdalieTclGlobal
# Prepare construction du starpack
file copy -force ordalie.tcl [file join $rep ordalie.tcl]
puts "copying libraries ..."
puts "[pwd]"
foreach f [glob -type d "[file join $::OrdaliDir .. pkgconf $plat lib *]"] {
puts " $f"
file copy -force $f .
}
# Now copy pure tcl libraries
file copy -force {*}[glob [file join .. .. Ressources lib *]] .
cd ..
# 2 -- etc ressouces --
cd etc
file copy -force {*}[glob [file join .. .. Ressources etc *]] .
cd ..
##################
# PLATFORM SPECIFIC
#
puts "on cree l executable"
cd $rep
# 3 -- doc --
cd doc
file copy -force {*}[glob [file join .. .. Ressources doc *]] .
cd ..
# 4 -- executable --
CreeOrdalieTclGlobal
# 4 -- create executable --
CreeOrdalieStarpack $plat
# Prepare creation de l'installeur
file copy -force [glob ordalie*] [file join .. ToPack]
cd [file join .. ToPack]
puts "on est dans : [pwd]"
puts "cree etc/"
file copy -force [file join $::OrdaliDir etc] .
# nettoyage des .svn ...
set Lsvn [FindTcl .svn .]
file delete -force {*}$Lsvn
puts "\ndone !"
puts "\ndone !\n\n"
exit
}
......@@ -66,7 +72,7 @@ proc BuildDistrib {{plat ""}} {
proc CreeOrdalieTclGlobal {} {
# Recupere toutes les procedures ...
puts "on cree le fichier global .tcl"
puts "\nHarvesting all procs ..."
set LesProcsDeGscope [ToutesLesProcsDeGscope]
# Cree fichier tcl global
......@@ -84,7 +90,7 @@ proc CreeOrdalieTclGlobal {} {
proc LoadTclPackages {} {
package require tclcluspack
#package require tclcluspack
package require tclordalie
package require tclfastme
package require http
......@@ -110,6 +116,8 @@ proc LoadTkAndPackages {} {
if {[catch {package require tcl3d} Msg]} {
if {[string first "instead" $Msg] > -1} {
set vertcl3d [lindex [split [string trim $Msg]] end-2]
} else {
set vertcl3d "None"
}
} else {
set vertcl3d $Msg
......@@ -244,59 +252,27 @@ proc PackLibrairies {plat} {
proc CreeOrdalieStarpack {plat} {
# kbstcl a executer est dependant de la platform
# sur laquelle on est
#
package require platform
switch [::platform::generic] {
"win32-ix86" {set ekit kbstcl.exe}
"linux-ix86" {set ekit kbstcl-x86}
"linux-x86_64" {
#set ekit kbstcl-x86_64
set ekit tclkit-x86_64
}
"macosx-ix86" {set ekit kbstcl-macosx}
}
# plat definit la cible, c'est a dire l executable
# donne a sdx.kit (-runtime argument)
switch $plat {
"Windows" -
"win32-ix86" {
set rtime kbstclcopy.exe
set ordex ordalie.exe
}
"linux-ix86" -
"Linux-x86" {
set rtime kbstclcopy-x86
set ordex ordalie
}
"linux-x86_64" -
"Linux-x86_64" {
#set rtime kbstclcopy-x86_64
set rtime tclkitcopy-x86_64
set ordex ordalie
}
"macosx-ix86" -
"Mac" {
set rtime kbstclcopy-macosx
set ordex ordalie
}
}
puts "CreeOrdaliStarpack $plat"
exec ./$ekit sdx.kit qwrap ordalie.tcl
exec ./$ekit sdx.kit unwrap ordalie.kit
# Rajoute LRIPhoto
file copy -force [file join [pwd] .. .. Extensions AllPlatform LRIPhoto] [file join ordalie.vfs lib]
exec ./$ekit sdx.kit wrap $ordex -runtime $rtime
file copy [file join .. TclKits sdx.kit] sdx.kit
set fkit [glob [file join .. TclKits "tclkit-${plat}*"]]
set ext [file extension $fkit]
set kit "tclkit$ext"
file copy $fkit $kit
set frun [glob [file join .. TclKits "tcltkkit-${plat}*"]]
set run "tcltkkit$ext"
file copy $frun $run
set target "ordalie$ext"
puts "CreeOrdaliStarpack"
exec ./$kit sdx.kit qwrap ordalie.tcl
exec ./$kit sdx.kit unwrap ordalie.kit
exec ./$kit sdx.kit wrap $target -runtime $run
file delete -force ordalie.vfs
file delete -force ordalie.kit
file delete -force ordalie.tcl
file delete -force sdx.kit
file delete -force {*}[glob *tcl*kit*]
return
}
......@@ -552,22 +528,14 @@ proc CompilePackages {{plat ""}} {
set instdir [file join $pkgconf $platlong]
puts "installing in : $instdir"
if {0} {
# First create Rmath library
cd Rmath-master
exec make clean
exec make
set libRmath [glob [file join src *Rmath-*]]
file copy -force {*}$libRmath ../tclcluspack0.1/lib/.
puts "Copy $libRmath to tclcluspack ..."
cd ..
}
set Lpkg [list tkhtml3.0 1 LRIPhoto1.0 1 biotext0.1 1 tclordalie0.1 0 tclcluspack0.1 0 tclfastme0.1 0 tsurf0.1 0]
set Lpkg [list tkhtml3.0 1 LRIPhoto1.0 1 biotext0.1 1 tclordalie0.1 0 tclcluspack0.1 0 tclfastme0.1 0 tsurf0.1 0 tcltls-1.7.16 0]
# tests
set Lpkg [list tkhtml3.0 1]
#set Lpkg [list tclordalie0.1 0 tclcluspack0.1 0 tclfastme0.1 0 tsurf0.1 0]
set Lpkg [list tcltls-1.7.16 0]
foreach {pkg avecTk} $Lpkg {
if {[string first "tclcluspack" $pkg] > -1} {
CreateRmathLibrary
}
puts "package : $pkg\n"
cd $pkg
catch {exec make clean}
......@@ -607,15 +575,28 @@ proc CompilePackages {{plat ""}} {
}
proc rmath {} {
cd pkgconf/Rmath-master
puts "cleaning"
set clean [exec make clean]
puts $clean
puts "ze make :"
set zemake [exec make]
puts $zemake
proc CreateRmathLibrary {} {
# First create Rmath library
cd Rmath-master
exec make clean
exec make
cd src
if {[string first "win" $platlong] > -1} {
exec ar cr Rmath-${platlong}.a *.o
} else {
set Lo [glob *.o]
exec ar cr Rmath-${platlong}.a {*}$Lo
}
cd ..
set libRmath "Rmath-${platlong}.a"
catch {file delete -force ../tclcluspack0.1/lib/Rmath.a}
file copy -force [file join src $libRmath] ../tclcluspack0.1/lib/.
file copy -force [file join src $libRmath] ../tclcluspack0.1/lib/Rmath.a
puts "Rmath library created ..."
puts "Copy $libRmath to tclcluspack0.1/lib ..."
cd ..
exit
return
}
# http://kitcreator.rkeene.org/kitcreator
......@@ -532,12 +532,12 @@ proc LanceDoc {{meth "internet"}} {
if {$meth eq "internet"} {
package require browser_info
OpenInBrowser http://www.lbgi.fr/~moumou/Ordalie/doc/index.html
OpenInBrowser http://www.lbgi.fr/~moumou/Ordalie/doc/ordalie_documentation.html
} else {
source [file join $::OrdLibDir hv hv3_main.tcl]
set ::hv3::maindir $::OrdaliDir
#eval [concat hv3_main $argv]
hv3_main "file://[file join $::OrdaliDir newdoc ordalie_documentation index.html]"
hv3_main "file://[file join $::OrdaliDir doc ordalie_documentation.html]"
#hv3_main "file://~/merci.html"
}
......
......@@ -406,14 +406,20 @@ proc CoefficientCorrelation {lx ly} {
proc EcartType {l} {
if {! [llength $l]} {return -1}
set sd 0. ; set s2x 0.
set sd 0. ; set sx 0.0 ; set s2x 0.
set n [llength $l]
foreach e $l {
set sx [expr {$sx+$e}]
set sx [expr {$sx + $e}]
set s2x [expr {$s2x+$e*$e}]
}
set mx [expr {$sx/$n}]
set ex [expr {sqrt($s2x/$n-$mx*$mx)}]
set var [expr {$s2x/$n - $mx*$mx}]
if {$var <= 0.0} {
set ex 0.0
} else {
set ex [expr {sqrt($var)}]
}
return $ex
}
......
......@@ -801,13 +801,12 @@ proc RemoveColumnsOfGaps {} {
proc SeqlabFont {} {
if {[QuelMode] ne "seqlab"} {return}
set sze [font configure SeqFont -size]
set wgt [font configure SeqFont -weight]
set fam [font configure SeqFont -family]
set fam [string map [list " " ""] $fam]
$::NomTextSeq font family $fam size $sze weight $wgt
#set fam [string map [list " " ""] $fam]
$::NomTextSeq font family "$fam" size $sze weight $wgt
return
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment