diff options
| -rw-r--r-- | MANIFEST | 61 | ||||
| -rw-r--r-- | MANIFEST.in | 11 | ||||
| -rw-r--r-- | ez_setup.py | 276 | ||||
| -rw-r--r-- | lib/bb/parse/parse_py/ConfHandler.py | 13 | ||||
| -rwxr-xr-x | setup.py | 85 |
5 files changed, 342 insertions, 104 deletions
diff --git a/MANIFEST b/MANIFEST deleted file mode 100644 index 14e1513bb..000000000 --- a/MANIFEST +++ /dev/null @@ -1,61 +0,0 @@ -AUTHORS -COPYING -ChangeLog -MANIFEST -setup.py -bin/bitdoc -bin/bbimage -bin/bitbake -lib/bb/__init__.py -lib/bb/build.py -lib/bb/cache.py -lib/bb/cooker.py -lib/bb/command.py -lib/bb/COW.py -lib/bb/daemonize.py -lib/bb/data.py -lib/bb/data_smart.py -lib/bb/event.py -lib/bb/fetch/__init__.py -lib/bb/fetch/bzr.py -lib/bb/fetch/cvs.py -lib/bb/fetch/hg.py -lib/bb/fetch/git.py -lib/bb/fetch/local.py -lib/bb/fetch/osc.py -lib/bb/fetch/perforce.py -lib/bb/fetch/ssh.py -lib/bb/fetch/svk.py -lib/bb/fetch/svn.py -lib/bb/fetch/wget.py -lib/bb/manifest.py -lib/bb/methodpool.py -lib/bb/msg.py -lib/bb/parse/__init__.py -lib/bb/parse/parse_py/__init__.py -lib/bb/parse/parse_py/BBHandler.py -lib/bb/parse/parse_py/ConfHandler.py -lib/bb/persist_data.py -lib/bb/providers.py -lib/bb/runqueue.py -lib/bb/shell.py -lib/bb/taskdata.py -lib/bb/ui/__init__.py -lib/bb/ui/knotty.py -lib/bb/ui/ncurses.py -lib/bb/ui/uievent.py -lib/bb/ui/uihelper.py -lib/bb/utils.py -lib/bb/xmlrpcserver.py -setup.py -doc/COPYING.GPL -doc/COPYING.MIT -doc/bitbake.1 -doc/manual/html.css -doc/manual/Makefile -doc/manual/usermanual.xml -contrib/bbdev.sh -contrib/vim/syntax/bitbake.vim -contrib/vim/ftdetect/bitbake.vim -conf/bitbake.conf -classes/base.bbclass diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 000000000..b19737812 --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1,11 @@ +include COPYING +include ChangeLog +include AUTHORS +include contrib/* +include contrib/vim/*/* +include conf/* +include classes/* +include doc/* +include doc/manual/* +include ez_setup.py +include HEADER diff --git a/ez_setup.py b/ez_setup.py new file mode 100644 index 000000000..d24e845e5 --- /dev/null +++ b/ez_setup.py @@ -0,0 +1,276 @@ +#!python +"""Bootstrap setuptools installation + +If you want to use setuptools in your package's setup.py, just include this +file in the same directory with it, and add this to the top of your setup.py:: + + from ez_setup import use_setuptools + use_setuptools() + +If you want to require a specific version of setuptools, set a download +mirror, or use an alternate download directory, you can do so by supplying +the appropriate options to ``use_setuptools()``. + +This file can also be run as a script to install or upgrade setuptools. +""" +import sys +DEFAULT_VERSION = "0.6c9" +DEFAULT_URL = "http://pypi.python.org/packages/%s/s/setuptools/" % sys.version[:3] + +md5_data = { + 'setuptools-0.6b1-py2.3.egg': '8822caf901250d848b996b7f25c6e6ca', + 'setuptools-0.6b1-py2.4.egg': 'b79a8a403e4502fbb85ee3f1941735cb', + 'setuptools-0.6b2-py2.3.egg': '5657759d8a6d8fc44070a9d07272d99b', + 'setuptools-0.6b2-py2.4.egg': '4996a8d169d2be661fa32a6e52e4f82a', + 'setuptools-0.6b3-py2.3.egg': 'bb31c0fc7399a63579975cad9f5a0618', + 'setuptools-0.6b3-py2.4.egg': '38a8c6b3d6ecd22247f179f7da669fac', + 'setuptools-0.6b4-py2.3.egg': '62045a24ed4e1ebc77fe039aa4e6f7e5', + 'setuptools-0.6b4-py2.4.egg': '4cb2a185d228dacffb2d17f103b3b1c4', + 'setuptools-0.6c1-py2.3.egg': 'b3f2b5539d65cb7f74ad79127f1a908c', + 'setuptools-0.6c1-py2.4.egg': 'b45adeda0667d2d2ffe14009364f2a4b', + 'setuptools-0.6c2-py2.3.egg': 'f0064bf6aa2b7d0f3ba0b43f20817c27', + 'setuptools-0.6c2-py2.4.egg': '616192eec35f47e8ea16cd6a122b7277', + 'setuptools-0.6c3-py2.3.egg': 'f181fa125dfe85a259c9cd6f1d7b78fa', + 'setuptools-0.6c3-py2.4.egg': 'e0ed74682c998bfb73bf803a50e7b71e', + 'setuptools-0.6c3-py2.5.egg': 'abef16fdd61955514841c7c6bd98965e', + 'setuptools-0.6c4-py2.3.egg': 'b0b9131acab32022bfac7f44c5d7971f', + 'setuptools-0.6c4-py2.4.egg': '2a1f9656d4fbf3c97bf946c0a124e6e2', + 'setuptools-0.6c4-py2.5.egg': '8f5a052e32cdb9c72bcf4b5526f28afc', + 'setuptools-0.6c5-py2.3.egg': 'ee9fd80965da04f2f3e6b3576e9d8167', + 'setuptools-0.6c5-py2.4.egg': 'afe2adf1c01701ee841761f5bcd8aa64', + 'setuptools-0.6c5-py2.5.egg': 'a8d3f61494ccaa8714dfed37bccd3d5d', + 'setuptools-0.6c6-py2.3.egg': '35686b78116a668847237b69d549ec20', + 'setuptools-0.6c6-py2.4.egg': '3c56af57be3225019260a644430065ab', + 'setuptools-0.6c6-py2.5.egg': 'b2f8a7520709a5b34f80946de5f02f53', + 'setuptools-0.6c7-py2.3.egg': '209fdf9adc3a615e5115b725658e13e2', + 'setuptools-0.6c7-py2.4.egg': '5a8f954807d46a0fb67cf1f26c55a82e', + 'setuptools-0.6c7-py2.5.egg': '45d2ad28f9750e7434111fde831e8372', + 'setuptools-0.6c8-py2.3.egg': '50759d29b349db8cfd807ba8303f1902', + 'setuptools-0.6c8-py2.4.egg': 'cba38d74f7d483c06e9daa6070cce6de', + 'setuptools-0.6c8-py2.5.egg': '1721747ee329dc150590a58b3e1ac95b', + 'setuptools-0.6c9-py2.3.egg': 'a83c4020414807b496e4cfbe08507c03', + 'setuptools-0.6c9-py2.4.egg': '260a2be2e5388d66bdaee06abec6342a', + 'setuptools-0.6c9-py2.5.egg': 'fe67c3e5a17b12c0e7c541b7ea43a8e6', + 'setuptools-0.6c9-py2.6.egg': 'ca37b1ff16fa2ede6e19383e7b59245a', +} + +import sys, os +try: from hashlib import md5 +except ImportError: from md5 import md5 + +def _validate_md5(egg_name, data): + if egg_name in md5_data: + digest = md5(data).hexdigest() + if digest != md5_data[egg_name]: + print >>sys.stderr, ( + "md5 validation of %s failed! (Possible download problem?)" + % egg_name + ) + sys.exit(2) + return data + +def use_setuptools( + version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir, + download_delay=15 +): + """Automatically find/download setuptools and make it available on sys.path + + `version` should be a valid setuptools version number that is available + as an egg for download under the `download_base` URL (which should end with + a '/'). `to_dir` is the directory where setuptools will be downloaded, if + it is not already available. If `download_delay` is specified, it should + be the number of seconds that will be paused before initiating a download, + should one be required. If an older version of setuptools is installed, + this routine will print a message to ``sys.stderr`` and raise SystemExit in + an attempt to abort the calling script. + """ + was_imported = 'pkg_resources' in sys.modules or 'setuptools' in sys.modules + def do_download(): + egg = download_setuptools(version, download_base, to_dir, download_delay) + sys.path.insert(0, egg) + import setuptools; setuptools.bootstrap_install_from = egg + try: + import pkg_resources + except ImportError: + return do_download() + try: + pkg_resources.require("setuptools>="+version); return + except pkg_resources.VersionConflict, e: + if was_imported: + print >>sys.stderr, ( + "The required version of setuptools (>=%s) is not available, and\n" + "can't be installed while this script is running. Please install\n" + " a more recent version first, using 'easy_install -U setuptools'." + "\n\n(Currently using %r)" + ) % (version, e.args[0]) + sys.exit(2) + else: + del pkg_resources, sys.modules['pkg_resources'] # reload ok + return do_download() + except pkg_resources.DistributionNotFound: + return do_download() + +def download_setuptools( + version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir, + delay = 15 +): + """Download setuptools from a specified location and return its filename + + `version` should be a valid setuptools version number that is available + as an egg for download under the `download_base` URL (which should end + with a '/'). `to_dir` is the directory where the egg will be downloaded. + `delay` is the number of seconds to pause before an actual download attempt. + """ + import urllib2, shutil + egg_name = "setuptools-%s-py%s.egg" % (version,sys.version[:3]) + url = download_base + egg_name + saveto = os.path.join(to_dir, egg_name) + src = dst = None + if not os.path.exists(saveto): # Avoid repeated downloads + try: + from distutils import log + if delay: + log.warn(""" +--------------------------------------------------------------------------- +This script requires setuptools version %s to run (even to display +help). I will attempt to download it for you (from +%s), but +you may need to enable firewall access for this script first. +I will start the download in %d seconds. + +(Note: if this machine does not have network access, please obtain the file + + %s + +and place it in this directory before rerunning this script.) +---------------------------------------------------------------------------""", + version, download_base, delay, url + ); from time import sleep; sleep(delay) + log.warn("Downloading %s", url) + src = urllib2.urlopen(url) + # Read/write all in one block, so we don't create a corrupt file + # if the download is interrupted. + data = _validate_md5(egg_name, src.read()) + dst = open(saveto,"wb"); dst.write(data) + finally: + if src: src.close() + if dst: dst.close() + return os.path.realpath(saveto) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +def main(argv, version=DEFAULT_VERSION): + """Install or upgrade setuptools and EasyInstall""" + try: + import setuptools + except ImportError: + egg = None + try: + egg = download_setuptools(version, delay=0) + sys.path.insert(0,egg) + from setuptools.command.easy_install import main + return main(list(argv)+[egg]) # we're done here + finally: + if egg and os.path.exists(egg): + os.unlink(egg) + else: + if setuptools.__version__ == '0.0.1': + print >>sys.stderr, ( + "You have an obsolete version of setuptools installed. Please\n" + "remove it from your system entirely before rerunning this script." + ) + sys.exit(2) + + req = "setuptools>="+version + import pkg_resources + try: + pkg_resources.require(req) + except pkg_resources.VersionConflict: + try: + from setuptools.command.easy_install import main + except ImportError: + from easy_install import main + main(list(argv)+[download_setuptools(delay=0)]) + sys.exit(0) # try to force an exit + else: + if argv: + from setuptools.command.easy_install import main + main(argv) + else: + print "Setuptools version",version,"or greater has been installed." + print '(Run "ez_setup.py -U setuptools" to reinstall or upgrade.)' + +def update_md5(filenames): + """Update our built-in md5 registry""" + + import re + + for name in filenames: + base = os.path.basename(name) + f = open(name,'rb') + md5_data[base] = md5(f.read()).hexdigest() + f.close() + + data = [" %r: %r,\n" % it for it in md5_data.items()] + data.sort() + repl = "".join(data) + + import inspect + srcfile = inspect.getsourcefile(sys.modules[__name__]) + f = open(srcfile, 'rb'); src = f.read(); f.close() + + match = re.search("\nmd5_data = {\n([^}]+)}", src) + if not match: + print >>sys.stderr, "Internal error!" + sys.exit(2) + + src = src[:match.start(1)] + repl + src[match.end(1):] + f = open(srcfile,'w') + f.write(src) + f.close() + + +if __name__=='__main__': + if len(sys.argv)>2 and sys.argv[1]=='--md5update': + update_md5(sys.argv[2:]) + else: + main(sys.argv[1:]) + + + + + + diff --git a/lib/bb/parse/parse_py/ConfHandler.py b/lib/bb/parse/parse_py/ConfHandler.py index c9f1ea13f..23316ada5 100644 --- a/lib/bb/parse/parse_py/ConfHandler.py +++ b/lib/bb/parse/parse_py/ConfHandler.py @@ -34,10 +34,17 @@ __require_regexp__ = re.compile( r"require\s+(.+)" ) __export_regexp__ = re.compile( r"export\s+(.+)" ) def init(data): - if not bb.data.getVar('TOPDIR', data): - bb.data.setVar('TOPDIR', os.getcwd(), data) + topdir = bb.data.getVar('TOPDIR', data) + if not topdir: + topdir = os.getcwd() + bb.data.setVar('TOPDIR', topdir, data) if not bb.data.getVar('BBPATH', data): - bb.data.setVar('BBPATH', os.path.join(sys.prefix, 'share', 'bitbake'), data) + from pkg_resources import Requirement, resource_filename + bitbake = Requirement.parse("bitbake") + datadir = resource_filename(bitbake, "../share/bitbake") + basedir = resource_filename(bitbake, "..") + bb.data.setVar('BBPATH', '%s:%s:%s' % (topdir, datadir, basedir), data) + def supports(fn, d): return localpath(fn, d)[-5:] == ".conf" @@ -17,54 +17,59 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -from distutils.core import setup import os, sys +sys.path.append(os.path.join(os.path.dirname(__file__), "lib")) +from bb import __version__ + +from glob import glob +from distutils.command.clean import clean +from distutils.command.build import build + +from ez_setup import use_setuptools +use_setuptools() -bbdir = os.path.join(sys.prefix, 'share', 'bitbake') -docdir = os.path.join(sys.prefix, 'share', 'doc') -# bbdir = os.path.join('bitbake') -# docdir = os.path.join('doc') +from setuptools import setup, find_packages -def clean_doc(type): - origpath = os.path.abspath(os.curdir) - os.chdir(os.path.join(origpath, 'doc', 'manual')) - make = os.environ.get('MAKE') or 'make' - os.system('%s clean-%s' % (make, type)) -def generate_doc(type): - origpath = os.path.abspath(os.curdir) - os.chdir(os.path.join(origpath, 'doc', 'manual')) - make = os.environ.get('MAKE') or 'make' - ret = os.system('%s %s' % (make, type)) - if ret != 0: - print "ERROR: Unable to generate html documentation." - sys.exit(ret) - os.chdir(origpath) +doctype = "html" -if 'bdist' in sys.argv[1:]: - generate_doc('html') +class Clean(clean): + def run(self): + clean.run(self) + origpath = os.path.abspath(os.curdir) + os.chdir(os.path.join(origpath, 'doc', 'manual')) + make = os.environ.get('MAKE') or 'make' + os.system('%s clean-%s' % (make, doctype)) + +class Build(build): + def run(self): + build.run(self) + origpath = os.path.abspath(os.curdir) + os.chdir(os.path.join(origpath, 'doc', 'manual')) + make = os.environ.get('MAKE') or 'make' + ret = os.system('%s %s' % (make, doctype)) + if ret != 0: + print "ERROR: Unable to generate html documentation." + sys.exit(ret) + os.chdir(origpath) -sys.path.append(os.path.join(os.path.dirname(sys.argv[0]), 'lib')) -import bb -import glob setup(name='bitbake', - version=bb.__version__, + version=__version__, + package_dir={"": "lib"}, + packages=find_packages("lib"), + scripts=["bin/bitbake", "bin/bbimage"], + # package_data={"bb": ["data"]}, + data_files=[("share/bitbake", glob("conf/*") + glob("classes/*")), + ("share/doc/bitbake-%s/manual" % __version__, glob("doc/manual/html/*"))], + cmdclass={ + "build": Build, + "clean": Clean, + }, + license='GPLv2', url='http://developer.berlios.de/projects/bitbake/', description='BitBake build tool', long_description='BitBake is a simple tool for the execution of tasks. It is derived from Portage, which is the package management system used by the Gentoo Linux distribution. It is most commonly used to build packages, as it can easily use its rudamentary inheritence to abstract common operations, such as fetching sources, unpacking them, patching them, compiling them, and so on. It is the basis of the OpenEmbedded project, which is being used for OpenZaurus, Familiar, and a number of other Linux distributions.', - author='Chris Larson', - author_email='clarson@elinux.org', - packages=['bb', 'bb.fetch', 'bb.parse', 'bb.parse.parse_py', 'bb.ui'], - package_dir={'bb': os.path.join('lib', 'bb')}, - scripts=[os.path.join('bin', 'bitbake'), - os.path.join('bin', 'bbimage')], - data_files=[(os.path.join(bbdir, 'conf'), [os.path.join('conf', 'bitbake.conf')]), - (os.path.join(bbdir, 'classes'), [os.path.join('classes', 'base.bbclass')]), - (os.path.join(docdir, 'bitbake-%s' % bb.__version__, 'html'), glob.glob(os.path.join('doc', 'manual', 'html', '*.html'))), - (os.path.join(docdir, 'bitbake-%s' % bb.__version__, 'pdf'), glob.glob(os.path.join('doc', 'manual', 'pdf', '*.pdf'))),], - ) - -if 'bdist' in sys.argv[1:]: - clean_doc('html') + author='BitBake Development Team', + author_email='bitbake-dev@lists.berlios.de', +) |