bug 9637 add compiler version 71/5171/2
Allan CORNET [Fri, 7 Oct 2011 06:43:14 +0000 (08:43 +0200)]
Change-Id: Id592840eb47423a1eb4cfb2b8f3623720a7de958

scilab/modules/core/src/c/getstaticDebugInfo_Windows.c
scilab/modules/core/src/c/getstaticdebuginfo.c

index 6385fcb..aecfc6e 100644 (file)
@@ -74,9 +74,9 @@ char **getStaticDebugInfo_Windows(int *sizeArray)
     {
 
 #ifdef __INTEL_COMPILER
-        sprintf(str_info,"Compiled with %s","Intel compiler");
+        sprintf(str_info,"Compiled with %s (%d)","Intel compiler", __INTEL_COMPILER);
 #elif defined _MSC_VER
-        sprintf(str_info,"Compiled with %s","Microsoft compiler");
+        sprintf(str_info,"Compiled with %s (%d)","Microsoft compiler", _MSC_FULL_VER);
 #else
         sprintf(str_info,"Compiled with %s","unknown compiler");
 #endif
@@ -102,7 +102,7 @@ char **getStaticDebugInfo_Windows(int *sizeArray)
         {
         default:
         case BLAS_UNKNOW:
-            strcat(str_info, "Unknow");
+            strcat(str_info, "Unknown");
             break;
 
         case BLAS_REF:
index d1b54b6..fc41f33 100644 (file)
@@ -18,8 +18,8 @@
 #include <libxml/xmlversion.h>
 
 #ifdef WITH_TK
-       #include <tcl.h>
-       #include <tk.h>
+#include <tcl.h>
+#include <tk.h>
 #endif
 
 /*
@@ -36,93 +36,100 @@ Commented for now
 #include "MALLOC.h"
 #include "getstaticdebuginfo.h"
 
-
 char **getStaticDebugInfo(int *sizeArray)
 {
-       char **outputStaticList=NULL;
-       int i;
-       static debug_message staticDebug[NB_DEBUG_ELEMENT]={
+    char **outputStaticList = NULL;
+    int i;
+
+    static debug_message staticDebug[NB_DEBUG_ELEMENT] = {
 #ifdef SCI_VERSION
-               {"Scilab Version",SCI_VERSION},
+        {"Scilab Version", SCI_VERSION},
 #endif
 #ifdef __DATE__
-               {"Compilation date",__DATE__},
+        {"Compilation date", __DATE__},
 #endif
 #ifdef __TIME__
-               {"Compilation time",__TIME__},
+        {"Compilation time", __TIME__},
+#endif
+#ifdef __VERSION__
+        {"Compileur version", __VERSION__},
 #endif
 #ifdef LIBXML_DOTTED_VERSION
-               {"XML version", LIBXML_DOTTED_VERSION},
+        {"XML version", LIBXML_DOTTED_VERSION},
 #endif
 #ifdef LIBXML_FLAGS
-               {"XML compilation flags",  LIBXML_FLAGS},
+        {"XML compilation flags", LIBXML_FLAGS},
 #endif
 #ifdef LIBXML_LIBS
-               {"XML libraries",LIBXML_LIBS},
+        {"XML libraries", LIBXML_LIBS},
 #endif
 #ifdef PCRE_VERSION
-               {"PCRE version", PCRE_VERSION},
+        {"PCRE version", PCRE_VERSION},
 #endif
 #ifdef PCRE_FLAGS
-               {"PCRE compilation flags",PCRE_FLAGS},
+        {"PCRE compilation flags", PCRE_FLAGS},
 #endif
 #ifdef PCRE_LIBS
-               {"PCRE libraries",PCRE_LIBS},
+        {"PCRE libraries", PCRE_LIBS},
 #endif
 #ifdef TCL_PATCH_LEVEL
-               {"TCL version", TCL_PATCH_LEVEL},
+        {"TCL version", TCL_PATCH_LEVEL},
 #endif
 #ifdef TK_PATCH_LEVEL
-               {"TK version", TK_PATCH_LEVEL},
+        {"TK version", TK_PATCH_LEVEL},
 #endif
 #ifdef SHARED_LIB_EXT
-               {"Shared library extension",SHARED_LIB_EXT},
+        {"Shared library extension", SHARED_LIB_EXT},
 #endif
 #ifdef WITH_GUI
-               {"Scilab GUI","Enable"},
+        {"Scilab GUI", "Enable"},
 #endif
 #ifdef WITH_FFTW
-               {"FFTW","Enable"},
+        {"FFTW", "Enable"},
 #endif
 #ifdef PATH_SEPARATOR
-               {"Path separator",PATH_SEPARATOR},
+        {"Path separator", PATH_SEPARATOR},
 #endif
 #ifdef DIR_SEPARATOR
-               {"Directory separator",DIR_SEPARATOR},
+        {"Directory separator", DIR_SEPARATOR},
 #endif
 #ifdef WITH_UMFPACK
-               {"UMFPACK","Enable"},
+        {"UMFPACK", "Enable"},
 #ifdef UMFPACK_VERSION
-               {"UMFPACK version",UMFPACK_VERSION},
+        {"UMFPACK version", UMFPACK_VERSION},
 #endif
 #ifdef UMFPACK_VERSION
-               {"UMFPACK version",UMFPACK_VERSION},
+        {"UMFPACK version", UMFPACK_VERSION},
 #endif
 #endif
 #ifndef _LP64
-               {"Compiler Architecture","X86"},
+        {"Compiler Architecture", "X86"},
 #endif
 #ifdef _LP64
-               {"Compiler Architecture","X64"},
+        {"Compiler Architecture", "X64"},
 #endif
-       };
+    };
 
-       for (i=0; i<NB_DEBUG_ELEMENT; i++){
-               debug_message msg=staticDebug[i];
+    for (i = 0; i < NB_DEBUG_ELEMENT; i++)
+    {
+        debug_message msg = staticDebug[i];
 
-               if (msg.description==NULL) /* We reach the end of the static list */
-                       break;
+        if (msg.description == NULL)    /* We reach the end of the static list */
+            break;
 
-               if (outputStaticList) { /* Alloc the big list */
-                       outputStaticList=(char **) REALLOC(outputStaticList, sizeof(char*) * (i+1));
-               } else {
-                       outputStaticList=(char**) MALLOC(sizeof(char*)*(i+1));
-               }
+        if (outputStaticList)
+        {                       /* Alloc the big list */
+            outputStaticList = (char **)REALLOC(outputStaticList, sizeof(char *) * (i + 1));
+        }
+        else
+        {
+            outputStaticList = (char **)MALLOC(sizeof(char *) * (i + 1));
+        }
 
-               /* Create the element in the array */
-               outputStaticList[i]=(char*) MALLOC((strlen(msg.description)+strlen(msg.value)+3)*sizeof(char)); /* 3 for :, space and \0 */
-               sprintf(outputStaticList[i],"%s: %s",msg.description, msg.value);
-       }
-       *sizeArray=i;
-       return outputStaticList;
+        /* Create the element in the array */
+        outputStaticList[i] = (char *)MALLOC((strlen(msg.description) + strlen(msg.value) + 3) * sizeof(char)); /* 3 for :, space and \0 */
+        sprintf(outputStaticList[i], "%s: %s", msg.description, msg.value);
+    }
+    *sizeArray = i;
+    return outputStaticList;
 }