Changeset 68ac901 in tol

Timestamp:

Nov 16, 2011, 3:33:53 PM (15 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

6da87d6

Parents:

9f0fc0f

Message:

Refs #1341
Using Compare.VersionString with tol versions

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

File:

• tol/stdlib/general/TolPackage/client.tol (modified) (2 diffs)

tol/stdlib/general/TolPackage/client.tol

@@ -126 +126 @@
       {
         Real ok2 = And(
-         vsi[idx]->te_min_tol_version <= TolPackage::_.currentTolVersion,
-         vsi[idx]->te_max_tol_version >= TolPackage::_.currentTolVersion);
+         Compare.VersionString(vsi[idx]->te_min_tol_version,TolPackage::_.currentTolVersion)<=0,
+         Compare.VersionString(vsi[idx]->te_max_tol_version,TolPackage::_.currentTolVersion)>=0;
       //WriteLn("_trace LocalLastCompatible 3 min="<<vsi[idx]->te_min_tol_version);
       //WriteLn("_trace LocalLastCompatible 4 cur="<<TolPackage::_.currentTolVersion);
@@ -934 +934 @@
 {
   Real _trace("DownloadCompatibleDeepDependencies", "Begin", 1);
-  If(tol_version>TolPackage::_.currentTolVersion,
+  If(Compare.VersionString(tol_version,TolPackage::_.currentTolVersion)>0,
   {
     WriteLn("[DownloadCompatibleDeepDependencies] Cannot download packages for "