Commit 942edaf0 authored by luc.moulinier's avatar luc.moulinier
Browse files

updateing CompilePackagves

parent 9713e41d
......@@ -10,7 +10,7 @@ if {! $InStarPack} {
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 [info script]] 0 end-2]]
}
if {[info exists env(GSCOPEDIR)]} {
set GscopeDir $env(GSCOPEDIR)
......
......@@ -532,31 +532,59 @@ proc CompilePackages {{plat ""}} {
package require platform
set plat [::platform::generic]
}
puts "platform : $plat"
puts "platform : $plat\n"
cd [file join $env(HOME) pkgconf]
switch [::platform::generic] {
"macosx-x86_64" {
set pkgconf [file join $::env(HOME) moumou pkgconf]
}
"linux-x86" -
"linux-x86_64" {
set pkgconf [file join $::env(HOME) pkgconf]
}
"win32-x86_64" {
set pkgconf [file join o:/ pkgconf]
}
}
cd $pkgconf
set platlong [::platform::generic]
set instdir [file join $pkgconf $platlong]
puts "installing in : $instdir"
# do Tk packages
set Lpkg [list tkhtml3.0 tclImageScale biotext0.1]
foreach pkg $Lpkg {
set Lpkg [list tkhtml3.0 1 LRIPhoto1.0 1 biotext0.1 1 tclordalie0.1 0 tclcluspack0.1 0 tclfastme0.1 0 tsurf0.1 0]
foreach {pkg avecTk} $Lpkg {
puts "package : $pkg\n"
cd $pkg
catch {exec make clean}
switch $plat {
switch $platlong {
"macosx-x86_64" {
exec .tcsh -c /configure --exec-prefix= =../macosx-x86_64 --with-tcl=/usr/local/tcl8.6.6/lib --with-tk=/usr/local/tk8.6.6/lib
set Cmd "./configure --exec-prefix=$instdir --with-tcl=/usr/local/tcl8.6.6/lib"
if {$avecTk} {
append Cmd " --with-tk=/usr/local/tk8.6.6/lib"
}
}
"Linux-x86_64" {
exec ./configure --exec-prefix=/home/moumou/pkgconf/Linux-x86_64 --with-tcl=/usr/local/ActiveTcl/lib --with-tk=/usr/local/ActiveTcl/lib
"linux-x86_64" {
set Cmd "./configure --exec-prefix=$instdir --with-tcl=/home/moumou/tcl8.6.7/luc/lib"
if {$avecTk} {
append Cmd " --with-tk=/home/moumou/tk8.6.7/luc/lib"
}
}
"Linux-x86" {
set Cmd "setenv CFLAGS -m32 ; ./configure --exec-prefix= = /home/moumou/pkgconf/Linux-x86 --with-tcl=/home/moumou/tcl32-8.6.7/lib --with-tk=/home/tk32-8.6.7/lib"
exec tcsh -c $Cmd
"linux-x86" {
}
"win32-x86_64" {
set Cmd "sh.exe configure --enable-64bit --exec-prefix=$instdir --with-tcl=/c/TclTk8.6.7/lib"
if {$avecTk} {
append Cmd " --with-tk=/c/TclTk8.6.7/lib"
}
}
}
eval exec $Cmd
catch {exec make}
exec make install
cd ..
}
return
......
......@@ -7174,12 +7174,12 @@ proc ToggleAuLog {{Init ""}} {
if {$Init ne ""} {
set Toggle(AuLog) $Init
if {! $Init} {
if {[info commands AuLogText] ne ""} {
rename AuLogText AuLog
if {[info commands AuLog] ne "" && [info commands AuLogText] ne ""} {
#rename AuLogText AuLog
}
} else {
if {[info commands AuLogWindow] ne ""} {
rename AuLogWindow AuLog
if {[info commands AuLog] ne "" && [info commands AuLogWindow] ne ""} {
#rename AuLogWindow AuLog
}
}
......
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