From d1a07b31e493a5e415b35a3cf49ad6993164090a Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Thu, 22 Jan 2009 20:02:53 +0000 Subject: Remove duplicate scripts. Really get run with no args back to work. --- diff --git a/scripts/bundlemodule.py b/scripts/bundlemodule.py deleted file mode 100644 index 3a662c1..0000000 --- a/scripts/bundlemodule.py +++ /dev/null @@ -1,94 +0,0 @@ -__metaclass__ = type - -import os - -from jhbuild.errors import BuildStateError -from jhbuild.modtypes import Package, get_branch, register_module_type - -__all__ = [ 'BundleModule' ] - -class BundleModule(Package): - type = 'bundle' - - STATE_CHECKOUT = 'checkout' - STATE_FORCE_CHECKOUT = 'force_checkout' - STATE_BUILD = 'build' - STATE_INSTALL = 'install' - - def __init__(self, name, branch, dependencies=[], after=[]): - Package.__init__(self, name, dependencies, after) - self.branch = branch - - def get_srcdir(self, buildscript): - return self.branch.srcdir - - def get_builddir(self, buildscript): - return self.get_srcdir(buildscript) - - def get_revision(self): - return self.branch.branchname - - def do_start(self, buildscript): - pass - do_start.next_state = STATE_CHECKOUT - do_start.error_states = [] - - def skip_checkout(self, buildscript, last_state): - # skip the checkout stage if the nonetwork flag is set - return buildscript.config.nonetwork - - def do_checkout(self, buildscript): - srcdir = self.get_srcdir(buildscript) - buildscript.set_action('Checking out', self) - self.branch.checkout(buildscript) - # did the checkout succeed? - if not os.path.exists(srcdir): - raise BuildStateError('source directory %s was not created' - % srcdir) - do_checkout.next_state = STATE_BUILD - do_checkout.error_states = [STATE_FORCE_CHECKOUT] - - def skip_force_checkout(self, buildscript, last_state): - return False - - def do_force_checkout(self, buildscript): - buildscript.set_action('Checking out', self) - self.branch.force_checkout(buildscript) - do_force_checkout.next_state = STATE_BUILD - do_force_checkout.error_states = [STATE_FORCE_CHECKOUT] - - def skip_build(self, buildscript, last_state): - return buildscript.config.nobuild - - def do_build(self, buildscript): - buildscript.set_action('Building', self) - srcdir = self.get_srcdir(buildscript) - builddir = self.get_builddir(buildscript) - python = os.environ.get('PYTHON', 'python') - cmd = [python, 'setup.py', 'build'] - buildscript.execute(cmd, cwd=srcdir) - do_build.next_state = STATE_INSTALL - do_build.error_states = [STATE_FORCE_CHECKOUT] - - def skip_install(self, buildscript, last_state): - return buildscript.config.nobuild - - def do_install(self, buildscript): - buildscript.set_action('Installing', self) - srcdir = self.get_srcdir(buildscript) - builddir = self.get_builddir(buildscript) - python = os.environ.get('PYTHON', 'python') - cmd = [python, 'setup.py', 'install'] - cmd.extend(['--prefix', buildscript.config.prefix]) - buildscript.execute(cmd, cwd=srcdir) - buildscript.packagedb.add(self.name, self.get_revision() or '') - do_install.next_state = Package.STATE_DONE - do_install.error_states = [] - - -def parse_bundle(node, config, uri, repositories, default_repo): - id = node.getAttribute('id') - branch = get_branch(node, repositories, default_repo, config) - return BundleModule(id, branch) - -register_module_type('bundle', parse_bundle) diff --git a/scripts/config.py b/scripts/config.py deleted file mode 100644 index eaa6b36..0000000 --- a/scripts/config.py +++ /dev/null @@ -1,75 +0,0 @@ -import os -import sys - -import jhbuild.config - -import sysdeps - -class Config(jhbuild.config.Config): - def __init__(self, base_dir, rc_file): - self.base_dir = base_dir - jhbuild.config.Config.__init__(self, os.path.join(self.base_dir, 'sugar.jhbuildrc')) - self._setup() - - def _setup(self): - self.autogenargs = '' - - self.checkoutroot = os.path.join(self.base_dir, 'source') - self.tarballdir = os.path.join(self.base_dir, 'source') - - for package, source in sysdeps.get_packages(): - if source and source not in self.skip: - self.skip.append(source) - - def setup_env(self): - # Hack to replace the default prefix - if self.prefix == '/opt/gnome2': - self.prefix = os.path.join(self.base_dir, 'install') - - #Hack to allow sugar-jhbuild to find its self again. - - MY_PATH = os.getenv('PATH', 'Error') - os.environ["PATH"] = MY_PATH + ':' + self.base_dir - - jhbuild.config.Config.setup_env(self) - - jhbuild.config.addpath('XDG_DATA_DIRS', '/usr/share') - jhbuild.config.addpath('XDG_DATA_DIRS', os.path.join(self.prefix, 'share')) - - if self.use_lib64: - path = 'lib64/gtk-2.0/' - else: - path = 'lib/gtk-2.0/' - jhbuild.config.addpath('GTK_PATH', os.path.join(self.prefix, path)) - jhbuild.config.addpath('GTK_DATA_PREFIX', self.prefix) - - os.environ['SUGAR_PREFIX'] = self.prefix - os.environ['SUGAR_PATH'] = os.path.join(self.prefix, 'share', 'sugar') - os.environ['SUGAR_LOGGER_LEVEL'] = 'debug' - - # Enable debug log of the Telepathy components - os.environ['GABBLE_DEBUG'] = 'all' - os.environ['SALUT_DEBUG'] = 'all' - os.environ['STREAM_ENGINE_DEBUG'] = 'all' - - # We need to add the gtk-2.0 directory explicitly to - # the Python path since '.pth' files (here pygtk.pth) - # only work properly in system directories - pythonversion = 'python' + str(sys.version_info[0]) + '.' + \ - str(sys.version_info[1]) - if self.use_lib64: - pythonpath = os.path.join(self.prefix, 'lib64', pythonversion, - 'site-packages', 'gtk-2.0') - else: - pythonpath = os.path.join(self.prefix, 'lib', pythonversion, - 'site-packages', 'gtk-2.0') - jhbuild.config.addpath('PYTHONPATH', pythonpath) - - python_lib = os.path.join(self.prefix, 'lib', 'python2.5', 'site-packages') - os.environ['PYTHON_LIB'] = python_lib - - if 'DBUS_SESSION_BUS_ADDRESS' in os.environ: - del os.environ['DBUS_SESSION_BUS_ADDRESS'] - - if not 'SUGAR_PROFILE' in os.environ: - os.environ['SUGAR_PROFILE'] = 'default' diff --git a/scripts/depscheck.py b/scripts/depscheck.py deleted file mode 100644 index f318404..0000000 --- a/scripts/depscheck.py +++ /dev/null @@ -1,37 +0,0 @@ -import sys -from optparse import make_option - -from jhbuild.commands import Command, register_command - -import sysdeps - -class cmd_depscheck(Command): - - name = 'depscheck' - usage_args = '' - - def __init__(self): - Command.__init__(self, [ - make_option('-s', '--script', - action='store_true', dest='script', default=False, - help=_('script friendly output')), - ]) - - def run(self, config, options, args): - deps = sysdeps.get_packages() - if not options.script and not deps: - print 'Dependencies information is missing, skip sanity check.' - return - - missing_deps = [] - for package, source in deps: - if not sysdeps.check_package(package): - missing_deps.append(package) - - if missing_deps: - if not options.script: - print 'Missing packages:' - print ' '.join(missing_deps) - sys.exit(1) - -register_command(cmd_depscheck) diff --git a/scripts/sysdeps.py b/scripts/sysdeps.py deleted file mode 100644 index b398cff..0000000 --- a/scripts/sysdeps.py +++ /dev/null @@ -1,91 +0,0 @@ -import os -import subprocess - -from xml.dom import minidom - -scripts_dir = os.path.dirname(__file__) -base_dir = os.path.dirname(scripts_dir) - -def get_distribution(): - if 'SJH_DISTRIBUTION' in os.environ: - return os.environ['SJH_DISTRIBUTION'].split('-') - - # Fedora - if os.path.exists('/etc/fedora-release'): - name = 'fedora' - - f = open('/etc/fedora-release') - full_name = f.read() - f.close() - - if 'Rawhide' in full_name: - version = 'rawhide' - else: - version = full_name.split(' ')[2] - - return name, version - - # Debian and Ubuntu - try: - out, err = subprocess.Popen(['lsb_release', '-is'], - stdout=subprocess.PIPE).communicate() - name = out.strip().lower() - - out, err = subprocess.Popen(['lsb_release', '-rs'], - stdout=subprocess.PIPE).communicate() - version = out.strip() - - if name == 'debian' and version == 'testing': - version = 'unstable' - - return name, version - except OSError: - pass - - return None, None - -def check_package(package): - name, version = get_distribution() - if name == 'fedora': - ret = subprocess.call(['rpm', '--quiet', '-q', package]) - return ret == 0 - elif name in ['ubuntu', 'debian']: - cmd = ["dpkg-query", "-f='${status}'", "-W", package] - out, err = subprocess.Popen(cmd, stdout=subprocess.PIPE).communicate() - return out.find('install ok installed') != -1 - - return None - -def parse_dependencies(): - name, version = get_distribution() - if name is None or version is None: - return None - - filename = os.path.join(base_dir, 'config', 'sysdeps', - '%s-%s.xml' % (name, version)) - - if not os.path.exists(filename): - return None - - return minidom.parse(filename) - -def get_packages(): - document = parse_dependencies() - if document is None: - return [] - - packages = [] - root = document.childNodes[0] - - for node in root.childNodes: - if node.nodeType == node.ELEMENT_NODE: - if node.nodeName == 'package': - name = node.getAttribute('name') - if node.hasAttribute('source'): - source = node.getAttribute('source') - else: - source = None - - packages.append((name, source)) - - return packages diff --git a/sjhbuild/main.py b/sjhbuild/main.py index 3ee71bb..3fa1bb1 100644 --- a/sjhbuild/main.py +++ b/sjhbuild/main.py @@ -130,6 +130,9 @@ def main(base_dir, args): command = args[0] args = args[1:] + if command == 'run' and len(args) == 0: + args.append('sugar-emulator') + warn_local_modulesets(config) try: -- cgit v0.9.1