Changeset 71a1861 in tol

Timestamp:

Apr 9, 2015, 11:18:33 AM (12 years ago)

Author:

Pedro Gea <pgea@…>

Branches:

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

Children:

662bee9

Parents:

0802b2c

Message:

Refs #1821
Cambios en las funciones para la creación de paquetes binarios

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

File:

• tol/stdlib/TolPackage/packager.tol (modified) (2 diffs)

tol/stdlib/TolPackage/packager.tol

@@ -21 +21 @@
     Date releaseGMT = Copy(NowGmt);
     Set package. = IncludeTOL(sourceRoot<<name<<"/"<<name<<".tol", True);
-    Case(TestAutodoc(package.[1], releaseGMT), {
-      WriteLn("No pudo generarse el paquete.", "E");
-      If(False, ?)
-    }, TestTolVersion(package.[1]), {
-      WriteLn("No pudo generarse el paquete.", "E");
-      If(False, ?)
-    }, True, {
-      package.
-    })
-  };
-
-  ////////////////////////////////////////////////////////////////////////////
-  Set CompilePackage_Variant(Text name, Text variant, Text sourceRoot)
-  ////////////////////////////////////////////////////////////////////////////
-  {
-    Date releaseGMT = Copy(NowGmt);
-    Set package. = IncludeTOL(sourceRoot<<name<<"/"<<name<<"#"<<variant<<".tol", True);
     Case(TestAutodoc(package.[1], releaseGMT), {
       WriteLn("No pudo generarse el paquete.", "E");
@@ -172 +155 @@
       PutName(name, package)
     ]] }, packagePath<<identifier+".oza");
-    Real Ois.Store(ObtainAutodoc(package), packagePath<<"info.oza");
-    Set EvalSet(package::_.autodoc.nonTolResources, Real (Anything resource) {
-      ProcessResource(resource, source, packagePath)
-    });
-    Real PackArchive::PackFull("ZipArchive", ReplaceSlash(packagePath), True);
-    _AsOSDir(packagePath)<<".zip"
-  };
-
-  ////////////////////////////////////////////////////////////////////////////
-  Text BuildZip_Variant(NameBlock package, Text sourceRoot, Text destination)
-  ////////////////////////////////////////////////////////////////////////////
-  {
-    Text name = package::_.autodoc.name;
-    Text identifier = _.autodoc.get.identifier(package);
-    Text source = sourceRoot<<name<<"/";
-    Text packagePath = destination<<identifier<<"/";
-    Real OSDirMake(_AsOSDir(packagePath));
-    Real Ois.Store(Set { [[
-      PutName(name, package)
-    ]] }, packagePath<<identifier+".oza");
-    Real Ois.Store(Copy(Empty), packagePath<<"info.oza");
-    Real Ois.Store(ObtainAutodoc(package), packagePath<<"infov.oza");
+    Text variant = getOptArg(package, "_.autodoc.variant", "");
+    Real If(TextLength(variant), {
+      // Paquete con variante
+      Real Ois.Store(Copy(Empty), packagePath<<"info.oza");
+      Real Ois.Store(ObtainAutodoc(package), packagePath<<"infov.oza");
+    1}, {
+      // Paquete sin variante
+      Real Ois.Store(ObtainAutodoc(package), packagePath<<"info.oza");
+    1});
     Set EvalSet(package::_.autodoc.nonTolResources, Real (Anything resource) {
       ProcessResource(resource, source, packagePath)