Sfoglia il codice sorgente

Improve python_tqt module initialization

This relates to bug 2693

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
master
Slávek Banko 3 anni fa
parent
commit
0b2f1c4760
2 ha cambiato i file con 38 aggiunte e 2 eliminazioni
  1. 3
    2
      configure.py
  2. 35
    0
      module-init.py

+ 3
- 2
configure.py Vedi File

@@ -1458,14 +1458,15 @@ def main(argv):
# Create the additional Makefiles.
sipconfig.inform("Creating top level Makefile...")

open('__init__.py', 'a').close()

sipconfig.ParentMakefile(
configuration=sipcfg,
subdirs=pyqt_modules + pyqt.tools(),
installs=(pyqt.module_installs(), pyqt.module_dir())
).generate()

# Install module initialization script.
create_config("__init__.py", os.path.join(src_dir, "module-init.py"), macros)

# Install the configuration module.
create_config("pyqtconfig.py", os.path.join(src_dir, "pyqtconfig.py.in"), macros)


+ 35
- 0
module-init.py Vedi File

@@ -0,0 +1,35 @@

# Trinity-specific paths
import sys, os
tqt_modules = []
for m_path in sys.path:
if os.path.exists(os.path.join(m_path, 'sip4_tqt')):
m_sip_dir = os.path.join(m_path, 'sip4_tqt')
tqt_modules.insert(0, m_sip_dir)
if os.path.exists(os.path.join(m_path, 'python_tqt')):
m_pyqt_dir = os.path.join(m_path, 'python_tqt')
tqt_modules.insert(0, m_pyqt_dir)
for m_path in tqt_modules:
sys.path.insert(0, m_path)

# Base modules
__all__ = [
'qt',
'qtcanvas',
'qtnetwork',
'qtsql',
'qttable',
'qtui',
'qtxml',
]

# Optional modules
if os.path.exists(os.path.join(m_pyqt_dir, 'qtaxcontainer.so')):
__all__.append('qtaxcontainer')
if os.path.exists(os.path.join(m_pyqt_dir, 'qtext.so')):
__all__.append('qtext')
if os.path.exists(os.path.join(m_pyqt_dir, 'qtgl.so')):
__all__.append('qtgl')

# Import namespaces
from python_tqt import *

Loading…
Annulla
Salva