build: cleanup

m-labs · Sep 28, 2015 · 7c9a7ee · 7c9a7ee
1 parent 09003a5
commit 7c9a7ee
Showing 2 changed files with 4 additions and 35 deletions.
diff --git a/migen/build/generic_platform.py b/migen/build/generic_platform.py
@@ -1,11 +1,9 @@
 import os
-import sys
 
 from migen.fhdl.structure import Signal
 from migen.genlib.record import Record
 from migen.genlib.io import CRG
 from migen.fhdl import verilog, edif
-from migen.util.misc import autotype
 from migen.build import tools
 
 
@@ -282,17 +280,13 @@ def do_finalize(self, fragment, *args, **kwargs):
     def add_source(self, filename, language=None, library=None):
         if language is None:
             language = tools.language_by_filename(filename)
-
         if language is None:
-            language = "verilog"  # default to Verilog
+            language = "verilog"
 
         if library is None:
-            library = "work"  # default to work
+            library = "work"
 
-        filename = os.path.abspath(filename)
-        if sys.platform == "win32" or sys.platform == "cygwin":
-            filename = filename.replace("\\", "/")
-        self.sources.add((filename, language, library))
+        self.sources.add((os.path.abspath(filename), language, library))
 
     def add_sources(self, path, *filenames, language=None, library=None):
         for f in filenames:
@@ -314,10 +308,7 @@ def add_source_dir(self, path, recursive=True, library=None):
                 self.add_source(filename, language, library)
 
     def add_verilog_include_path(self, path):
-        path = os.path.abspath(path)
-        if sys.platform == "win32" or sys.platform == "cygwin":
-            path = path.replace("\\", "/")
-        self.verilog_include_paths.add(path)
+        self.verilog_include_paths.add(os.path.abspath(path))
 
     def resolve_signals(self, vns):
         # resolve signal names in constraints
@@ -348,15 +339,5 @@ def get_edif(self, fragment, cell_library, vendor, device, **kwargs):
     def build(self, fragment):
         raise NotImplementedError("GenericPlatform.build must be overloaded")
 
-    def build_cmdline(self, *args, **kwargs):
-        arg = sys.argv[1:]
-        if len(arg) % 2:
-            print("Missing value for option: {}".format(sys.argv[-1]))
-            sys.exit(1)
-
-        argdict = dict((k, autotype(v)) for k, v in zip(*[iter(arg)] * 2))
-        kwargs.update(argdict)
-        self.build(*args, **kwargs)
-
     def create_programmer(self):
         raise NotImplementedError
diff --git a/migen/util/misc.py b/migen/util/misc.py
@@ -20,18 +20,6 @@ def xdir(obj, return_values=False):
                 yield attr
 
 
-def autotype(s):
-    if s == "True":
-        return True
-    elif s == "False":
-        return False
-    try:
-        return int(s, 0)
-    except ValueError:
-        pass
-    return s
-
-
 def gcd_multiple(numbers):
     l = len(numbers)
     if l == 1: