From ba8a935b28ea8701d6926b28055ce19a8f70fd67 Mon Sep 17 00:00:00 2001 From: Chris Johns Date: Wed, 31 Oct 2012 14:48:27 +1100 Subject: [PATCH] Change name to Source Builder from Tool Builder. --- tb-builder => sb-builder | 4 +-- tb-crossgcc => sb-set-builder | 8 +++--- {tb => sb}/build.py | 0 {tb => sb}/config.py | 0 {tb => sb}/darwin.py | 0 {tb => sb}/defaults.py | 39 +++++++++++++++--------------- {tb => sb}/error.py | 0 {tb => sb}/execute.py | 0 {tb => sb}/freebsd.py | 0 {tb => sb}/linux.py | 0 {tb => sb}/log.py | 0 tb/crossgcc.py => sb/setbuilder.py | 4 +-- {tb => sb}/windows.py | 0 13 files changed, 28 insertions(+), 27 deletions(-) rename tb-builder => sb-builder (91%) rename tb-crossgcc => sb-set-builder (88%) rename {tb => sb}/build.py (100%) rename {tb => sb}/config.py (100%) rename {tb => sb}/darwin.py (100%) rename {tb => sb}/defaults.py (96%) rename {tb => sb}/error.py (100%) rename {tb => sb}/execute.py (100%) rename {tb => sb}/freebsd.py (100%) rename {tb => sb}/linux.py (100%) rename {tb => sb}/log.py (100%) rename tb/crossgcc.py => sb/setbuilder.py (98%) rename {tb => sb}/windows.py (100%) diff --git a/tb-builder b/sb-builder similarity index 91% rename from tb-builder rename to sb-builder index a684a91..440d481 100644 --- a/tb-builder +++ b/sb-builder @@ -20,10 +20,10 @@ import sys, os base = os.path.dirname(sys.argv[0]) -sys.path.insert(0, base + '/tb') +sys.path.insert(0, base + '/sb') try: import build build.run(sys.argv) except ImportError: - print >> sys.stderr, "Incorrect Tool Builder installation" + print >> sys.stderr, "Incorrect Source Builder installation" sys.exit(1) diff --git a/tb-crossgcc b/sb-set-builder similarity index 88% rename from tb-crossgcc rename to sb-set-builder index 2f57b32..7fb4f3a 100755 --- a/tb-crossgcc +++ b/sb-set-builder @@ -20,10 +20,10 @@ import sys, os base = os.path.dirname(sys.argv[0]) -sys.path.insert(0, base + '/tb') +sys.path.insert(0, base + '/sb') try: - import crossgcc - crossgcc.run() + import setbuilder + setbuilder.run() except ImportError: - print >> sys.stderr, "Incorrect Tools Bulder installation" + print >> sys.stderr, "Incorrect Set Bulder installation" sys.exit(1) diff --git a/tb/build.py b/sb/build.py similarity index 100% rename from tb/build.py rename to sb/build.py diff --git a/tb/config.py b/sb/config.py similarity index 100% rename from tb/config.py rename to sb/config.py diff --git a/tb/darwin.py b/sb/darwin.py similarity index 100% rename from tb/darwin.py rename to sb/darwin.py diff --git a/tb/defaults.py b/sb/defaults.py similarity index 96% rename from tb/defaults.py rename to sb/defaults.py index 9868011..0066ed9 100644 --- a/tb/defaults.py +++ b/sb/defaults.py @@ -29,7 +29,7 @@ import os import error import execute -basepath = 'tb' +basepath = 'sb' defaults = { # Nothing @@ -44,12 +44,12 @@ defaults = { '_host_platform': '%{_host_cpu}-%{_host_vendor}-%{_host_os}%{?_gnu}', '_build': '%{_host}', '_arch': '%{_host_arch}', -'_tbdir': '', +'_sbdir': '', '_topdir': os.getcwd(), -'_configdir': '%{_topdir}/config:%{_tbdir}/config', +'_configdir': '%{_topdir}/config:%{_sbdir}/config', '_tardir': '%{_topdir}/tar', '_sourcedir': '%{_topdir}/sources', -'_patchdir': '%{_tbdir}/patches', +'_patchdir': '%{_sbdir}/patches', '_builddir': '%{_topdir}/build/%{name}-%{version}-%{release}', '_docdir': '%{_defaultdocdir}', '_tmppath': '%{_topdir}/build/tmp', @@ -131,23 +131,23 @@ defaults = { # Prebuild set up script. '___build_pre': '''# ___build_pre in as set up in defaults.py # Directories -TB_SOURCE_DIR="%{_sourcedir}" -TB_BUILD_DIR="%{_builddir}" -TB_OPT_FLAGS="%{optflags}" -TB_ARCH="%{_arch}" -TB_OS="%{_os}" -export TB_SOURCE_DIR TB_BUILD_DIR TB_OPT_FLAGS TB_ARCH TB_OS +SB_SOURCE_DIR="%{_sourcedir}" +SB_BUILD_DIR="%{_builddir}" +SB_OPT_FLAGS="%{optflags}" +SB_ARCH="%{_arch}" +SB_OS="%{_os}" +export SB_SOURCE_DIR SB_BUILD_DIR SB_OPT_FLAGS SB_ARCH SB_OS # Documentation -TB_DOC_DIR="%{_docdir}" -export TB_DOC_DIR +SB_DOC_DIR="%{_docdir}" +export SB_DOC_DIR # Packages -TB_PACKAGE_NAME="%{name}" -TB_PACKAGE_VERSION="%{version}" -TB_PACKAGE_RELEASE="%{release}" -export TBPACKAGE_NAME TB_PACKAGE_VERSION TB_PACKAGE_RELEASE +SB_PACKAGE_NAME="%{name}" +SB_PACKAGE_VERSION="%{version}" +SB_PACKAGE_RELEASE="%{release}" +export SBPACKAGE_NAME SB_PACKAGE_VERSION SB_PACKAGE_RELEASE # Build root directory -%{?buildroot:TB_BUILD_ROOT="%{buildroot}"} -export TB_BUILD_ROOT +%{?buildroot:SB_BUILD_ROOT="%{buildroot}"} +export SB_BUILD_ROOT # The compiler flags %{?_targetcflags:CFLAGS_FOR_TARGET="%{_targetcflags}"} %{?_targetcxxflags:CXXFLAGS_FOR_TARGET="%{_targetcxxflags}"} @@ -227,6 +227,7 @@ class command_line: def _help(self): print '%s: [options] [args]' % (self.command_name) + print 'Source Builder, an RTEMS Tools Project (c) 2012 Chris Johns' print 'Options and arguments:' print '--force : Create directories that are not present' print '--trace : Trace the execution (not current used)' @@ -263,7 +264,7 @@ class command_line: self.defaults = {} for to in command_line._long_true_opts: self.defaults[command_line._long_true_opts[to]] = '0' - self.defaults['_tbdir'] = self.command_path + self.defaults['_sbdir'] = self.command_path self._process() def __str__(self): diff --git a/tb/error.py b/sb/error.py similarity index 100% rename from tb/error.py rename to sb/error.py diff --git a/tb/execute.py b/sb/execute.py similarity index 100% rename from tb/execute.py rename to sb/execute.py diff --git a/tb/freebsd.py b/sb/freebsd.py similarity index 100% rename from tb/freebsd.py rename to sb/freebsd.py diff --git a/tb/linux.py b/sb/linux.py similarity index 100% rename from tb/linux.py rename to sb/linux.py diff --git a/tb/log.py b/sb/log.py similarity index 100% rename from tb/log.py rename to sb/log.py diff --git a/tb/crossgcc.py b/sb/setbuilder.py similarity index 98% rename from tb/crossgcc.py rename to sb/setbuilder.py index e48e93d..552ea6e 100644 --- a/tb/crossgcc.py +++ b/sb/setbuilder.py @@ -89,8 +89,8 @@ class crossgcc: prefix = prefix[1:] tmpprefix = os.path.join(tmproot, prefix) tmpbindir = os.path.join(tmpprefix, 'bin') - os.environ['TB_TMPPREFIX'] = tmpprefix - os.environ['TB_TMPBINDIR'] = tmpbindir + os.environ['SB_TMPPREFIX'] = tmpprefix + os.environ['SB_TMPBINDIR'] = tmpbindir os.environ['PATH'] = tmpbindir + os.pathsep + os.environ['PATH'] self._output('path: ' + os.environ['PATH']) return tmproot diff --git a/tb/windows.py b/sb/windows.py similarity index 100% rename from tb/windows.py rename to sb/windows.py