[hipl-commit] [tiny] Rev 3688: process_modules.py now returns errors and these are handled by configure.

From: Tim Just <tim.just@xxxxxxxxxxxxxx>
To: hipl-commit@xxxxxxxxxxxxx
Date: Tue, 16 Mar 2010 19:16:48 +0200
Committer: Tim Just <tim.just@xxxxxxxxxxxxxx>
Date: 16/03/2010 at 19:16:48
Revision: 3688
Revision-id: tim.just@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Branch nick: tiny

Log:
  process_modules.py now returns errors and these are handled by configure.

Modified:
  M  configure.ac
  M  process_modules.py

=== modified file 'configure.ac'
--- configure.ac        2010-03-16 11:17:17 +0000
+++ configure.ac        2010-03-16 17:16:43 +0000
@@ -308,6 +308,10 @@
 echo "| processing modules...";
 echo "|";
 python ${srcdir}/process_modules.py -s ${srcdir} -d "$DISABLE_MODULES"
+if [[ "$?" != "0" ]]; then
+    echo "configure: error: Module processing failed"
+    exit 1
+fi
 echo "|";
 echo "+-----------------------------------------------"
 echo ""

=== modified file 'process_modules.py'
--- process_modules.py  2010-03-16 13:24:41 +0000
+++ process_modules.py  2010-03-16 17:16:43 +0000
@@ -23,9 +23,14 @@
     apps = {}
     compile_type = 'all'
 
-    file = open(path, "r")
-    dom = xml.dom.minidom.parse(file)
-    file.close()
+    try:
+        file = open(path, "r")
+        try:
+            dom = xml.dom.minidom.parse(file)
+        finally:
+            file.close()
+    except IOError:
+        sys.exit('Error on parsing the info file: ' + path)
 
     for current_app in dom.getElementsByTagName(APPLICATION_TAG_NAME):
         name = str(current_app.attributes[APPLICATION_ATTR_NAME].value)
@@ -211,43 +216,46 @@
     for current_app in applications.keys():
 
         hdr_file_path = os.path.join(output_dir, current_app + suffix)
-        hdr_file = open(hdr_file_path, 'w')
-
-        app_string = 'HIP_' + current_app.upper() + '_MODULES_H'
-
-        hdr_file.write('#ifndef ' + app_string + '\n')
-        hdr_file.write('#define ' + app_string + '\n')
-
-        if includes.has_key(current_app) and 
init_functions.has_key(current_app):
-
-            num_modules = str(len(init_functions[current_app]));
-            for current in includes[current_app]:
-                hdr_file.write('\n#include \"' + current + '\"')
-
-            hdr_file.write('\n\ntypedef int (*pt2Function)(void);\n')
-            hdr_file.write('\nconst int num_modules_' + current_app + ' = ')
-            hdr_file.write(num_modules + ';')
-            hdr_file.write('\n\nstatic const pt2Function ' + current_app)
-            hdr_file.write('_init_functions[' + num_modules + '] = {')
-
-            first_loop = True
-            for function in init_functions[current_app]:
-                if first_loop != True:
-                    hdr_file.write(', ')
-                hdr_file.write('&' + function)
-                first_loop = False
-            hdr_file.write('};')
-        else:
-            hdr_file.write('\n\ntypedef int (*pt2Function)(void);\n')
-            hdr_file.write('\nconst int num_modules_' + current_app + ' = 0;')
-
-            hdr_file.write('\n\nstatic const pt2Function ' + current_app)
-            hdr_file.write('_init_functions[0] = {};')
-
-        hdr_file.write('\n\n#endif /* ' + app_string + ' */')
-        hdr_file.close()
-
-        print '|    created file: ' + hdr_file_path
+
+        try:
+            hdr_file = open(hdr_file_path, 'w')
+            try:
+                app_string = 'HIP_' + current_app.upper() + '_MODULES_H'
+
+                hdr_file.write('#ifndef ' + app_string + '\n')
+                hdr_file.write('#define ' + app_string + '\n')
+
+                if includes.has_key(current_app) and 
init_functions.has_key(current_app):
+                    num_modules = str(len(init_functions[current_app]));
+                    for current in includes[current_app]:
+                        hdr_file.write('\n#include \"' + current + '\"')
+
+                    hdr_file.write('\n\ntypedef int (*pt2Function)(void);\n')
+                    hdr_file.write('\nconst int num_modules_' + current_app + 
' = ')
+                    hdr_file.write(num_modules + ';')
+                    hdr_file.write('\n\nstatic const pt2Function ' + 
current_app)
+                    hdr_file.write('_init_functions[' + num_modules + '] = {')
+
+                    first_loop = True
+                    for function in init_functions[current_app]:
+                        if first_loop != True:
+                            hdr_file.write(', ')
+                        hdr_file.write('&' + function)
+                        first_loop = False
+                    hdr_file.write('};')
+                else:
+                    hdr_file.write('\n\ntypedef int (*pt2Function)(void);\n')
+                    hdr_file.write('\nconst int num_modules_' + current_app + 
' = 0;')
+
+                    hdr_file.write('\n\nstatic const pt2Function ' + 
current_app)
+                    hdr_file.write('_init_functions[0] = {};')
+
+                hdr_file.write('\n\n#endif /* ' + app_string + ' */')
+                print '|    created file: ' + hdr_file_path
+            finally:
+                hdr_file.close()
+        except IOError:
+            sys.exit('Error on creating header files')
 
 # Creates a file at file_path and includes a Makefile.am from all given modules
 # sub directories.
[hipl-commit] [tiny] Rev 3688: process_modules.py now returns errors and these are handled by configure.

Other related posts:
