Changeset 878425e in tol

Timestamp:

Feb 16, 2012, 10:00:18 AM (15 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

4aaaf4c

Parents:

0e07e12

Message:

Fixes #1436

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

Location:

tol/stdlib

Files:

• general/grammars/_real.tol (modified) (1 diff)
• gui/tcl/_tclutils.tol (modified) (1 diff)

tol/stdlib/general/grammars/_real.tol

@@ -987 +987 @@
 //////////////////////////////////////////////////////////////////////////////
 
-Text GetVersionFromTolProject(Text branch)
-{
-  Text tcl_helper = "
-package require http
-
-proc ::check_url_error { url data } {
-  if {![regexp {v\d\.\d\.\d b\.\d+} $data]} {
-    error \"url $url is not available or has an invalid contents\"
-  }
-}
-
-proc ::get_win_release { {branch {official}} } {
-  set name ${branch}_tol_release_win.txt
-  set url \"http://packages.tol-project.org/win32/${name}\"
-  
-  set data [http::data [http::geturl $url]]
-  check_url_error $url $data
-  set data
-}";
-  
-  Set result0 = Tcl_Eval(tcl_helper);
-  Text If(result0["status"], Text {
-      
-      Set result = Tcl_Eval("::get_win_release " + branch);
-      Text If(result["status"], Text result["result"],
-        {
-          WriteLn(result["result"], "W");
-          Text ""
-        })
-    },
-    {
-      WriteLn(result0["result"], "W");
-      Text ""
-    })  
-};
-
-
 
 //////////////////////////////////////////////////////////////////////////////

tol/stdlib/gui/tcl/_tclutils.tol

@@ -363 +363 @@
 GetDirHelpSection);
 //////////////////////////////////////////////////////////////////////////////
+
+//////////////////////////////////////////////////////////////////////////////
+Text GetVersionFromTolProject(Text branch)
+//////////////////////////////////////////////////////////////////////////////
+{
+  GetUrlContents("http://packages.tol-project.org/win32/"+
+                 branch+"_tol_release_win.txt")
+};
 
 //////////////////////////////////////////////////////////////////////////////