Commit 6a2a518d authored by luc.moulinier's avatar luc.moulinier

ordali_admin

parent 58065ac8
...@@ -29,7 +29,9 @@ if {! $InStarPack} { ...@@ -29,7 +29,9 @@ if {! $InStarPack} {
set OrdaliDir [file normalize [file join [file dirname [file normalize [info script]]] .. .. ..]] set OrdaliDir [file normalize [file join [file dirname [file normalize [info script]]] .. .. ..]]
set RepertoireDuGenome "" set RepertoireDuGenome ""
} }
set OrdLibDir [file join $OrdaliDir lib] package require platform
set OrdLibDir [file join $OrdaliDir Build [::platform::generic] lib]
set OrdEtcDir [file join $OrdaliDir etc] set OrdEtcDir [file join $OrdaliDir etc]
set OrdSrcDir [file join $OrdaliDir src] set OrdSrcDir [file join $OrdaliDir src]
......
...@@ -493,22 +493,14 @@ proc PackExtension {{ext "all"}} { ...@@ -493,22 +493,14 @@ proc PackExtension {{ext "all"}} {
} }
proc CompilePackages {{plat ""}} { proc CompilePackages {{pkg ""}} {
global env global env
if {$plat ne ""} { # Definit plateform, et repertoire associes
if {$plat eq "all"} { package require platform
foreach plat {"Linux-x86" "Linux-x86_64" "Windows-32" "windows-64" "Mac"} { set plat [::platform::generic]
exec ordali BuildDisstrib $plat set platlong [::platform::generic]
}
exit
}
} else {
# Definit plateform, et repertoire associes
package require platform
set plat [::platform::generic]
}
puts "platform : $plat\n" puts "platform : $plat\n"
switch [::platform::generic] { switch [::platform::generic] {
...@@ -525,21 +517,33 @@ proc CompilePackages {{plat ""}} { ...@@ -525,21 +517,33 @@ proc CompilePackages {{plat ""}} {
} }
cd $pkgconf cd $pkgconf
set platlong [::platform::generic]
set instdir [file join $pkgconf $platlong] set instdir [file join $pkgconf $platlong]
puts "installing in : $instdir" puts "installing in : $instdir"
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] if {$pkg eq ""} {
# tests 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]
#set Lpkg [list tclcluspack0.1 0] # tests
#set Lpkg [list tclcluspack0.1 0]
} else {
set Lpkg $pkg
}
foreach {pkg avecTk} $Lpkg { foreach {pkg avecTk} $Lpkg {
if {[string first "tclcluspack" $pkg] > -1} { if {[string first "tclcluspack" $pkg] > -1} {
CreateRmathLibrary if {! [file exists [file join $pkg lib Rmath-${platlong}.a]]} {
CreateRmathLibrary
} else {
cd $pkg
cd lib
catch {file delete Rmath.a}
file copy Rmath-${platlong}.a Rmath.a
cd [file join .. ..]
}
} }
puts "\npackage : $pkg" puts "\npackage : $pkg\npwd : [pwd]"
cd $pkg cd $pkg
catch {exec make clean}
exec make clean >& log
switch $platlong { switch $platlong {
"macosx-x86_64" { "macosx-x86_64" {
...@@ -565,6 +569,7 @@ proc CompilePackages {{plat ""}} { ...@@ -565,6 +569,7 @@ proc CompilePackages {{plat ""}} {
} }
puts "Command : $Cmd" puts "Command : $Cmd"
eval exec $Cmd >& log eval exec $Cmd >& log
catch {exec make >& log} catch {exec make >& log}
exec make install exec make install
...@@ -584,6 +589,7 @@ proc CreateRmathLibrary {} { ...@@ -584,6 +589,7 @@ proc CreateRmathLibrary {} {
cd Rmath-master cd Rmath-master
exec make clean exec make clean
exec make exec make
catch {file delete Rmath.a}
cd src cd src
switch -regexp -- $platlong { switch -regexp -- $platlong {
{^win} { {^win} {
...@@ -602,13 +608,14 @@ proc CreateRmathLibrary {} { ...@@ -602,13 +608,14 @@ proc CreateRmathLibrary {} {
} }
cd .. cd ..
set libRmath "Rmath-${platlong}.a" set libRmath "Rmath-${platlong}.a"
catch {file delete -force ../tclcluspack0.1/lib/Rmath.a} catch {file delete -force [file join .. tclcluspack0.1 lib Rmath.a]}
file copy -force [file join src $libRmath] ../tclcluspack0.1/lib/. catch {file delete -force [file join .. tclcluspack0.1 lib $libRmath]}
file copy -force [file join src $libRmath] ../tclcluspack0.1/lib/Rmath.a file copy -force [file join src $libRmath] [file join .. tclcluspack0.1 lib .]
file copy -force [file join src $libRmath] [file join .. tclcluspack0.1 lib Rmath.a]
puts "Rmath library created ..." puts "Rmath library created ..."
puts "Copy $libRmath to tclcluspack0.1/lib ..." puts "Copy $libRmath to tclcluspack0.1/lib ..."
cd .. cd ..
return return
} }
......
...@@ -11844,14 +11844,13 @@ proc lesh {} { ...@@ -11844,14 +11844,13 @@ proc lesh {} {
} }
proc pkp {} { proc pkp {} {
set Lf [glob */pkgIndex.tcl] set Lf [glob */configure.ac]
foreach f $Lf { foreach f $Lf {
puts "\n$f" set Ll [LesLignesDuFichier $f]
set o [open $f r] set out [lsearch -all -inline -glob $Ll "*BUILD_*"]
set l [read -nonewline $o] if {$out ne ""} {
close $o puts "\n$f"
if {[string first "vsati" $l] > -1} { puts "[join $out \n]"
puts "$l"
} }
} }
exit exit
......
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