Changeset 98a5740 in tol

Timestamp:

Jun 16, 2010, 12:55:21 PM (16 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

7ccb257

Parents:

0d9c5b3

Message:

Refs #916
GetNameVersion renombrado como GetCurrentNameVersion
AddPackageInfo.Version y AddPackageInfo renomrados como Build.PackageInfo.Version y Build.PackageInfo
Se añaden los miembros

Text _.sourceRoot; Root directory of package's TOL code
Set _.packages; Set of names of packages

Se añaden los métodos Build.All y Rebuild.One

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

File:

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

tol/stdlib/general/TolPackage/builder.tol

@@ -14 +14 @@
 Text _.type;         //Private, Public
 Text _.description;  //Purpose of repository
+Text _.sourceRoot;   //Root directory of package's TOL code 
+Set _.packages;      //Set of names of packages
 Text _.root;         //Local server-side installing directory
 
 //////////////////////////////////////////////////////////////////////////////
 Static @Builder Create(
-  Text url,          //A unique address with remote or local protocol
-  Text name,         //A unique name 
-  Text type,         //Private, Public
-  Text description)  //Purpose of repository
+  Text url,          
+  Text name,         
+  Text type,         
+  Text description,  
+  Text sourceRoot,
+  Set packages)
 //////////////////////////////////////////////////////////////////////////////
 {
+  Text root = TolPackage::Server::_.localRoot+name+"/";
+  Real OSDirMake(root+"register/");
   @Builder new = [[
     Text _.url = url;
@@ -29 +35 @@
     Text _.type = type;
     Text _.description = description;
-    Text _.root = TolPackage::Server::_.localRoot+name+"/" ]];
-  Real new::Initialize(void)
+    Text _.sourceRoot = sourceRoot;
+    Set _.packages = packages;
+    Text _.root = root 
+  ]];
+  Real new::Build(void);
+  new
 };
 
@@ -55 +65 @@
   "//PURPOSE : internal use of Class TolPackage::Client::@Repository             \n"
   "//                                                                            \n"
-  "//       PLEASE, DON'T TOUCH THIS FILE NOR OTHER ONE IN THIS DIRECTORY!       \n"
+  "//       PLEASE, DONŽT TOUCH THIS FILE NOR OTHER ONE IN THIS DIRECTORY!       \n"
   "//                                                                            \n"
   "//////////////////////////////////////////////////////////////////////////////\n"
@@ -80 +90 @@
 
 //////////////////////////////////////////////////////////////////////////////
-Real AddPackageInfo.Version(NameBlock pkg, Real specificVersion)
+Text Build.PackageInfo.Version(Text name, Real specificVersion)
 //////////////////////////////////////////////////////////////////////////////
 {
-  Text name = Name(pkg);
-  Text name.version = GetNameVersion(pkg);
+  Set aux = IncludeText("NameBlock "+packageName+";");
+  NameBlock pkg = aux[1];
+  Text name.version = GetCurrentNameVersion(name,specificVersion);
   Set dependencies = GetDeepDependencies(name);
   Text index.csv =
@@ -98 +109 @@
   <<Now + ";"
   <<dependencies+ "\n";
-  Text AppendFile(_.root+"index.csv",  index.csv);
-  //Text AppendFile(root+"index.wiki", index.wiki);
-  //Text AppendFile(root+"index.html", index.html);
+  Text WriteFile(_.root+"register/"+name,  index.csv);
+  Real Ois.Store(aux,_.root+name.version+".oza");
+  index.csv
+};
+
+//////////////////////////////////////////////////////////////////////////////
+Text Build.PackageInfo(Text name)
+//////////////////////////////////////////////////////////////////////////////
+{
+  Text Build.PackageInfo.Version(name,True);
+  Text Build.PackageInfo.Version(name,False);
   True
 };
 
 //////////////////////////////////////////////////////////////////////////////
-Real AddPackage(NameBlock pkg)
+Real Build.All(Real void)
 //////////////////////////////////////////////////////////////////////////////
 {
-  Real AddPackageInfo.Version(pkg,True);
-  Real AddPackageInfo.Version(pkg,False)
+  Real new::Initialize(void);
+  Set IncludeText(SetConcat(EvalSet(_.packages, Text(Text pkgName)
+  {
+    "Set Include(\""+_.sourceRoot+pkgName+"/"+pkgName+".tol\");"
+  })));
+  Set EvalSet(_.packages, Real(Text pkgName)
+  {
+    Text AppendFile(_.root+"index.csv",  Build.PackageInfo(pkgName));
+  //Text AppendFile(_.root+"index.wiki", index.wiki);
+  //Text AppendFile(_.root+"index.html", index.html);
+    True
+  });
+  True
+};
+
+//////////////////////////////////////////////////////////////////////////////
+Real Rebuild.One(Text pkgName)
+//////////////////////////////////////////////////////////////////////////////
+{
+  Real new::Initialize(void);
+  Set IncludeText(
+    "Set Include(\""+_.sourceRoot+pkgName+"/"+pkgName+".tol\");"
+  );
+  Text Build.PackageInfo(pkgName);
+  Set pkgLst = Sort(GetDir(_.root+"register/")[2], Real(Text a, Text b)
+  {
+    Compare(b,a)
+  });
+  Set EvalSet(pkgLst, Real(Text pkgName)
+  {
+    Text AppendFile(_.root+"index.csv",ReadFile(_.root+"register/"+pkgName));
+    True 
+  });
+  True
 }