Changeset eaa41f7 in tol

Timestamp:

Dec 11, 2009, 9:45:53 AM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

b83f1d6

Parents:

db53538

Message:

Separating local install from remote upload

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

Location:

tol_pkg

Files:

• _install_tools.tol (added)
• _local_install.bat (added)
• _local_install.tol (added)
• _uploader.tol (modified) (3 diffs)

tol_pkg/_uploader.tol

@@ -5 +5 @@
 //////////////////////////////////////////////////////////////////////////////
 
+Set Include("_install_tools.tol");
+
 //Text compress = "\"c:\Archivos de programa\7-Zip\7z.exe\" a -r -tzip ";
 Text compress = " ";
@@ -10 +12 @@
 Text local = ".";
 Text export = tolpkg+"export";
-Text version = Replace(Tokenizer(Version," ")[1],".","_");
 Text upload = tolpkg+"tol_pkg/"+version;
-Text tolpkg_install = Replace(TolAppDataPath+
-  "OIS/Require/tol_pkg/"+version+"/","\\","/");
 
-Real OSDirRemove(tolpkg_install);
-Real OSDirMake(tolpkg_install);
 Real OSDirRemove(tolpkg);
 Real OSDirMake(tolpkg);
 Real OSDirMake(upload);
 
-Real OSCmdWaitWr(Text order)
-{
-  WriteLn(order);
-  Real OSCmdWait(order)
-};
-
 Real OSCmdWaitWr("svn export --force "
   "https://www.tol-project.org/svn/tolp/trunk/tol_pkg \""+export+"\"");
-
-
-Set packages = 
-[[
-  "HashMap",
-  "MatQuery",
-  "MatEncode",
-  "MulVarFunAprox",
-  "MhCnstrLinRegArima",
-  "GraphTools",
-  "GisTools"
-]];
-/*
-{
-  Set aux = Select(GetDir(export)[2], Real(Text subDir)
-  {
-    Real fst = ASCII(Sub(subDir,1,1)); 
-    If(!LE(ASCII("A"),fst,ASCII("Z")),False,
-    {
-      FileExist(subDir+"/"+subDir+".tol")
-    })
-  });
-  Sort(aux,Real(Text a, Text b) { Compare(a,b) })
-};
-*/
-  
+ 
 Text SetOfTextToWikiList(Set set, Text margin, Text quote)
 {
@@ -94 +60 @@
 ");
   Real Ois.Store(aux[1],upl+".oza");
-  Real OSCmdWaitWr("cp "+upl+".oza \""+ReplaceSlash(tolpkg_install)+"\"");
+  Real OSCmdWaitWr("cp \""+upl+".oza\" \""+ReplaceSlash(tolpkg_install)+"\"");
   Real OSCmdWaitWr("\""+tolpkg+"compress.bat\" "+name)
 });
 
 Real FClose(wiki);
+
 
 Text remoteUser =