aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lib/bb/__init__.py2
-rwxr-xr-xsetup.py9
2 files changed, 6 insertions, 5 deletions
diff --git a/lib/bb/__init__.py b/lib/bb/__init__.py
index 1188145f..c5ac9a77 100644
--- a/lib/bb/__init__.py
+++ b/lib/bb/__init__.py
@@ -23,7 +23,7 @@ this program; if not, write to the Free Software Foundation, Inc., 59 Temple
Place, Suite 330, Boston, MA 02111-1307 USA.
"""
-__version__ = "1.1"
+__version__ = "1.2.1"
__all__ = [
diff --git a/setup.py b/setup.py
index 8ceb95ad..43a9aea6 100755
--- a/setup.py
+++ b/setup.py
@@ -44,10 +44,11 @@ def generate_doc(type):
if 'bdist' in sys.argv[1:]:
generate_doc('html')
+sys.path.append(os.path.join(os.path.dirname(sys.argv[0]), 'lib'))
+import bb
import glob
-__version__ = '1.2svn'
setup(name='bitbake',
- version=__version__,
+ version=bb.__version__,
license='GPL',
url='http://developer.berlios.de/projects/bitbake/',
description='BitBake build tool',
@@ -61,8 +62,8 @@ setup(name='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' % __version__, 'html'), glob.glob(os.path.join('doc', 'manual', 'html', '*.html'))),
- (os.path.join(docdir, 'bitbake-%s' % __version__, 'pdf'), glob.glob(os.path.join('doc', 'manual', 'pdf', '*.pdf'))),],
+ (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:]: