Install bsr into default location

Change-Id: If9d7fa22d12efeb4a3b819aab87472fec813c0cc

diff --git a/Makefile b/Makefile
index 8114ce1..28f9600 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -45,7 +45,7 @@ docs: man html pdf
 
 install: all
        python setup.py install --prefix=${PREFIX}
-       cd bsr && python setup.py install --install-scripts=/usr/local/bin --prefix=/usr/local && cd ..
+       cd bsr && python setup.py install --prefix=${PREFIX} && cd ..
 
 clean:
        rm -rf {build/,dist/,*.egg-info/}

diff --git a/bsr/setup.py b/bsr/setup.py
index f2c757a..93529df 100644 (file)
--- a/bsr/setup.py
+++ b/bsr/setup.py
@@ -5,6 +5,7 @@
 
 from setuptools import setup, find_packages
 import os
+import sys
 
 here = os.path.abspath(os.path.dirname(__file__))
 
@@ -31,6 +32,22 @@ def package_files(directory):
 
 extra_files = package_files('bsr/web_dist')
 
+def check_debian():
+    """--install-layout is recognized after 2.5"""
+    if sys.version_info[:2] > (2, 5):
+        if len(sys.argv) > 1 and 'install' in sys.argv:
+            try:
+                import platform
+                (dist, _, _) = platform.linux_distribution()
+                # for debian-like distros, mods will be installed to
+                # ${PYTHONLIB}/dist-packages
+                if dist in ('debian', 'Ubuntu'):
+                    sys.argv.append('--install-layout=deb')
+            except AttributeError:
+                pass
+
+check_debian()
+
 setup(
     name=about['__title__'],
     version=about['__version__'],

diff --git a/debian/control b/debian/control
index 3040e4d..ff724c2 100755 (executable)
--- a/debian/control
+++ b/debian/control
@@ -79,6 +79,7 @@ Description: Jenkins scripts used by gbs-jenkins-job
 Package: gbs-bsr
 Architecture: all
 Depends: ${misc:Depends}, ${python:Depends},
- python-psutil
+ python-psutil,
+ python-yaml
 Description: GBS build monitirong scripts
  This package monitors the build status and generates report using the relevant data.

diff --git a/debian/gbs-bsr.install b/debian/gbs-bsr.install
index 09bca53..1121032 100644 (file)
--- a/debian/gbs-bsr.install
+++ b/debian/gbs-bsr.install
@@ -1,8 +1,8 @@
-usr/local/lib/python*/*packages/bsr/*.py
-usr/local/lib/python*/*packages/bsr/analyzer/*.py
-usr/local/lib/python*/*packages/bsr/gbs/*.py
-usr/local/lib/python*/*packages/bsr/network/*.py
-usr/local/lib/python*/*packages/bsr/report/*.py
-usr/local/lib/python*/*packages/bsr/utility/*.py
-usr/local/lib/python*/*packages/bsr/web_dist/*
-usr/local/bin/bsr
+usr/lib/python*/*packages/bsr/*.py
+usr/lib/python*/*packages/bsr/analyzer/*.py
+usr/lib/python*/*packages/bsr/gbs/*.py
+usr/lib/python*/*packages/bsr/network/*.py
+usr/lib/python*/*packages/bsr/report/*.py
+usr/lib/python*/*packages/bsr/utility/*.py
+usr/lib/python*/*packages/bsr/web_dist/*
+usr/bin/bsr

diff --git a/debian/rules b/debian/rules
index 3d82e78..7f3cef3 100644 (file)
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@
 override_dh_auto_install:
        python setup.py install --root=debian/tmp --prefix=/usr
        make man
-       cd bsr && python setup.py install --install-scripts=/usr/local/bin --root=../debian/tmp --prefix=/usr/local && cd ..
+       cd bsr && python setup.py install --root=../debian/tmp --prefix=/usr && cd ..
        mkdir -p debian/tmp/usr/share/man/man1
        mkdir -p debian/tmp/usr/share/gbs
        install -m644 docs/gbs.1 debian/tmp/usr/share/man/man1