more general module loading; do not use __dict__ directly

[mass-build.git] / mass_build.py

diff --git a/mass_build.py b/mass_build.py
index e327b7ee2e91c23ea86b6226f949813de281c5ae..c5f4dddf9a1f11fbbab85b882baa3dc824b067f4 100755 (executable)
--- a/mass_build.py
+++ b/mass_build.py
@@ -21,10 +21,10 @@ import argparse, os, sys, subprocess
 from collections import OrderedDict
 
 # helper funcrions
 from collections import OrderedDict
 
 # helper funcrions

-def load_module(name, path):
+def load_module(name, path, write_bytecode = False):

        import importlib.machinery
        old_val = sys.dont_write_bytecode
        import importlib.machinery
        old_val = sys.dont_write_bytecode

-       sys.dont_write_bytecode = True
+       sys.dont_write_bytecode = not write_bytecode

        module = importlib.machinery.SourceFileLoader(name, path).load_module()
        sys.dont_write_bytecode = old_val
        return module
        module = importlib.machinery.SourceFileLoader(name, path).load_module()
        sys.dont_write_bytecode = old_val
        return module


@@ -60,7 +60,7 @@ class Project:
 
 # read command-line arguments
 parser = argparse.ArgumentParser(description='Update and build a bunch of stuff')
 
 # read command-line arguments
 parser = argparse.ArgumentParser(description='Update and build a bunch of stuff')

-parser.add_argument("-c, --config",
+parser.add_argument("-c", "--config",

                     dest="config", default="mass-build.conf",
                     help="mass-build config file")
 parser.add_argument("--reconfigure",
                     dest="config", default="mass-build.conf",
                     help="mass-build config file")
 parser.add_argument("--reconfigure",


@@ -88,7 +88,7 @@ if args.reset_source and not args.update:
        raise Exception("Can not reset sources without doing an update")
 
 # load config as dictionary
        raise Exception("Can not reset sources without doing an update")
 
 # load config as dictionary

-config = load_module('config', args.config).__dict__
+config = vars(load_module('config', args.config))

 
 # initialise variables holding the configuration
 allProjects = OrderedDict() # all projects
 
 # initialise variables holding the configuration
 allProjects = OrderedDict() # all projects