Change the way we initialize the pool's environment

parent 07f1ce6a
...@@ -32,6 +32,7 @@ import sys ...@@ -32,6 +32,7 @@ import sys
from .util.termcolor import colored from .util.termcolor import colored
from .manifest_parser import ManifestParser from .manifest_parser import ManifestParser
from .module_pool import ModulePool from .module_pool import ModulePool
from .env import Env
from . import fetch as fetch_mod from . import fetch as fetch_mod
from ._version import __version__ from ._version import __version__
...@@ -72,7 +73,7 @@ def main(): ...@@ -72,7 +73,7 @@ def main():
modules_pool = ModulePool() modules_pool = ModulePool()
# Set the module_pool environment by providing the options: this is a must! # Set the module_pool environment by providing the options: this is a must!
modules_pool.set_environment(options) modules_pool.env = Env(options)
# Now, we add the first module, the one from which we are launching # Now, we add the first module, the one from which we are launching
# the program: # the program:
......
...@@ -30,9 +30,6 @@ from subprocess import PIPE, Popen ...@@ -30,9 +30,6 @@ from subprocess import PIPE, Popen
import sys import sys
from hdlmake.util import path as path_mod from hdlmake.util import path as path_mod
from hdlmake.env import Env
from hdlmake import new_dep_solver as dep_solver from hdlmake import new_dep_solver as dep_solver
...@@ -188,11 +185,6 @@ class Action(list): ...@@ -188,11 +185,6 @@ class Action(list):
finally: finally:
os.chdir(cwd) os.chdir(cwd)
def set_environment(self, options):
"""Initialize the module pool environment from the provided options"""
env = Env(options)
self.env = env
def __str__(self): def __str__(self):
"""Cast the module list as a list of strings""" """Cast the module list as a list of strings"""
return str([str(m) for m in self]) return str([str(m) for m in self])
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment