Changeset 17113dc in tol

Timestamp:

Apr 7, 2016, 8:38:35 AM (11 years ago)

Author:

Pedro Gea <pgea@…>

Branches:

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

Children:

ed8c3b0

Parents:

bfd9533

Message:

Se incorpora la descarga de paquetes por defecto vía wget al uptol.
Se corrigen 3 warnings de init.tol.

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

Files:

• tol/init.cpp (modified) (3 diffs)
• windows/build_tools/_uptol.bat (modified) (1 diff)
• windows/build_tools/download_default_packages.bat (added)

tol/init.cpp

@@ -1308 +1308 @@
   if (initTolPath.Exist()) 
   {
-    InitTOLFile(initTolPath.Name(), loadDefaultPackages);
+    InitTOLFile(initTolPath.Name(), loadDefaultPackages!=0);
     if(loadInitProject)
     {
@@ -1551 +1551 @@
 
   const char * ptr = calledProgram;
+
+#if HAVE_UNISTD_H
   char realPath[1024];
-
-#if HAVE_UNISTD_H
   ssize_t r = readlink( ptr, realPath, 1024 );
   if ( r > 0 )
@@ -1598 +1598 @@
 
   const char * argv0 = argv[0];
-  char realPath[1024];
   
 #if HAVE_UNISTD_H
+  char realPath[1024];
   ssize_t r = readlink( argv0, realPath, 1024 );
   if ( r > 0 )

windows/build_tools/_uptol.bat

@@ -308 +308 @@
 
 Rem descargo paquetes que se distriburan por omision con TOL
-Rem Real TolPackage::Client::_.DefaultFetch(?);
-..\ActiveTOL\bin\tolsh.exe -c "TolPackage::Client::_.DefaultFetch(?)"
+call download_default_packages.bat
 
 Rem Ejecuto los tests si me lo han pedido