Changeset 69a6d05 in tol

Timestamp:

Oct 6, 2010, 5:47:23 PM (16 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

c1fdad2

Parents:

a75ca51

Message:

Refs #949

LastCompatible no usa el conjunto TolPackage::Client::@Repository::_.allPackages sino el propio directorio TolPackage::Client::_.localRoot para buscar la última versión disponible localmente para un paquete dado

El nuevo método InstallFromLocalZip Instala un paquete desde un archivo local comprimido con extensión .zip

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

File:

• tol/stdlib/general/TolPackage/client.tol (modified) (2 diffs)

tol/stdlib/general/TolPackage/client.tol

@@ -34 +34 @@
 //////////////////////////////////////////////////////////////////////////////
 {
-  Real numIns = Card(TolPackage::Client::@Repository::_.instances);
-  Real numPck = Card(TolPackage::Client::@Repository::_.allPackages);
-//WriteLn("TRACE [TolPackage::Client::LastCompatible] numIns="<<Card(numIns));
-//WriteLn("TRACE [TolPackage::Client::LastCompatible] numPck="<<Card(numPck));
-  Set pkgSel = Select(TolPackage::Client::@Repository::_.allPackages,
-  Real(TolPackage::@PackageInfo a)
+  Set pkgLst = GetDir(TolPackage::Client::_.localRoot)[2];
+  Set pkgSel = Select(pkgLst,Real(Text pkgNamVer)
   {
-    And(
-      a->name == package,
-      Version>=a->minTolVersion)
+    TextBeginWith( pkgNamVer, package+".")
   });
-  If(!Card(pkgSel),"",
+  Text If(!Card(pkgSel),"",
   {
-    Set pkgSort = Sort(pkgSel,Real(TolPackage::@PackageInfo a, 
-                                   TolPackage::@PackageInfo b)
-    {
-      Compare(b->name.version, a->name.version)
-    });
-    pkgSort[1]->name.version
+    Set pkgSort = Sort(pkgSel, Real(Text a, Text b) { Compare(b, a) });
+    pkgSort[1]
   })
 };
@@ -95 +85 @@
   @Repository r = @Repository::Get(repository, True);
   r::Exist(package.version)
+};
+
+//////////////////////////////////////////////////////////////////////////////
+Text _.autodoc.member.InstallFromLocalZip = 
+"Instala un paquete desde un archivo local comprimido con extensión .zip";
+Real InstallFromLocalZip(Text pkg.path.zip)
+//////////////////////////////////////////////////////////////////////////////
+{
+  Real OSFilCopy(pkg.path.zip, _.localRoot);
+  Text pkg.name.zip = GetFileName(pkg.path.zip);
+  Text pkg.name = Replace(pkg.name.zip,".zip","");
+  Real PackArchive::UnpackFull("ZipArchive",_.localRoot+pkg.name);
+  Real OSFilRemove(_.localRoot+pkg.name.zip);
+  FileExist(_.localRoot+pkg.name+"/"+pkg.name+".oza")
 };