From 707b3b769cb987d5b19efb68ec185e2b324a7a5a Mon Sep 17 00:00:00 2001
From: Amar Takhar <amar@rtems.org>
Date: Tue, 9 Jun 2015 12:34:33 -0400
Subject: Rename rtems_config to py.waf and py.config where appropriate.

---
 py/config/__init__.py          |  3 ++-
 py/config/base.py              |  4 ++--
 py/config/options.py           |  2 +-
 py/waf/TODO                    |  2 +-
 py/waf/configure.py            | 10 +++++-----
 py/waf/defaults/bsp/arm.py     |  2 +-
 py/waf/defaults/bsp/avr.py     |  2 +-
 py/waf/defaults/bsp/bfin.py    |  2 +-
 py/waf/defaults/bsp/h8300.py   |  2 +-
 py/waf/defaults/bsp/i386.py    |  2 +-
 py/waf/defaults/bsp/lm32.py    |  2 +-
 py/waf/defaults/bsp/m32c.py    |  2 +-
 py/waf/defaults/bsp/m32r.py    |  2 +-
 py/waf/defaults/bsp/m68k.py    |  2 +-
 py/waf/defaults/bsp/mips.py    |  2 +-
 py/waf/defaults/bsp/moxie.py   |  2 +-
 py/waf/defaults/bsp/nios2.py   |  2 +-
 py/waf/defaults/bsp/powerpc.py |  2 +-
 py/waf/defaults/bsp/sh.py      |  2 +-
 py/waf/defaults/bsp/sparc.py   |  2 +-
 py/waf/defaults/bsp/sparc64.py |  2 +-
 py/waf/defaults/bsp/v850.py    |  2 +-
 py/waf/defaults/options.py     |  2 +-
 py/waf/docs.py                 |  2 +-
 py/waf/rtems_config.py         |  0
 py/waf/tools.py                |  4 ++--
 py/waf/waf.py                  |  2 +-
 wscript                        | 28 ++++++++++++++--------------
 28 files changed, 47 insertions(+), 46 deletions(-)
 mode change 100755 => 100644 py/waf/rtems_config.py

diff --git a/py/config/__init__.py b/py/config/__init__.py
index c8c17ede02..98042341cb 100644
--- a/py/config/__init__.py
+++ b/py/config/__init__.py
@@ -2,7 +2,8 @@ from .base import BuildConfig, Config, Default, Feature, Disable
 from .feature import *
 from .options import *
 
-from rtems_waf import defaults
+from py.waf import defaults # XXX: This needs to be removed as no dependencies from config -> waf are allowed.
+
 
 #XXX: Fix
 # Test to make sure options are sane.
diff --git a/py/config/base.py b/py/config/base.py
index cd8be72cda..d07737e345 100644
--- a/py/config/base.py
+++ b/py/config/base.py
@@ -5,7 +5,7 @@ except ImportError:
 
 from os.path import exists
 #from __init__ import options_map, Default, features_list, config_list
-from rtems_waf.compat import add_metaclass #2to3
+from py.waf.compat import add_metaclass #2to3
 from sys import version_info
 
 Default = None			# Default value.
@@ -418,4 +418,4 @@ class BuildConfig(object):
 # This needs to be here to avoid recursive deps, it's more convenient to
 # have the features in a seperate file.
 #import feature
-#import rtems_waf.defaults.bsp
+#import py.waf.defaults.bsp
diff --git a/py/config/options.py b/py/config/options.py
index a4724c77d3..eb2faaed85 100644
--- a/py/config/options.py
+++ b/py/config/options.py
@@ -1,6 +1,6 @@
 from textwrap import TextWrapper
 from .base import options_map
-from rtems_waf.compat import add_metaclass # 2to3
+from py.waf.compat import add_metaclass # 2to3
 
 wrapper = TextWrapper()
 wrapper.width = 75
diff --git a/py/waf/TODO b/py/waf/TODO
index 372f819aa2..fedefb2f82 100644
--- a/py/waf/TODO
+++ b/py/waf/TODO
@@ -9,7 +9,7 @@ Before Release
 Configure
 ~~~~~~~~~
  * SIZEOF_MODE_T, SIZEOF_VOID_P, BLKSIZE_T... need to be dynamically
