[pytango] 64/98: Update setup file with the new module names

[Sandor Bodo-Merle]

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

sbodomerle-guest pushed a commit to tag v9.2.0
in repository pytango.

commit 5c01ac11e956993107aa4a99d814ccc6f437aea5
Author: Vincent Michel <vincent.michel at maxlab.lu.se>
Date:   Fri Jul 8 16:32:40 2016 +0200

    Update setup file with the new module names
---
 MANIFEST.in |  4 ----
 Makefile    |  9 ++++-----
 setup.py    | 30 ++++++++++++++++--------------
 3 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index 5d451ff..a80833d 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,9 +1,5 @@
-recursive-include PyTango *.py
-recursive-include cPyTango *.py
-recursive-include IPython *.py
 include LICENSE.txt
 
-graft src
 graft doc
 graft tests
 
diff --git a/Makefile b/Makefile
index 208825e..bec580d 100644
--- a/Makefile
+++ b/Makefile
@@ -31,7 +31,7 @@
 # - PY_VER: use a specific python version (default is empty) (ex: 3.2)
 
 # Build "in parallel":
-# make prepare && make -j5 
+# make prepare && make -j5
 #
 # Install "in parallel":
 # make prepare && make -j5 && make install prefix=<install dir>
@@ -141,8 +141,7 @@ MACROS := -DNDEBUG -DPYTANGO_HAS_UNIQUE_PTR -DPYTANGO_NUMPY_VERSION=$(PYTANGO_NU
 CFLAGS := -pthread -fno-strict-aliasing -fwrapv -Wall -fPIC -g $(OPTIMIZE_CC) $(MACROS) $(TANGO_CFLAGS) $(INCLUDE_DIRS) $(QUOTE_INCLUDE_DIRS)
 LNFLAGS := $(LN_DIRS) $(LN_LIBS)
 
-LIB_NAME := _PyTango.so
-LIB_NAME_STATIC := _PyTangoStatic.so
+LIB_NAME := _tango.so
 LIB_SYMB_NAME := $(LIB_NAME).dbg
 
 OBJS := \
@@ -249,7 +248,7 @@ init:
 	@echo Using python $(PY_VER)
 	@echo CFLAGS  = $(CFLAGS)
 	@echo LNFLAGS = $(LNFLAGS)
-	@echo -n "Preparing build directories... " 
+	@echo -n "Preparing build directories... "
 	@mkdir -p $(OBJS_DIR)
 	@echo $(OK)
 
@@ -297,7 +296,7 @@ clean:
 	@rm -f $(OBJS_DIR)/*.o
 	@echo $(OK)
 
-clean-all: 
+clean-all:
 	@echo -n Cleaning all...
 	@rm -rf $(OBJS_DIR)
 	@echo $(OK)
diff --git a/setup.py b/setup.py
index 60f521a..fca8769 100644
--- a/setup.py
+++ b/setup.py
@@ -69,7 +69,7 @@ def abspath(*path):
 
 def get_release_info():
     name = "release"
-    release_dir = abspath('src', 'boost', 'python')
+    release_dir = abspath('tango')
     data = imp.find_module(name, [release_dir])
     release = imp.load_module(name, *data)
     return release.Release
@@ -178,9 +178,9 @@ class build(dftbuild):
             return
         if os.system("type objcopy") != 0:
             return
-        d = abspath(self.build_lib, "PyTango")
+        d = abspath(self.build_lib, "tango")
         orig_dir = os.path.abspath(os.curdir)
-        so = "_PyTango.so"
+        so = "_tango.so"
         dbg = so + ".dbg"
         try:
             os.chdir(d)
@@ -387,15 +387,18 @@ def setup_args():
     please_debug = False
 
     packages = [
-        'PyTango',
-        'PyTango.databaseds',
-        'PyTango.databaseds.db_access',
+        'tango',
+        'tango.databaseds',
+        'tango.databaseds.db_access',
     ]
 
-    py_modules = []
+    py_modules = [
+        'PyTango',  # Backward compatibilty
+    ]
 
     provides = [
-        'PyTango',
+        'tango',
+        'PyTango',  # Backward compatibilty
     ]
 
     requires = [
@@ -438,7 +441,7 @@ def setup_args():
     # and then uncommenting this line. Someday maybe this will be
     # automated...
     extra_compile_args = [
-        # '-includesrc/precompiled_header.hpp',
+        # '-include ext/precompiled_header.hpp',
     ]
 
     extra_link_args = [
@@ -450,7 +453,7 @@ def setup_args():
         extra_compile_args += ['-g', '-O0']
         extra_link_args += ['-g', '-O0']
 
-    src_dir = abspath('src', 'boost', 'cpp')
+    src_dir = abspath('ext')
     client_dir = src_dir
     server_dir = os.path.join(src_dir, 'server')
 
@@ -472,7 +475,7 @@ def setup_args():
     libraries = uniquify(directories['libraries'])
 
     pytango_ext = Extension(
-        name='_PyTango',
+        name='_tango',
         sources=cppfiles,
         include_dirs=include_dirs,
         library_dirs=library_dirs,
@@ -493,7 +496,7 @@ def setup_args():
         cmdclass['build_doc'] = build_doc
 
     opts = dict(
-        name='PyTango',
+        name='pytango',
         version=Release.version,
         description=Release.description,
         long_description=Release.long_description,
@@ -504,7 +507,6 @@ def setup_args():
         platforms=Release.platform,
         license=Release.license,
         packages=packages,
-        package_dir={'PyTango': os.path.join('src', 'boost', 'python')},
         py_modules=py_modules,
         classifiers=classifiers,
         package_data=package_data,
@@ -513,7 +515,7 @@ def setup_args():
         keywords=Release.keywords,
         requires=requires,
         install_requires=install_requires,
-        ext_package='PyTango',
+        ext_package='tango',
         ext_modules=[pytango_ext],
         cmdclass=cmdclass)
 

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