Changeset 1ce1326 in tol

Timestamp:

Jun 16, 2010, 4:10:10 PM (16 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

477ebf3

Parents:

d958827

Message:

Refs #916
Los ficheros .oza de los paquetes se almacenan en el subdirectorio packages del repositorio
Corregidos errores lógicos y sintácticos

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

File:

• tol/stdlib/general/TolPackage/builder.tol (modified) (5 diffs)

tol/stdlib/general/TolPackage/builder.tol

@@ -39 +39 @@
     Text _.root = root 
   ]];
-  Real new::Build(void);
+  Real new::Build.All(0);
   new
 };
@@ -93 +93 @@
 //////////////////////////////////////////////////////////////////////////////
 {
-  Set aux = IncludeText("NameBlock "+packageName+";");
+  Set aux = IncludeText("NameBlock "+name+";");
   NameBlock pkg = aux[1];
-  Text name.version = GetCurrentNameVersion(name,specificVersion);
-  Set dependencies = GetDeepDependencies(name);
+  Text name.version = TolPackage::GetCurrentNameVersion(name,specificVersion);
+  Set dependencies = TolPackage::GetDeepDependencies(name, specificVersion);
   Text index.csv =
     pkg:: _.autodoc.url + ";"
@@ -103 +103 @@
   <<If(!specificVersion,?,pkg::_.autodoc.version.high) + ";"
   <<If(!specificVersion,?,pkg::_.autodoc.version.low) + ";"
-  <<pkg::Escape(_.autodoc.brief) + ";"
-  <<pkg::Escape(_.autodoc.keys) + ";"
-  <<pkg::Escape(_.autodoc.authors) + ";"
+  <<Escape(pkg::_.autodoc.brief) + ";"
+  <<Escape(""<<pkg::_.autodoc.keys) + ";"
+  <<Escape(""<<pkg::_.autodoc.authors) + ";"
   <<pkg::_.autodoc.minTolVersion + ";"
   <<Now + ";"
   <<dependencies+ "\n";
-  Text WriteFile(_.root+"register/"+name,  index.csv);
-  Real Ois.Store(aux,_.root+name.version+".oza");
+  WriteLn("[TolPackage::Server::@Builder::Build.PackageInfo.Version] "+
+    name.version+":\n"+index.csv+"\n");
+  Text WriteFile(_.root+"register/"+name.version,  index.csv);
+  Real Ois.Store(aux,_.root+"packages/"+name.version+".oza");
   index.csv
 };
@@ -118 +120 @@
 //////////////////////////////////////////////////////////////////////////////
 {
-  Text Build.PackageInfo.Version(name,True);
-  Text Build.PackageInfo.Version(name,False);
-  True
+  Build.PackageInfo.Version(name,True)+
+  Build.PackageInfo.Version(name,False)
 };
 
@@ -128 +129 @@
 {
   Real new::Initialize(void);
-  Set IncludeText(SetConcat(EvalSet(_.packages, Text(Text pkgName)
+  Set IncludeText(SetSum(EvalSet(_.packages, Text(Text pkgName)
   {
     "Set Include(\""+_.sourceRoot+pkgName+"/"+pkgName+".tol\");"