WIP: Add sage_tdlib package, use symlinks for sagelib package

build/pkgs/sage_tdlib/dependencies

@@ -0,0 +1 @@
+sagelib tdlib | $(PYTHON_TOOLCHAIN)

build/pkgs/sage_tdlib/package-version.txt

@@ -0,0 +1 @@
+../sagelib/package-version.txt

build/pkgs/sage_tdlib/spkg-install

@@ -0,0 +1 @@
+../sagelib/spkg-install

build/pkgs/sage_tdlib/spkg-src

@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+#
+# Script to prepare an sdist tarball for sage_tdlib.
+# This script is not used during build.
+#
+# HOW TO MAKE THE TARBALL:
+# 1) ./sage --sh build/pkgs/sage_tdlib/spkg-src
+
+if [ -z "$SAGE_ROOT" ] ; then
+    echo >&2 "Error - SAGE_ROOT undefined ... exiting"
+    echo >&2 "Maybe run 'sage -sh'?"
+    exit 1
+fi
+
+# Exit on failure
+set -e
+
+cd build/pkgs/sage_tdlib
+
+cd src
+sage-python23 -u setup.py --no-user-cfg sdist --dist-dir "$SAGE_DISTFILES"

build/pkgs/sage_tdlib/src/MANIFEST.in

@@ -0,0 +1,3 @@
+prune sage
+include sage/graphs/graph_decompositions/tdlib*
+graft sage/graphs/graph_decompositions/tdlib

build/pkgs/sage_tdlib/src/sage

@@ -0,0 +1 @@
+../../../../src/sage

build/pkgs/sage_tdlib/src/setup.cfg

@@ -0,0 +1,2 @@
+[metadata]
+name = sage-tdlib

build/pkgs/sage_tdlib/src/setup.py

@@ -0,0 +1,30 @@
+#!/usr/bin/env python
+
+from distutils import log
+from setuptools import setup
+
+from sage_setup.command.sage_build import sage_build
+from sage_setup.command.sage_build_cython import sage_build_cython
+from sage_setup.command.sage_build_ext import sage_build_ext
+
+from sage_setup.find import find_python_sources, is_package_or_namespace_package_dir
+python_packages, python_modules, cython_modules = find_python_sources(
+    '.', ['sage'], distributions=['sage-tdlib'])
+
+log.warn('python_packages = {0}'.format(python_packages))
+log.warn('python_modules = {0}'.format(python_modules))
+log.warn('cython_modules = {0}'.format(cython_modules))
+
+import Cython.Build.Dependencies
+import Cython.Build.Cythonize
+import Cython.Utils
+Cython.Utils.is_package_dir = Cython.Build.Cythonize.is_package_dir = Cython.Build.Dependencies.is_package_dir = is_package_or_namespace_package_dir
+
+from sage_setup.command.sage_install import sage_install
+
+setup(
+    cmdclass = dict(build_cython=sage_build_cython,
+                    build_ext=sage_build_ext,
+                    install=sage_install),      # need this, or "setup.py install" will install an egg
+    ext_modules = cython_modules
+)

build/pkgs/sage_tdlib/type

@@ -0,0 +1 @@
+optional

build/pkgs/sagelib/src/setup.cfg

@@ -0,0 +1 @@
+../../../../src/setup.cfg

src/sage_setup/find.py

@@ -225,7 +225,8 @@ def is_package_or_namespace_package_dir(dirpath):
             return True
     return os.path.exists(os.path.join(dirpath, 'namespace'))
 
-def find_extra_files(src_dir, modules, cythonized_dir, special_filenames=[]):
+def find_extra_files(src_dir, modules, cythonized_dir, special_filenames=[],
+                     distributions=None):
     """
     Find all extra files which should be installed.
 
@@ -270,6 +271,10 @@ def find_extra_files(src_dir, modules, cythonized_dir, special_filenames=[]):
     """
     from Cython.Utils import is_package_dir
 
+    if not (distributions is None or '' in distributions):
+        # FIXME: This is only a 0th order approximation of what we need
+        return []
+
     data_files = {}
     cy_exts = ('.pxd', '.pxi', '.pyx')
 

src/setup.py

@@ -61,7 +61,9 @@
 
 from sage_setup.optional_extension import is_package_installed_and_updated
 
-optional_packages_with_extensions = ['mcqd', 'bliss', 'tdlib', 'primecount',
+optional_packages_with_extensions = ['mcqd', 'bliss',
+                                     #'tdlib',   ## handled by sage_tdlib
+                                     'primecount',
                                      'coxeter3', 'fes', 'sirocco', 'meataxe']
 
 distributions += ['sage-{}'.format(pkg)