-   calculated in rtems_waf/configure.py
+   calculated in py/waf/configure.py
  * Better warnings if an option or section is missing in config.cfg after
    updating when a new option has been added and 'waf config' has not been
    run.
diff --git a/py/waf/configure.py b/py/waf/configure.py
index 3f00c4e0f3..783af45b3c 100644
--- a/py/waf/configure.py
+++ b/py/waf/configure.py
@@ -201,9 +201,9 @@ def build_config(ctx):
 
 
 def cmd_configure(ctx, config):
-	ctx.load('waf', tooldir='rtems_waf')
+	ctx.load('waf', tooldir='py/waf/')
 
-	from rtems_waf.config import BuildConfig
+	from py.config import BuildConfig
 	cfg = BuildConfig()
 
 
@@ -387,7 +387,7 @@ def cmd_configure(ctx, config):
 		write_header("%s/include/rtems/score/cpuopts.h" % bsp)
 
 		ctx.start_msg('Generating GCC spec file')
-		from rtems_waf.tools import generate_gcc_spec_file
+		from py.waf.tools import generate_gcc_spec_file
 		spec_file = generate_gcc_spec_file(ctx, devel=True)
 		ctx.end_msg(spec_file)
 
@@ -417,8 +417,8 @@ def cmd_configure(ctx, config):
 
 	msg("")
 	ctx.start_msg('Generating rtems-config')
-	from rtems_waf.tools import generate_rtems_config
-	generate_rtems_config(ctx, "rtems_waf/rtems_config.py", "rtems-config", devel=True)
+	from py.waf.tools import generate_rtems_config
+	generate_rtems_config(ctx, "py/waf/rtems_config.py", "rtems-config", devel=True)
 	ctx.end_msg("Done")
 
 
diff --git a/py/waf/defaults/bsp/arm.py b/py/waf/defaults/bsp/arm.py
index 2f86cde4db..bd8246762f 100644
--- a/py/waf/defaults/bsp/arm.py
+++ b/py/waf/defaults/bsp/arm.py
@@ -1,4 +1,4 @@
-from rtems_waf.config import Default, Config
+from py.config import Default, Config
 
 class Base(Config):
 	arch = name = "arm"
diff --git a/py/waf/defaults/bsp/avr.py b/py/waf/defaults/bsp/avr.py
index c06ed02f4f..5450c19927 100644
--- a/py/waf/defaults/bsp/avr.py
+++ b/py/waf/defaults/bsp/avr.py
@@ -1,4 +1,4 @@
-from rtems_waf.config import Default, Config
+from py.config import Default, Config
 
 class Base(Config):
 	arch = name = "avr"
diff --git a/py/waf/defaults/bsp/bfin.py b/py/waf/defaults/bsp/bfin.py
index 18a4b9519c..0e565e5af8 100644
--- a/py/waf/defaults/bsp/bfin.py
+++ b/py/waf/defaults/bsp/bfin.py
@@ -1,4 +1,4 @@
-from rtems_waf.config import Default, Config
+from py.config import Default, Config
 
 class Base(Config):
 	arch = name = "bfin"
diff --git a/py/waf/defaults/bsp/h8300.py b/py/waf/defaults/bsp/h8300.py
index faa147536a..bbc6b1bd3a 100644
--- a/py/waf/defaults/bsp/h8300.py
+++ b/py/waf/defaults/bsp/h8300.py
@@ -1,4 +1,4 @@
-from rtems_waf.config import Default, Config
+from py.config import Default, Config
 
 class Base(Config):
 	arch = name = "h8300"
diff --git a/py/waf/defaults/bsp/i386.py b/py/waf/defaults/bsp/i386.py
index 59ce98cee4..44bfe34485 100644
--- a/py/waf/defaults/bsp/i386.py
+++ b/py/waf/defaults/bsp/i386.py
@@ -1,4 +1,4 @@
-from rtems_waf.config import Default, Config
+from py.config import Default, Config
 
 class Base(Config):
 	arch = name = "i386"
