Changeset 2699 for simo

Timestamp:

01/28/12 22:35:44 (4 months ago)

Author:

jussi

Message:

change: possibility to have several build inis for custom builds

File:

• simo/branches/memory_worker/build_env.py (modified) (2 diffs)

simo/branches/memory_worker/build_env.py

@@ -323 +323 @@
 
 def _run_builder(py_exe):
-    r = ' '.join((py_exe, conf.BUILDER, 'build', conf.BUILD_INI))
-    msg = 'Running builder: %s' % r
-    logging.info(msg)
-    res = os.system(r)
-    if res != 0:
-        msg = 'Running builder failed!'
-        logging.error(msg)
-        sys.exit(1)
-    if len(conf.EXTRA_DBS) > 0:
-        msg = 'Moving and copying databases...'
-        logging.info(msg)
-        simo_db = os.path.join(conf.DB_PATH, 'simo.db')
-        for db_name in conf.EXTRA_DBS:
-            db = os.path.join(conf.DB_PATH, db_name)
-            shutil.copy2(simo_db, db)
-            shutil.copy2(simo_db + '.zip', db + '.zip')
-            shutil.copy2(simo_db + '.ver', db + '.ver')
-        os.remove(simo_db)
-        os.remove(simo_db + '.zip')
-        os.remove(simo_db + '.ver')
+    for build_ini in conf.BUILD_INIS:
+        r = ' '.join((py_exe, conf.BUILDER, 'build', build_ini[0]))
+        msg = 'Running builder: %s' % r
+        logging.info(msg)
+        res = os.system(r)
+        if res != 0:
+            msg = 'Running builder failed!'
+            logging.error(msg)
+            sys.exit(1)
+        if len(build_ini[1]) > 0:
+            msg = 'Moving and copying databases...'
+            logging.info(msg)
+            simo_db = os.path.join(conf.DB_PATH, 'simo.db')
+            for db_name in build_ini[1]:
+                db = os.path.join(conf.DB_PATH, db_name)
+                shutil.copy2(simo_db, db)
+                shutil.copy2(simo_db + '.zip', db + '.zip')
+                shutil.copy2(simo_db + '.ver', db + '.ver')
+            os.remove(simo_db)
+            os.remove(simo_db + '.zip')
+            os.remove(simo_db + '.ver')
     msg = 'Done'
     logging.info(msg)
@@ -366 +367 @@
             copy_sources('the SIMO models', model_path, to_path,
                          exclude_dirs=conf.EXCLUDE_MODEL_DIRS)
+            if hasattr(conf, 'EXTRA_MODEL_DIR') and conf.EXTRA_MODEL_DIR != '':
+                to_path = '%s/models/%s' \
+                          % (conf.CUSTOM_SIMULATOR, conf.EXTRA_MODEL_DIR)
+                copy_sources('the SIMO models', model_path, to_path,
+                             exclude_dirs=conf.EXCLUDE_MODEL_DIRS)
         if conf.CUSTOM_SIMO:
             copy_sources('the SIMO source', 'simo/src/simo', conf.CUSTOM_SIMO)