Changeset 9042aac in tol

Timestamp:

May 9, 2012, 3:08:17 PM (14 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

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

Children:

d7349ff

Parents:

37c9aa7

Message:

refs #1502

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

File:

• tolbase/lib/toltk/tolpkg.tcl (modified) (14 diffs)

tolbase/lib/toltk/tolpkg.tcl

@@ -5 +5 @@
 proc ::TolPkg::UpdateRepositoryInfo { } {
   tol::console eval {
-    Real TolPackage::Client::RemoteUpdatePackSyncInfo(False);
-    Real TolPackage::Client::RemoteUpdateVersSyncInfo(False);
+    Real TolPackage::Server::UpdateCatalog(?);
   }
   return
@@ -27 +26 @@
 proc ::TolPkg::GetLocalRoot { } {
   return [ file normalize \
-               [ lindex [ toltcl::eval { Text TolPackage::_.localRoot } ] 0 ] ]
-}
-
-proc ::TolPkg::GetClientPath { } {
-  return [ file join [ GetLocalRoot ] "Client" ]
+    [ lindex [ toltcl::eval { Text TolPackage::_.localRoot } ] 0 ] ]
+}
+
+proc ::TolPkg::GetClientRoot { } {
+  return [ file normalize \
+    [ lindex [ toltcl::eval { Text TolPackage::Client::_.localRoot } ] 0 ] ]
 }
 
 proc ::TolPkg::GetPkgDirectory { p } {
-  return [ file join [ GetClientPath ] $p ]
+  return [ file join [ GetClientRoot ] $p ]
 }
 
@@ -74 +74 @@
 
 proc ::TolPkg::GetPkgSyncInfo { } {
-  set oza [ file join [ GetClientPath ] "PackSyncInfo.oza" ]
-  if { ![ file exists $oza ] || ![ file readable $oza ] } {
-    return {}
-  }
-  set tolScript [ string map [ list "%O" $oza ] {
-    Set { Ois.Load( "%O" )[1] }
-  } ]
+  # set oza [ file join [ GetClientRoot ] "PackSyncInfo.oza" ]
+  # if { ![ file exists $oza ] || ![ file readable $oza ] } {
+  #   return {}
+  # }
+  # set tolScript [ string map [ list "%O" $oza ] {
+  #   Set { Ois.Load( "%O" )[1] }
+  # } ]
+
+  set tolScript { Set TolPackage::_.GetPackSyncInfo(Version) }
   # return a dictionary
   set dict {}
@@ -113 +115 @@
 
 proc ::TolPkg::GetVersSyncInfo { } {
-  set oza [ file join [ GetClientPath ] "VersSyncInfo.oza" ]
-  if { ![ file exists $oza ] || ![ file readable $oza ] } {
-    return {}
-  }
-  set tolScript [ string map [ list "%O" $oza ] {
-    Set { Ois.Load( "%O" )[1] }
-  } ]
+  # set oza [ file join [ GetClientRoot ] "VersSyncInfo.oza" ]
+  # if { ![ file exists $oza ] || ![ file readable $oza ] } {
+  #   return {}
+  # }
+  # set tolScript [ string map [ list "%O" $oza ] {
+  #   Set { Ois.Load( "%O" )[1] }
+  # } ]
+
+  set tolScript { Set TolPackage::_.GetVersSyncInfo(?) }
   # return a dictionary
   set dict {}
@@ -141 +145 @@
 
 proc ::TolPkg::GetLocalPackages { } {
-  set clientRoot [ GetClientPath ]
+  set clientRoot [ GetClientRoot ]
   set dirs [ glob -nocomplain -tail -dir $clientRoot -types {d r} * ]
   set pkgsInfo {}
@@ -152 +156 @@
 proc ::TolPkg::GetLocalPackageInfo { p } {
   set tolScript [ string map [ list %p $p ] {
-    Set TolPackage::Client::LocalInfo( "%p" );
+    Set TolPackage::Client::GetPackageInfo( "%p" );
   } ]
   return [ lindex [ toltcl::eval $tolScript -named 1 ] 1 ]
@@ -202 +206 @@
   set ask "${repo}?action=general_information"
   set result [ toltcl::eval [ string map [ list %A $ask ] {
+    # No se usa?
     Set TolPackage::Client::GetRepositoryInfo( "%A" )
   } ] ]
@@ -209 +214 @@
 proc ::TolPkg::AddRepository { url } {
   set tolexpr [ string map [ list %u $url ] {
-    Real TolPackage::Client::AddRepository( "%u" );
+    Real TolPackage::AddRepository( "%u" );
   } ]
   toltcl::eval $tolexpr
@@ -217 +222 @@
   puts "::TolPkg::ZipInstall ${pkg.zip}"
   set tolexpr [ string map [ list %p ${pkg.zip} ] {
-    Real TolPackage::Client::LocalInstallPackage( "%p" )
+    Real TolPackage::Client::InstallZip( "%p" )
   } ]
   return [ toltcl::eval $tolexpr ]
@@ -224 +229 @@
 proc ::TolPkg::RemovePackage { pkg } {
   set tolexpr [ string map [ list %p ${pkg} ] {
-    Real TolPackage::Client::LocalClean( "%p" )
+    Real TolPackage::Client::UninstallPackage( "%p" )
   } ]
   return [ toltcl::eval $tolexpr ]
@@ -230 +235 @@
 
 proc ::TolPkg::RemoteInstall { pkg repo } {
-  puts "::TolPkg::RemoteInstall $pkg $repo"
+  puts "::TolPkg::InstallLastCompatible $pkg"
   BackupPackage $pkg 1
   set tolexpr [ string map [ list %p $pkg %r $repo ] {
-    Real TolPackage::Client::RemoteInstall( "%r", "%p", 1 )
+    Real TolPackage::InstallLastCompatible("%p")
   } ]
   if { [ catch  { toltcl::eval $tolexpr } result ] } {
@@ -249 +254 @@
   puts "::TolPkg::ExportPackage $pkg to $dest"
   set tolexpr [ string map [ list %p $pkg %d $dest ] {
-    Real TolPackage::Client::LocalExportPackage( "%p", "%d/" )
+    Real TolPackage::Client::ExportPackage( "%p", "%d/" )
   } ]
   return [ toltcl::eval $tolexpr ]
@@ -260 +265 @@
   }
   set tolexpr [ string map [ list %s "\[\[ [ join $members , ] \]\]" ] {
-    Set TolPackage::Client::GetDeepDependencies.all.last( %s );
+    TolPackage::GetInstallationList(%s);
   } ]
   return [ lindex [ toltcl::eval $tolexpr ] 0 ]
@@ -283 +288 @@
 
 proc ::TolPkg::GetPackagesInfo { } {
-  return [ lindex [ toltcl::eval { Set TolPackage::Client::_.packSyncInfo } ] 0 ]
+  return [ lindex [ toltcl::eval { Set TolPackage::_.GetPackSyncInfo(Version) } ] 0 ]
 }