diff --git a/py/waf/defaults/bsp/lm32.py b/py/waf/defaults/bsp/lm32.py
index 7caf519587..c5277ea682 100644
--- a/py/waf/defaults/bsp/lm32.py
+++ b/py/waf/defaults/bsp/lm32.py
@@ -1,4 +1,4 @@
-from rtems_waf.config import Default, Config
+from py.config import Default, Config
 
 class Base(Config):
 	arch = name = "lm32"
diff --git a/py/waf/defaults/bsp/m32c.py b/py/waf/defaults/bsp/m32c.py
index aa51d7344b..15d638fd2b 100644
--- a/py/waf/defaults/bsp/m32c.py
+++ b/py/waf/defaults/bsp/m32c.py
@@ -1,4 +1,4 @@
-from rtems_waf.config import Default, Config
+from py.config import Default, Config
 
 class Base(Config):
 	arch = name = "m32c"
diff --git a/py/waf/defaults/bsp/m32r.py b/py/waf/defaults/bsp/m32r.py
index 9ad5fad991..1eb8792048 100644
--- a/py/waf/defaults/bsp/m32r.py
+++ b/py/waf/defaults/bsp/m32r.py
@@ -1,4 +1,4 @@
-from rtems_waf.config import Default, Config
+from py.config import Default, Config
 
 class Base(Config):
 	arch = name = "m32r"
diff --git a/py/waf/defaults/bsp/m68k.py b/py/waf/defaults/bsp/m68k.py
index a6551b1647..ac187f6fa5 100644
--- a/py/waf/defaults/bsp/m68k.py
+++ b/py/waf/defaults/bsp/m68k.py
@@ -1,4 +1,4 @@
-from rtems_waf.config import Default, Config
+from py.config import Default, Config
 
 class Base(Config):
 	arch = name = "m68k"
diff --git a/py/waf/defaults/bsp/mips.py b/py/waf/defaults/bsp/mips.py
index d3f7e7f051..eb2ad83b93 100644
--- a/py/waf/defaults/bsp/mips.py
+++ b/py/waf/defaults/bsp/mips.py
@@ -1,4 +1,4 @@
-from rtems_waf.config import Default, Config
+from py.config import Default, Config
 
 class Base(Config):
 	arch = name = "mips"
diff --git a/py/waf/defaults/bsp/moxie.py b/py/waf/defaults/bsp/moxie.py
index 9516b344fe..96a4d807e2 100644
--- a/py/waf/defaults/bsp/moxie.py
+++ b/py/waf/defaults/bsp/moxie.py
@@ -1,4 +1,4 @@
-from rtems_waf.config import Default, Config
+from py.config import Default, Config
 
 class Base(Config):
 	arch = name = "moxie"
diff --git a/py/waf/defaults/bsp/nios2.py b/py/waf/defaults/bsp/nios2.py
index 1bc451e878..53f8f9d23c 100644
--- a/py/waf/defaults/bsp/nios2.py
+++ b/py/waf/defaults/bsp/nios2.py
@@ -1,4 +1,4 @@
-from rtems_waf.config import Default, Config
+from py.config import Default, Config
 
 class Base(Config):
 	arch = name = "nios2"
diff --git a/py/waf/defaults/bsp/powerpc.py b/py/waf/defaults/bsp/powerpc.py
index 00c4b287a9..4b2f9c69e6 100644
--- a/py/waf/defaults/bsp/powerpc.py
+++ b/py/waf/defaults/bsp/powerpc.py
@@ -1,4 +1,4 @@
-from rtems_waf.config import Default, Config, Disable
+from py.config import Default, Config, Disable
 
 class Base(Config):
 	arch = name = "powerpc"
diff --git a/py/waf/defaults/bsp/sh.py b/py/waf/defaults/bsp/sh.py
index ad919404cb..77782f2d7c 100644
--- a/py/waf/defaults/bsp/sh.py
+++ b/py/waf/defaults/bsp/sh.py
@@ -1,4 +1,4 @@
-from rtems_waf.config import Default, Config
+from py.config import Default, Config
 
 class Base(Config):
 	arch = name = "sh"
