Changeset c7ffdc9f in tol

Timestamp:

Jun 16, 2010, 7:05:10 PM (16 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

4f63528

Parents:

77d8a87

Message:

Refs #916
Se adapta el #Require al nuevo sistema TolPackage

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

File:

• tol/lang/language.cpp (modified) (6 diffs)

tol/lang/language.cpp

@@ -1308 +1308 @@
 
 BText BPackage::localRoot_ = 
-  BSys::TolAppData()+"OIS/Require/tol_pkg/"+
-  TOLVersionShortName()+"/";
-
-BText BPackage::urlRoot_ = 
-  BText("http://packages.tol-project.org/tol_pkg/")+
-  TOLVersionShortName()+"/";
+  BSys::TolAppData()+"OIS/TolPackage/Client/";
 
 //--------------------------------------------------------------------
@@ -1324 +1319 @@
 
 //--------------------------------------------------------------------
-  BText BPackage::Url(const BText& package_version)
-//--------------------------------------------------------------------
-{
-  BText url = urlRoot_+package_version+".oza";
-  return(url);  
-}
-
-//--------------------------------------------------------------------
   bool BPackage::CleanLocal(const BText& package_version)
 //--------------------------------------------------------------------
@@ -1342 +1329 @@
 //--------------------------------------------------------------------
 {
-  BText path = LocalPath(package_version);
-  BText url = Url(package_version);
-  BSys::MkDir(localRoot_,true);
-  BText order = BText("wget ")+
-    url+" "+
-    "-O\""+ReplaceSlash(path)+"\"";
-  Std(I2("Installing required package ",
-         "Instalando el paquete requerido ")+package_version+"\n"+order+"\n");
-  #ifdef UNIX
-  system(order);
-  #else
-  BSys::WinSystem(order,0,true);
-  #endif 
-  BDir dir = path;
-  bool ok = true;
-  if(!dir.Exist() || !dir.IsFile() || !dir.Bytes())
-  {
-    ok = false;
-    Error(I2("Cannot install empty package ",
-             "No se puede instalar el paquete vacío ")+
-          package_version+"\n"+help_);
-  }
-  return(ok);  
+  BSyntaxObject* fai = GraReal()->EvaluateExpr(BText(
+    "Real TolPackage::Client::FindAndInstall("
+    "\"")+package_version+"\",False);");
+  if(!fai) { return(false); }
+  bool ok = (bool)Real(fai);
+  DESTROY(fai);
+  return(ok);
 }
 
@@ -1417 +1388 @@
   {
     BText path = LocalPath(package_version);
-    BText url = Url(package_version);
-    if(dir.Exist())
+    if(!dir.Exist())
+    {
+      Error(I2("Unknown package ",
+               "El paquete desconocido ")+package_version+
+            I2(" must be manually installed.",
+               " debe ser instalado manualmente."));
+    }
+    else
     {
       BSys::Remove(path);
@@ -1427 +1404 @@
               I2(" has been locally removed ",
                  " ha sido eliminado localmente ")+
-              I2("and will be reinstalled from ",
-                 "y será reinstalado desde ")+
-              url);
+              I2("and will be reinstalled.",
+                 "y será reinstalado."));
         return(Load(package_version, false));
       } 
@@ -1438 +1414 @@
               I2(" has been locally removed ",
                  " ha sido eliminado localmente ")+
-              I2("but it will not be reinstalled again.",
-                 "pero no será reinstalado de nuevo."));
+              I2("and it will not be reinstalled again.",
+                 "y no será reinstalado de nuevo."));
       }  
     }