Conf: Added configuration options (for matlab/mex)

Signed-off-by: Nicola Vigano <nicola.vigano@esrf.fr>

zUtil_Conf/conf.example.xml

@@ -103,6 +103,9 @@
         <lib>mysqlclient</lib>
         <lib>z</lib>
       </libraries>
+      <preprocessor>
+        <option>-compatibleArrayDims</option>
+      </preprocessor>
     </file>
 
     <file>

zUtil_Python/dct_compile_mex_functions.py

@@ -141,7 +141,7 @@ class MexBuilder(object):
             self.out.printSubSubJob('File', file_name + ' ( ' + self.c_files[file_name] + ' )')
         print('')
 
-    def _buildMakeCmd(self, cmd, includes, lib_paths, libs, defines):
+    def _buildMakeCmd(self, cmd, includes, lib_paths, libs, defines, options):
         if self.out.verboseLevel > 1:
             cmd.append('-v')
         if self.debug is True:
@@ -155,6 +155,10 @@ class MexBuilder(object):
             cmd.append("-l" + lib)
         for define in defines:
             cmd.append("-D" + define)
+        for option in options:
+            cmd.append(option)
+        if "-compatibleArrayDims" not in options:
+            cmd.append("-largeArrayDims")
 #         cmd.append("-largeArrayDims") # This unfortunately conflicts with mym.cpp
         self.out.printSubSubJob('File', cmd[1] + ' (cmd: ' + string.join(cmd, ' ') + ' )')
         return subprocess.call(cmd)
@@ -172,6 +176,7 @@ class MexBuilder(object):
         lib_paths = []
         libs = []
         defines = []
+        options = []
 
         if (self.mex_info is not None) \
                 and (self.mex_info.isExcluded(file_path) is False):
@@ -183,8 +188,9 @@ class MexBuilder(object):
                 lib_paths = lib_paths + props.get("lib_paths")
                 libs = libs + props.get("libs")
                 defines = defines + props.get("defines")
+                options = options + props.get("options")
 
-        return self._buildMakeCmd(cmd, includes, lib_paths, libs, defines)
+        return self._buildMakeCmd(cmd, includes, lib_paths, libs, defines, options)
 
     def compileFuncs(self):
         """

zUtil_Python/dct_io_xml.py

@@ -189,6 +189,10 @@ class MexConf(object):
                 for lib in fileEntry.findall("preprocessor/define"):
                     output["defines"].append(lib.text)
 
+                output["options"] = []
+                for lib in fileEntry.findall("preprocessor/option"):
+                    output["options"].append(lib.text)
+
                 return output
         else:
             return None