diff --git a/py/waf/defaults/bsp/sparc.py b/py/waf/defaults/bsp/sparc.py
index 3d24fd70c9..0c33bffa8f 100644
--- a/py/waf/defaults/bsp/sparc.py
+++ b/py/waf/defaults/bsp/sparc.py
@@ -1,4 +1,4 @@
-from rtems_waf.config import Default, Config
+from py.config import Default, Config
 
 class Base(Config):
 	arch = name = "sparc"
diff --git a/py/waf/defaults/bsp/sparc64.py b/py/waf/defaults/bsp/sparc64.py
index 73003200fb..8b2b4e26a1 100644
--- a/py/waf/defaults/bsp/sparc64.py
+++ b/py/waf/defaults/bsp/sparc64.py
@@ -1,4 +1,4 @@
-from rtems_waf.config import Default, Config
+from py.config import Default, Config
 
 class Base(Config):
 	arch = name = "sparc64"
diff --git a/py/waf/defaults/bsp/v850.py b/py/waf/defaults/bsp/v850.py
index 8d1a22da31..b14adf33f4 100644
--- a/py/waf/defaults/bsp/v850.py
+++ b/py/waf/defaults/bsp/v850.py
@@ -1,4 +1,4 @@
-from rtems_waf.config import Default, Config
+from py.config import Default, Config
 
 class Base(Config):
 	arch = name = "v850"
diff --git a/py/waf/defaults/options.py b/py/waf/defaults/options.py
index 7ea9dc7139..9eac7ccda5 100644
--- a/py/waf/defaults/options.py
+++ b/py/waf/defaults/options.py
@@ -1,4 +1,4 @@
-from rtems_waf.config.options import Boolean, Integer, String, StringList
+from py.config.options import Boolean, Integer, String, StringList
 
 
 class ALLOW_IRQ_NESTING(Boolean):
diff --git a/py/waf/docs.py b/py/waf/docs.py
index 7725133d93..1f00ebfd95 100644
--- a/py/waf/docs.py
+++ b/py/waf/docs.py
@@ -1,5 +1,5 @@
 from bsp import list_bsp
-from rtems_waf.config.base import config_list
+from py.config.base import config_list
 
 
 def header():
diff --git a/py/waf/rtems_config.py b/py/waf/rtems_config.py
old mode 100755
new mode 100644
diff --git a/py/waf/tools.py b/py/waf/tools.py
index 3fafd51691..4bd9ad8952 100644
--- a/py/waf/tools.py
+++ b/py/waf/tools.py
@@ -149,7 +149,7 @@ def rtems_cmd_config(ctx):
 	if ctx.options.list is True:
 		from .bsp import list_bsp
 
-		from rtems_waf.config import BuildConfig
+		from py.config import BuildConfig
 		cfg = BuildConfig()
 
 		for arch in sorted(list_bsp):
@@ -170,7 +170,7 @@ def rtems_cmd_config(ctx):
 	if not bsp_list:
 		ctx.fatal("You must specify a single or comma separated list of BSPs using --bsp")
 
-	from rtems_waf.config import BuildConfig
+	from py.config import BuildConfig
 	cfg = BuildConfig(bsp_list)
 	cfg.option_set("general", "PATH_TOOLS", ctx.options.path_tools or "")
 	cfg.option_set("general", "PREFIX", ctx.options.prefix or "")
diff --git a/py/waf/waf.py b/py/waf/waf.py
index f4c8e14610..a0347a27a6 100644
--- a/py/waf/waf.py
+++ b/py/waf/waf.py
@@ -5,7 +5,7 @@ from waflib.Logs import pprint
 #from waflib.Build import BuildContext, CleanContext, InstallContext, UninstallContext
 #from waflib import Build, Scripting
 #from waflib.Tools import c_preproc
-#from rtems_waf import gccdeps
+#from py.tools import gccdeps
 #from waflib import Logs
 #import ConfigParser
 
