Remove debug messages 06/15606/1
Vincent COUVERT [Fri, 28 Nov 2014 15:33:27 +0000 (16:33 +0100)]
Change-Id: I1946958a7effe672a729f4c86765fd4716f072ec

scilab/modules/dynamic_link/macros/windows/dlwConfigureEnv.sci
scilab/modules/dynamic_link/macros/windows/dlwFindMsVcCompiler.sci

index c6c526b..6939e89 100644 (file)
 //=============================================================================
 function dlwConfigureEnv()
     if getenv("SCILAB_MSVC", "0") == "0" then
-        printf("Configure msvc environment.\n");
         // Configure Ms VC environment
         configure_msvc();
-        if findmsifortcompiler() <> 'unknown' then
+        if findmsifortcompiler() <> "unknown" then
             // Configure Intel Fortran environment
             configure_msifort();
         else
             // Use F2C
-            setenv('USE_F2C', 'YES');
+            setenv("USE_F2C", "YES");
         end
     end
 endfunction
\ No newline at end of file
index d015a74..48b73a5 100644 (file)
@@ -18,11 +18,11 @@ function MSCompiler = dlwFindMsVcCompiler()
     if val <> "" then
         funcs = list(dlwIsVc12Express,dlwIsVc12Pro,dlwIsVc11Express,dlwIsVc11Pro,dlwIsVc10Express,dlwIsVc10Pro);
         compilers = ["msvc120express";
-                    "msvc120pro";
-                    "msvc110express";
-                    "msvc110pro";
-                    "msvc100express";
-                    "msvc100pro";];
+        "msvc120pro";
+        "msvc110express";
+        "msvc110pro";
+        "msvc100express";
+        "msvc100pro";];
         idx = find(val == compilers);
         if idx <> [] then
             func = funcs(idx);
@@ -31,33 +31,31 @@ function MSCompiler = dlwFindMsVcCompiler()
                 return;
             end
         end
-
-//        printf("SCILAB_PREFERED_MSVC ignored.\n");
     end
 
     if dlwIsVc12Express() then
-      MSCompiler = 'msvc120express';     // Microsoft Visual 2013 Express
-      return;
+        MSCompiler = "msvc120express";     // Microsoft Visual 2013 Express
+        return;
     end
 
     if dlwIsVc12Pro() then
-      MSCompiler = 'msvc120pro';       // Microsoft Visual 2013 Professional (or more)
-      return;
+        MSCompiler = "msvc120pro";       // Microsoft Visual 2013 Professional (or more)
+        return;
     end
 
     if dlwIsVc11Express() then
-      MSCompiler = 'msvc110express';     // Microsoft Visual 2012 Express
-      return;
+        MSCompiler = "msvc110express";     // Microsoft Visual 2012 Express
+        return;
     end
 
     if dlwIsVc11Pro() then
-      MSCompiler = 'msvc110pro';       // Microsoft Visual 2012 Professional (or more)
-      return;
+        MSCompiler = "msvc110pro";       // Microsoft Visual 2012 Professional (or more)
+        return;
     end
 
     if dlwIsVc10Pro() & dlwIsVc10Express() then
-      MSCompiler = 'msvc100express';     // Microsoft Visual 2010 Express with SDK extension
-      return;
+        MSCompiler = "msvc100express";     // Microsoft Visual 2010 Express with SDK extension
+        return;
     end
 
     if dlwIsVc10Express() then