Rename runner back to xenant

3 files changed, 49 insertions, 94 deletions

diff --git a/setup.py b/setup.py
index c283570..2554ad3 100644
--- a/setup.py
+++ b/setup.py
@@ -32,14 +32,14 @@ setup(
     description=("High-Level build script for doing more complex build tasks"),
     packages=find_packages(),
     test_suite="xnt.tests",
-    scripts=["xnt/runner.py",],
+    scripts=["xnt/xenant.py",],
     package_data={
     },
     long_description=read("README"),
     platforms=["Linux", "Windows",],
     entry_points={
         'console_scripts': [
-            'xnt = xnt.runner:main',
+            'xnt = xnt.xenant:main',
         ],
     },
     install_requires=['distribute',],
diff --git a/xnt/runner.py b/xnt/runner.py
deleted file mode 100644
index b0cf15e..0000000
--- a/xnt/runner.py
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/usr/bin/env python
-
-#   Xnt -- A Wrapper Build Tool
-#   Copyright (C) 2012  Kenny Ballou
-
-#   This program is free software: you can redistribute it and/or modify
-#   it under the terms of the GNU General Public License as published by
-#   the Free Software Foundation, either version 3 of the License, or
-#   (at your option) any later version.
-
-#   This program is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#   GNU General Public License for more details.
-
-#   You should have received a copy of the GNU General Public License
-#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import os
-import sys
-import time
-import logging
-from xnt.cmdoptions import options
-from xnt.commands import commands
-from xnt.commands.target import TargetCommand
-
-logging.basicConfig(format="%(asctime)s:%(levelname)s:%(message)s")
-logger = logging.Logger(name=__name__)
-logger.addHandler(logging.StreamHandler())
-
-def main():
-    start_time = time.time()
-    params = list(p for p in sys.argv[1:] if p.startswith('-D'))
-    flags = list(o for o in sys.argv[1:]
-        if o.startswith('-') and o not in params)
-    cmds = list(c for c in sys.argv[1:]
-        if c not in flags and c not in params)
-    #Loop flags and apply them
-    for flag in flags:
-        if flag in options:
-            options[flag]()
-        else:
-            logger.debug("%s is not a vaild option", flag)
-    #run things
-    cmd_found = False
-    for cmd in cmds:
-        if cmd in commands:
-            cmd_found = True
-            if commands[cmd].needs_build:
-                command = commands[cmd](loadBuild())
-            else:
-                command = commands[cmd]()
-            ec = command.run()
-    if cmd_found == False:
-        command = TargetCommand(loadBuild())
-        ec = command.run(targets=cmds, props=params)
-    elapsed_time = time.time() - start_time
-    logger.info("Execution time: %.3f", elapsed_time)
-    if ec != 0:
-        logger.info("Failure")
-    from xnt.tasks import rm
-    rm("build.pyc",
-       "__pycache__")
-    if ec != 0:
-        sys.exit(ec)
-
-def loadBuild(path=""):
-    if not path:
-        path = os.getcwd()
-    else:
-        path = os.path.abspath(path)
-    sys.path.append(path)
-    cwd = os.getcwd()
-    os.chdir(path)
-    if not os.path.exists("build.py"):
-        logger.error("There was no build file")
-        sys.exit(1)
-    try:
-        return __import__("build", fromlist=[])
-    except ImportError:
-        logger.error("HOW?!")
-        return None
-    finally:
-        sys.path.remove(path)
-        del sys.modules["build"]
-        os.chdir(cwd)
-
-if __name__ == "__main__":
-    ec = main()
-    if ec:
-        sys.exit(ec)
diff --git a/xnt/xenant.py b/xnt/xenant.py
index e2f24d5..b0cf15e 100644
--- a/xnt/xenant.py
+++ b/xnt/xenant.py
@@ -20,8 +20,49 @@ import os
 import sys
 import time
 import logging
+from xnt.cmdoptions import options
+from xnt.commands import commands
+from xnt.commands.target import TargetCommand
 
-logger = logging.getLogger(__name__)
+logging.basicConfig(format="%(asctime)s:%(levelname)s:%(message)s")
+logger = logging.Logger(name=__name__)
+logger.addHandler(logging.StreamHandler())
+
+def main():
+    start_time = time.time()
+    params = list(p for p in sys.argv[1:] if p.startswith('-D'))
+    flags = list(o for o in sys.argv[1:]
+        if o.startswith('-') and o not in params)
+    cmds = list(c for c in sys.argv[1:]
+        if c not in flags and c not in params)
+    #Loop flags and apply them
+    for flag in flags:
+        if flag in options:
+            options[flag]()
+        else:
+            logger.debug("%s is not a vaild option", flag)
+    #run things
+    cmd_found = False
+    for cmd in cmds:
+        if cmd in commands:
+            cmd_found = True
+            if commands[cmd].needs_build:
+                command = commands[cmd](loadBuild())
+            else:
+                command = commands[cmd]()
+            ec = command.run()
+    if cmd_found == False:
+        command = TargetCommand(loadBuild())
+        ec = command.run(targets=cmds, props=params)
+    elapsed_time = time.time() - start_time
+    logger.info("Execution time: %.3f", elapsed_time)
+    if ec != 0:
+        logger.info("Failure")
+    from xnt.tasks import rm
+    rm("build.pyc",
+       "__pycache__")
+    if ec != 0:
+        sys.exit(ec)
 
 def loadBuild(path=""):
     if not path:
@@ -43,3 +84,8 @@ def loadBuild(path=""):
         sys.path.remove(path)
         del sys.modules["build"]
         os.chdir(cwd)
+
+if __name__ == "__main__":
+    ec = main()
+    if ec:
+        sys.exit(ec)