diff --git a/wscript b/wscript
index 852e8413b0..b38e27f6cb 100644
--- a/wscript
+++ b/wscript
@@ -17,9 +17,9 @@ from waflib.Build import BuildContext, CleanContext, InstallContext, UninstallCo
 from waflib import Context, Errors
 from waflib.Tools import c_preproc
 from waflib.Logs import pprint
-from rtems_waf.builder import libcpu, libbsp
-from rtems_waf.switch import options
-from rtems_waf.tools import get_file_mtime
+from py.waf.builder import libcpu, libbsp
+from py.waf.switch import options
+from py.waf.tools import get_file_mtime
 from os.path import exists
 
 # RTEMS Version for waf
@@ -116,23 +116,23 @@ BuildContext.get_targets = get_targets
 # These will stay local functions to avoid importing the subcommands
 # upon every invocation which will happen during regular development.
 def cmd_config(ctx):
-	from rtems_waf.tools import rtems_cmd_config
+	from py.waf.tools import rtems_cmd_config
 	rtems_cmd_config(ctx)
 
 def cmd_docs(ctx):
-	from rtems_waf.docs import rtems_cmd_docs
+	from py.waf.docs import rtems_cmd_docs
 	rtems_cmd_docs(ctx)
 
 def cmd_bsp(ctx):
-	from rtems_waf.tools import rtems_cmd_bsp
+	from py.waf.tools import rtems_cmd_bsp
 	rtems_cmd_bsp(ctx)
 
 def cmd_hello(ctx):
-	from rtems_waf.hello import rtems_cmd_hello
+	from py.waf.hello import rtems_cmd_hello
 	rtems_cmd_hello(ctx)
 
 def cmd_info(ctx):
-	from rtems_waf.info import rtems_cmd_info
+	from py.waf.info import rtems_cmd_info
 	rtems_cmd_info(ctx)
 
 # List of commands to override / add
@@ -167,13 +167,13 @@ buildlog.__doc__ = "Available only when --build-json and --build-config are used
 
 # Check sanity of default.cfg
 def checkconfig(ctx):
-	from rtems_waf.tools import rtems_check_config
+	from py.waf.tools import rtems_check_config
 	rtems_check_config(ctx)
 checkconfig.__doc__ = None # Make sure waf doesn't see this as a command.
 
 
 def configure(ctx):
-	from rtems_waf.configure import cmd_configure
+	from py.waf.configure import cmd_configure
 	node = ctx.path.find_node('config.cfg')
 	if not node:
 		ctx.fatal('Run "waf config" first, for example: waf config --bsp sparc/sis --path-tools ~/development/rtems/4.11/bin')
@@ -182,7 +182,7 @@ def configure(ctx):
 	ctx.files.append(node.abspath())
 	ctx.hash = Utils.h_list((ctx.hash, node.read('rb')))
 	# using the standard ctx.recurse() would add the dependency automatically
-	node = ctx.path.find_node('rtems_waf/configure.py')
+	node = ctx.path.find_node('py/waf/configure.py')
 	ctx.files.append(node.abspath())
 	ctx.hash = Utils.h_list((ctx.hash, node.read('rb')))
 	cmd_configure(ctx, config)
@@ -191,9 +191,9 @@ def build(ctx):
 	if ctx.env.ENABLE_SYSTEM_DEP:
 		c_preproc.go_absolute=True
 
-	ctx.load('waf', tooldir='rtems_waf')
+	ctx.load('waf', tooldir='py/waf/')
 
-	from rtems_waf.waf import rtems_stlib_command
+	from py.waf.waf import rtems_stlib_command
 	class cstlib(Task.classes['cstlib']):
 		exec_command = rtems_stlib_command
 
@@ -202,7 +202,7 @@ def build(ctx):
 		and ctx.env.BUILD_JSON \
 		and not ctx.repeat_hack:
 
-		from rtems_waf.debug import logger_json_create, exec_command_json, exec_command_json_extra
+		from py.waf.debug import logger_json_create, exec_command_json, exec_command_json_extra
 		ctx.repeat_hack = True
 
 		# Make sure any previous handlers are closed so logs are written.
-- 
cgit v1.2.3