Remove the necessity to append do_ to commands to clean up UI.

diff --git a/bin/oebuild b/bin/oebuild
index beeeae4..e87d459 100644 (file)
--- a/bin/oebuild
+++ b/bin/oebuild
@@ -15,7 +15,7 @@ def usage(errorlevel=0, txt=''):
        print "Usage: oebuild [options]... task oefile"
 #      print "Run TASK on OEFILE or standard input if OEFILE is -."
        print "Run task on oefile."
-       print "Example: oebuild do_build content/glibc-2.3.1.oe"
+       print "Example: oebuild build content/glibc-2.3.1.oe"
        print ""
        print "  %s\t\t%s" % ("-v, --version", "output version information and exit")
        sys.exit(0)
@@ -52,7 +52,7 @@ def get_oefile():
 
 def get_cmd():
        """Get default command"""
-       return "do_build"
+       return "build"
 
 def load_oefile(oefile, cfgdata):
        oepath = data.getVar('OEPATH', cfg)
@@ -73,7 +73,6 @@ def load_oefile(oefile, cfgdata):
        # add that topdir to oepath
        oepath += ":%s" % topdir
        # go there
-       print "chdiring to %s" % topdir
        os.chdir(topdir)
        data.setVar('OEPATH', oepath, cfg)
        from copy import copy
@@ -171,7 +170,7 @@ for var in oedata.keys():
                build.add_task(p, pcontent, pdeps)
 
 try:
-       build.exec_task(cmd, oedata)
+       build.exec_task('do_%s' % cmd, oedata)
 except build.FuncFailed:
        fatal("task stack execution failed")
 except build.EventException:

diff --git a/bin/oemake b/bin/oemake
index a7278e2..dbe09ac 100644 (file)
--- a/bin/oemake
+++ b/bin/oemake
@@ -125,7 +125,7 @@ def build(graph, item):
 def usage():
        print "Usage: oemake [options] [oefile ...]"
 #      print "Run TASK on OEFILE or standard input if OEFILE is -."
-       print "Run OEBuild's do_build task on a set of oe files, following"
+       print "Run OEBuild's build task on a set of oe files, following"
        print "inter-package dependencies."
        print "Also obtains .oe files to build from the OEFILES environment variable."
        print "Example: oemake content/glibc-2.3.1.oe content/patcher-1.0.oe"
@@ -184,12 +184,12 @@ if opthash.has_key('--cmd'):
 if opthash.has_key('-c'):
        cmd = opthash['-c']
 
-_depcmds = { "do_clean": None,
-            "do_mrproper": None,
-            "do_build": "stage", }
+_depcmds = { "clean": None,
+            "mrproper": None,
+            "build": "stage", }
 
 if not cmd:
-       cmd = "do_build"
+       cmd = "build"
 
 if _depcmds.has_key(cmd):
        depcmd=_depcmds[cmd]

diff --git a/doc/TODO b/doc/TODO
index bf302d9..ed85c0d 100644 (file)
--- a/doc/TODO
+++ b/doc/TODO
@@ -54,15 +54,15 @@ TODO:
                        [ ] Allow switching to a debug build for the entirety
                            of the build.  Alter CONFIG for created .pro files,
                            and add -g to appropriate flags.
-                       [ ] Nightly builds will use the same .oe files as those
+                       [x] Nightly builds will use the same .oe files as those
                            used upstream.  This is easily solved, since the use
                            of OE upstream already gives us the necessary event
                            handling.
-                       [ ] Does not require that the build be done as root.
-                       [ ] Simplicity of .oe file naming (PV/PR inside .oe)
+                       [x] Does not require that the build be done as root.
+                       [x] Simplicity of .oe file naming (PV/PR inside .oe)
                        [ ] Tests for versioning
                        [ ] Wrapper Makefile -> oemake
-                       [ ] Command as <cmd> as opposed to do_<cmd>
+                       [x] Command as <cmd> as opposed to do_<cmd>
                        [ ] Target device filesystem locations as metadata
                            items so that all the packages can install things
                            into proper locations.  This is highly distribution
@@ -95,12 +95,12 @@ TODO:
            for the entire upward path in the digraph, then builds that task.
            (same thing done when the md5 changes on an affected var in
             check_md5)
-       [ ] Default OEFILES based on .oe files in the current directory.
+       [x] Default OEFILES based on .oe files in the current directory.
 
 [.] oemake
        [ ] Check for recursive dependency
        [ ] Deal with multiple provides
-       [ ] Default OEFILES based on .oe files in the current directory.
+       [x] Default OEFILES based on .oe files in the current directory.
 
 [.] oemaked
        [ ] Monitor the stamps for a given .oe file as well, to ensure