[pytango] 320/483: fix minor errors

[Sandor Bodo-Merle]

This is an automated email from the git hooks/post-receive script.

sbodomerle-guest pushed a commit to annotated tag bliss_8.10
in repository pytango.

commit dacded38586a3acf5a795f179cb287b083898b19
Author: tiagocoutinho <tiagocoutinho at 4e9c00fd-8f2e-0410-aa12-93ce3db5e235>
Date:   Mon Nov 25 11:49:09 2013 +0000

    fix minor errors
    
    git-svn-id: http://svn.code.sf.net/p/tango-cs/code/bindings/PyTango/trunk@24355 4e9c00fd-8f2e-0410-aa12-93ce3db5e235
---
 MANIFEST.in                          |  2 +-
 setup.py                             | 27 +++++++++++++++++----------
 src/boost/python/ipython/__init__.py |  1 +
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index 4b8d750..2fccdb2 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,7 +1,7 @@
 recursive-include PyTango *.py
 recursive-include cPyTango *.py
 recursive-include IPython *.py
-recursive-include win *.sln *.vcproj *.vsprops *.props *.vcxproj *.vcxproj.filters
+#recursive-include win *.sln *.vcproj *.vsprops *.props *.vcxproj *.vcxproj.filters
 
 include winsetup.py
 
diff --git a/setup.py b/setup.py
index e807da5..a498ae7 100644
--- a/setup.py
+++ b/setup.py
@@ -50,7 +50,6 @@ try:
 except:
     numpy = None
 
-
 is64 = 8 * struct.calcsize("P") == 64
 
 
@@ -59,7 +58,9 @@ def pkg_config(*packages, **config):
                 "-L": "library_dirs",
                 "-l": "libraries"}
     cmd = ["pkg-config", "--libs", "--cflags-only-I", " ".join(packages)]
-    result = subprocess.Popen(cmd, stdout=subprocess.PIPE).communicate()[0]
+    proc = subprocess.Popen(cmd, stdout=subprocess.PIPE)
+    result = proc.wait()
+    result = str(proc.communicate()[0].decode("utf-8"))
     for elem in result.split():
         flag, value = elem[:2], elem[2:]
         config_values = config.setdefault(config_map.get(flag), [])
@@ -260,6 +261,7 @@ class build_ext(dftbuild_ext):
             ext.define_macros += [ ('PYTANGO_HAS_UNIQUE_PTR', '1') ]
         dftbuild_ext.build_extension(self, ext)
 
+        
 if sphinx:
     class build_doc(BuildDoc):
 
@@ -326,16 +328,19 @@ class install(dftinstall):
 def main():
     macros = []
     
-    directories = dict(include_dirs=[abspath('src', 'boost', 'cpp')],
-                       library_dirs=[],
-                       libraries=[])
+    directories = {
+        'include_dirs': [],
+        'library_dirs': [],
+        'libraries':    ['tango', 'log4tango', 'zmq',
+                         'omniDynamic4', 'COS4', 'omniORB4', 'omnithread'],
+    }
     sys_libs = []
     
     add_lib('omni', directories, sys_libs, lib_name='omniORB4')
     add_lib('zmq', directories, sys_libs, lib_name='libzmq')
     add_lib('tango', directories, sys_libs, inc_suffix='tango')
     add_lib('log4tango', directories, sys_libs)
-
+    add_lib('tango', directories, sys_libs, inc_suffix='tango')
     # special boost-python configuration
 
     BOOST_ROOT = os.environ.get('BOOST_ROOT')
@@ -445,10 +450,6 @@ def main():
         extra_compile_args += ['-g', '-O0']
         extra_link_args += ['-g' , '-O0'] 
 
-    include_dirs = uniquify(directories['include_dirs'])
-    library_dirs = uniquify(directories['library_dirs'])
-    libraries = uniquify(directories['libraries'])
-        
     src_dir = abspath('src', 'boost', 'cpp')
     client_dir = src_dir
     server_dir = os.path.join(src_dir, 'server')
@@ -462,6 +463,10 @@ def main():
     _serverfiles.sort()
     _cppfiles = _clientfiles + _serverfiles
 
+    include_dirs = uniquify(directories['include_dirs'] + [client_dir, server_dir])
+    library_dirs = uniquify(directories['library_dirs'])
+    libraries = uniquify(directories['libraries'])
+
     _pytango = Extension(
         name='_PyTango',
         sources=_cppfiles,
@@ -507,5 +512,7 @@ def main():
         ext_modules=[_pytango],
         cmdclass=cmdclass)
 
+    return dist
+
 if __name__ == "__main__":
     main()
diff --git a/src/boost/python/ipython/__init__.py b/src/boost/python/ipython/__init__.py
index 94e27fb..7b7b29b 100644
--- a/src/boost/python/ipython/__init__.py
+++ b/src/boost/python/ipython/__init__.py
@@ -31,6 +31,7 @@ def default_install(*args, **kwargs):
 
 init_ipython = default_init_ipython
 install = default_install
+is_installed = lambda : False
 
 ipv = get_ipython_version()
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pytango.git