Changeset 6a75065 in tol

Timestamp:

Jul 9, 2010, 10:06:05 AM (16 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

0813b41

Parents:

670a2e9

Message:

Cada paquete puede tener su propio directorio de fuentes independiente

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

File:

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

tol/stdlib/general/TolPackage/builder.tol

@@ -10 +10 @@
 //////////////////////////////////////////////////////////////////////////////
 
-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 _.sourceRoot;   //Root directory of package's TOL code 
-Set  _.packageList;  //Set of names of packages
-Text _.root;         //Local server-side installing directory
-Text _.register;     //Local server-side register directory
-Text _.index;        //Local server-side index prefix
+Text _.url;           //A unique address with remote or local protocol
+Text _.name;          //A unique name 
+Text _.type;          //Private, Public
+Text _.description;   //Purpose of repository
+Set  _.packageList;   //Set of names of packages
+Set  _.pkgSourcePath; //Set of paths of packages
+Text _.root;          //Local server-side installing directory
+Text _.register;      //Local server-side register directory
+Text _.index;         //Local server-side index prefix
 
 
@@ -28 +28 @@
   Text description,  
   Text sourceRoot,
-  Set packageList)
+  Set packageList_)
 //////////////////////////////////////////////////////////////////////////////
 {
   Text root = TolPackage::Server::_.localRoot+name+"/";
+  Set pkgSourcePath = If(sourceRoot=="",
+  {
+    EvalSet(packageList_,GetFilePath)
+  },
+  {
+    NCopy(Card(packageList_),sourceRoot)
+  });
+  Set packageList = If(sourceRoot=="",
+  {
+    EvalSet(packageList_,GetFilePrefix)
+  },
+  {
+    DeepCopy(packageList_)
+  });
   @Builder new = [[
     Text _.url = url;
@@ -37 +51 @@
     Text _.type = type;
     Text _.description = description;
-    Text _.sourceRoot = sourceRoot;
     Set  _.packageList = packageList;
+    Set  _.pkgSourcePath = pkgSourcePath;
     Text _.root = root;
     Text _.register = root+"register/";
@@ -45 +59 @@
   Real OSDirMake(new::_.root);
   Real OSDirMake(new::_.register);
+
   Real new::Build.All(0);
   new
@@ -131 +146 @@
 
 //////////////////////////////////////////////////////////////////////////////
-Text Build.PackageInfo.Version(Text name, Real specificVersion)
+Text Build.PackageInfo.Version(Text sourcePath, Text name, Real specificVersion)
 //////////////////////////////////////////////////////////////////////////////
 {
   Set aux = IncludeText("NameBlock "+name+";");
   NameBlock pkg = aux[1];
+  Text sourceRoot = sourcePath+"/"+name; 
   Text pkgName = TolPackage::GetCurrentNameVersion(name,specificVersion);
   Set dependencies = TolPackage::GetDeepDependencies(name, specificVersion);
@@ -168 +184 @@
     Set EvalSet(selResources, Real(Text resource)
     {
-      Text orig = _.sourceRoot+name+"/"+resource; 
+      Text orig = sourceRoot+"/"+resource;
       Text dest = ppRoot+"/"+resource;
       Real OSDirMake(dest);
@@ -187 +203 @@
 
 //////////////////////////////////////////////////////////////////////////////
-Text Build.PackageInfo(Text name)
-//////////////////////////////////////////////////////////////////////////////
-{
-  Build.PackageInfo.Version(name,True)+
-  Build.PackageInfo.Version(name,False)
+Text Build.PackageInfo(Text sourcePath, Text name)
+//////////////////////////////////////////////////////////////////////////////
+{
+  Build.PackageInfo.Version(sourcePath, name,True)+
+  Build.PackageInfo.Version(sourcePath, name,False)
 };
 
@@ -200 +216 @@
 {
   Real Initialize(void);
-  Set EvalSet(_.packageList, Real(Text pkgName)
-  {
-    Text AppendFile(_.index+".csv",  Build.PackageInfo(pkgName));
+  Set For(1,Card(_.packageList), Real(Real k)
+  {
+    Text pkgName = _.packageList[k];
+    Text sourcePath = _.pkgSourcePath[k];
+    Text AppendFile(_.index+".csv",  Build.PackageInfo(sourcePath, pkgName));
   //Text AppendFile(_.index+".wiki", index.wiki);
   //Text AppendFile(_.index+".html", index.html);
@@ -212 +230 @@
 
 //////////////////////////////////////////////////////////////////////////////
-Real Rebuild.One(Text pkgName)
+Real Rebuild.One(Text sourcePath, Text pkgName)
 //////////////////////////////////////////////////////////////////////////////
 {
   Real Initialize(void);
-  Text Build.PackageInfo(pkgName);
+  Text Build.PackageInfo(sourcePath,pkgName);
   Set pkgLst = Sort(GetDir(_.register)[2], Real(Text a, Text b)
   {