Changeset 2704

Timestamp:

02/02/12 20:15:44 (4 months ago)

Author:

jussi

Message:

change: conf change to combine builder ini and extra_dbs settings

Location:

simo/trunk

Files:

• build_env.py (modified) (1 diff)
• dev/conf.py (modified) (1 diff)

simo/trunk/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 b_info in conf.BUILD_INIS:
+        b_ini, extra_dbs = b_info
+        r = ' '.join((py_exe, conf.BUILDER, 'build', b_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(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 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')
     msg = 'Done'
     logging.info(msg)

simo/trunk/dev/conf.py

@@ -18 +18 @@
 RUN_BUILDER = True
 BUILDER = 'src/builder.py'
-BUILD_INI = 'simulator/builder.ini'
+BUILD_INIS = [('simulator/builder.ini', [])]
 # where to put the SIMO db, and should it be cloned to additional dbs
 DB_PATH = 'simulator/db'
-EXTRA_DBS = []
 # where to copy the SIMO source if any
 CUSTOM_SIMO = ''