Changeset b6e5dacc in tol

Timestamp:

Feb 10, 2015, 9:48:20 PM (12 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

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

Children:

cc7ddc7

Parents:

950d323

Message:

refs #1812, refs #1818, compilación basada en CMake, eliminación de warnings, automatización de la regla install.

Configuración en Linux como:

cmake -DCMAKE_TOOLCHAIN_FILE=../linux-i686.toolchain.cmake -DTOL_PREFIX_PATH=/usr/local/tol32 -DCMAKE_BUILD_TYPE=Release -DTCL_LIBRARY=/usr/local/tcl8.5-i686/lib/libtcl8.5.so ..

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

Location:

toltcl

Files:

• CMakeLists.txt (added)
• cmake/modules/FindTOL.cmake (added)
• cmake/modules/LibFindMacros.cmake (added)
• cmake/modules/MSysMacros.cmake (added)
• generic/CMakeLists.txt (added)
• generic/tolaccess.cpp (modified) (5 diffs)
• generic/tolsergrp.cpp (modified) (3 diffs)
• generic/toltableset.cpp (modified) (2 diffs)
• generic/toltcl.c (modified) (1 diff)
• generic/toltcl.h (modified) (1 diff)
• generic/toltime.cpp (modified) (1 diff)
• library/CMakeLists.txt (added)
• library/pkgIndex.tcl.in (added)
• linux-i686.toolchain.cmake (added)

toltcl/generic/tolaccess.cpp

@@ -745 +745 @@
     }
     objname = Tcl_GetString(items[1]);
+
     Tcl_UtfToExternalDString(NULL,objname,-1,&dstr);
     syn = gra->FINDVARIABLE(Tcl_DStringValue(&dstr));
@@ -1312 +1313 @@
   
   int datac;
-  Tcl_Obj ** datav = new ( Tcl_Obj* [ NUM_ARGS ] );
+  Tcl_Obj ** datav = new Tcl_Obj*[ NUM_ARGS ];
 
   // is ok to ask for a list
@@ -1656 +1657 @@
     tmp = I0.GetText();
     subitems[0] = Tcl_NewStringObj(tmp,-1);
-#if defined(_TOL_FROZEN_)
     value = (*serie)[I0];
-#else
-    value = (*serie)(I0);
-#endif
     if ( value.IsKnown() )
       subitems[1] = Tcl_NewDoubleObj(value.Value());
@@ -2547 +2544 @@
       printf("message: %s\n", ((BText&)str).Buffer());
       printf("objv[1] : %s\n", Tcl_GetString(objv[1]));
-      printf("%s\n", TT_interp->result);
+      printf("%s\n", Tcl_GetStringResult(TT_interp));
     }
     /* release the objects */
@@ -2602 +2599 @@
     if (status != TCL_OK) {
       printf("%s -- error in Tcl_EvalObjv:\n", CMD_SERIECHART);
-      printf("%s\n", TT_interp->result);
+      printf("%s\n", Tcl_GetStringResult(TT_interp));
       printf("objv[1] : %s\n", Tcl_GetString(objv[1]));
       printf("objv[2] : %s\n", Tcl_GetString(objv[2]));

toltcl/generic/tolsergrp.cpp

@@ -1899 +1899 @@
     do {
       iter_cursor = cursors.data[iter];
-#if defined(_TOL_FROZEN_)
       dat = (*(iter_cursor->serie))[cur_date];
-#else
-      dat = (*(iter_cursor->serie))(cur_date);
-#endif
       if (dat.IsKnown())
         iter_cursor->append(idx_dating,dat.Value());
@@ -2137 +2133 @@
     do {
       iter_cursor = cursors.data[iter];
-#if defined(_TOL_FROZEN_)
       dat = (*(iter_cursor->serie))[cur_date];
-#else
-      dat = (*(iter_cursor->serie))(cur_date);
-#endif
       if (dat.IsKnown())
         iter_cursor->append(idx_dating,dat.Value());
@@ -2266 +2258 @@
   uts->ReadData();
   for ( i = 0; i < size_t(length); i++ ) {
-#if defined(_TOL_FROZEN_)
     serdata(i) = (*uts)[I0];
-#else
-    serdata(i) = (*uts)(I0); 
-#endif
     I0 += tms;
   }

toltcl/generic/toltableset.cpp

@@ -121 +121 @@
   int AppendUnknown();
   int AppendEmptyReal();
-  int AppendText( char * txt );
+  int AppendText( const char * txt );
   /* prepend functions */
   int PrependReal( Tcl_Interp * interp, double v );
@@ -559 +559 @@
  */
 
-int Tol_ColumnData::AppendText( char * txt )
+int Tol_ColumnData::AppendText( const char * txt )
 {
 #ifdef _DEBUG_TABLE_

toltcl/generic/toltcl.c

@@ -183 +183 @@
       printf("%s in file %s at line %d\n. str_ernno : %s",
              reason, file, line, Tol_gsl_strerror(gsl_errno));
-      printf("interp : %s\n", TT_interp->result);
+      printf("interp : %s\n", Tcl_GetStringResult(TT_interp));
     }
   }  

toltcl/generic/toltcl.h

@@ -27 +27 @@
 #include <tcl.h>
 
+#if defined(__TOLTCL_MAJOR_VERSION__)
+#define TOLTCL_MAJOR_VERSION    __TOLTCL_MAJOR_VERSION__
+#else
+#define TOLTCL_MAJOR_VERSION    3
+#endif
+
+#if defined(__TOLTCL_MINOR_VERSION__)
+#define TOLTCL_MINOR_VERSION    __TOLTCL_MINOR_VERSION__
+#else
+#define TOLTCL_MINOR_VERSION    2
+#endif
+
+#define TOLTCL_TO_STRING0( x ) #x
+#define TOLTCL_TO_STRING(  x )  TOLTCL_TO_STRING0( x )
+
+#ifdef PACKAGE_VERSION
+ #define TOLTCL_VERSION PACKAGE_VERSION
+#else
+
+#define TOLTCL_VERSION TOLTCL_TO_STRING( TOLTCL_MAJOR_VERSION ) "." TOLTCL_TO_STRING( TOLTCL_MINOR_VERSION )
+#endif
+
 /*
  * Windows needs to know which symbols to export. Unix does not.
  * BUILD_TOLTCL should be undefined for Unix.
  */
-
-#define TOLTCL_MAJOR_VERSION    3
-#define TOLTCL_MINOR_VERSION    2
-#ifdef PACKAGE_VERSION
- #define TOLTCL_VERSION PACKAGE_VERSION
-#else
- #define TOLTCL_VERSION          "3.2"
-#endif
 
 #ifdef BUILD_TOLTCL

toltcl/generic/toltime.cpp

@@ -87 +87 @@
   int    Minute()     const { return current.Minute(); }
   double         Second()     const { return current.Second(); }
-#if defined(_TOL_FROZEN_)
   int Contain( BDate & d ) { return uts->Contain( d ); }
-#else
-  int Contain( BDate & d ) { return uts->Contain( d, BTRUE ); }
-#endif
 };