Attachment #1862 for bug #1790

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 1790
Collapse All | Expand All

Lines 17-23 Link Here

(-)b/src/qtuicompiler.py (-1 / +1 lines)
17		17
18	import os	18	import os
19	import sys	19	import sys
20	import pyqtconfig	20	from python_tqt import pyqtconfig
21	from distutils.spawn import *	21	from distutils.spawn import *
22	import traceback	22	import traceback
23		23





INSTALL_LIST = 'install_log.txt'

# Trinity-specific paths
tqt_modules = []
from distutils.sysconfig import get_python_lib
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)


###########################################################################
def setup(**arg_dict):


                    ('kde-kcm-lib-dir=',None,'Directory for KDE kcm library files'),
                    ('qt-inc-dir=',None,'Directory containing C++ header files for Qt'),
                    ('qt-lib-dir=',None,'Directory containing library files for Qt'),
                    ('sip-dir=',None,'Directory containing the sip library files'),
                    ('clib=',None,'gcc library and path'),
                    ('pyqt-dir=',None,'PyQt module directory'),
                    ('pytde-dir=',None,'PyTDE module directory'),
                    ('data-dir=',None,'installation directory for data (script) files')]
    

        self.kde_kcm_lib_dir = None
        self.qt_inc_dir = None
        self.qt_lib_dir = None
        self.sip_dir = None
        self.clib = None
        self.pyqt_dir = None
        self.pytde_dir = None
        self.data_dir = None
        

    
            # PyQt dir
            if self.pyqt_dir is None:
                self.pyqt_dir = m_pyqt_dir
            if self.pyqt_dir is None:
                self.pyqt_dir = os.path.join(sysconfig.get_python_lib(), 'python_tqt')
            if (FindFileInPaths("libqtcmodule*",[self.pyqt_dir]) is None) and (FindFileInPaths("qt*",[self.pyqt_dir]) is None):
                raise SystemExit, "Failed to find the PyQt directory: %s" % self.pyqt_dir
            self.announce("Using %s for PyQt modules" % self.pyqt_dir)

            
            # Sip dir
            if self.sip_dir is None:
                self.sip_dir = m_sip_dir
            if self.sip_dir is None:
                self.sip_dir = os.path.join(sysconfig.get_python_lib(), 'sip4_tqt')
            if (FindFileInPaths("libsip*", [self.sip_dir]) is None) and (FindFileInPaths("sip*", [self.sip_dir]) is None):
                raise SystemExit, "Failed to find libsip files in directory: %s" % self.sip_dir
            self.announce("Using %s for libsip files" % self.sip_dir)

    }

    // Inject a helper function
    TQString bridge = TQString("from sip4_tqt import sip\n"
                            "from python_tqt import qt\n"
                            "def kcontrol_bridge_" FACTORY "(parent,name):\n"
                             "    if parent!=0:\n"
#if SIP_VERSION >= 0x040200

        self.kde_protocol_dir = None
        self.qt_inc_dir = None
        self.qt_lib_dir = None
        self.sip_dir = None
        self.clib = None
        self.pyqt_dir = None
        self.pytde_dir = None
        self.data_dir = None
        

    
            # PyQt dir
            if self.pyqt_dir is None:
                self.pyqt_dir = m_pyqt_dir
            if self.pyqt_dir is None:
                self.pyqt_dir = os.path.join(sysconfig.get_python_lib(), 'python_tqt')
            if (FindFileInPaths("libqtcmodule*",[self.pyqt_dir]) is None) and (FindFileInPaths("qt*",[self.pyqt_dir]) is None):
                raise SystemExit, "Failed to find the PyQt directory: %s" % self.pyqt_dir
            self.announce("Using %s for PyQt modules" % self.pyqt_dir)

            
            # Sip dir
            if self.sip_dir is None:
                self.sip_dir = m_sip_dir
            if self.sip_dir is None:
                self.sip_dir = os.path.join(sysconfig.get_python_lib(), 'sip4_tqt')
            if (FindFileInPaths("libsip*", [self.sip_dir]) is None) and (FindFileInPaths("sip*", [self.sip_dir]) is None):
                raise SystemExit, "Failed to find libsip files in directory: %s" % self.sip_dir
            self.announce("Using %s for libsip files" % self.sip_dir)

Return to bug 1790

Lines 39-44 Link Here

(-)b/src/kdedistutils.py (-12 / +34 lines)
39		39
40	INSTALL_LIST = 'install_log.txt'	40	INSTALL_LIST = 'install_log.txt'
41		41
		42	# Trinity-specific paths
		43	tqt_modules = []
		44	from distutils.sysconfig import get_python_lib
		45	for m_path in sys.path:
		46	if os.path.exists(os.path.join(m_path, 'sip4_tqt')):
		47	m_sip_dir = os.path.join(m_path, 'sip4_tqt')
		48	tqt_modules.insert(0, m_sip_dir)
		49	if os.path.exists(os.path.join(m_path, 'python_tqt')):
		50	m_pyqt_dir = os.path.join(m_path, 'python_tqt')
		51	tqt_modules.insert(0, m_pyqt_dir)
		52	for m_path in tqt_modules:
		53	sys.path.insert(0, m_path)
		54
		55
42	###########################################################################	56	###########################################################################
43	def setup(**arg_dict):	57	def setup(**arg_dict):
44		58
Lines 502-510 Link Here
502	('kde-kcm-lib-dir=',None,'Directory for KDE kcm library files'),	516	('kde-kcm-lib-dir=',None,'Directory for KDE kcm library files'),
503	('qt-inc-dir=',None,'Directory containing C++ header files for Qt'),	517	('qt-inc-dir=',None,'Directory containing C++ header files for Qt'),
504	('qt-lib-dir=',None,'Directory containing library files for Qt'),	518	('qt-lib-dir=',None,'Directory containing library files for Qt'),
505	('sip-dir=','/usr/lib/pyshared/python*','Directory containing the sip library files'),	519	('sip-dir=',None,'Directory containing the sip library files'),
506	('clib=',None,'gcc library and path'),	520	('clib=',None,'gcc library and path'),
507	('pyqt-dir=','/usr/lib/pyshared/python*','PyQt module directory'),	521	('pyqt-dir=',None,'PyQt module directory'),
508	('pytde-dir=',None,'PyTDE module directory'),	522	('pytde-dir=',None,'PyTDE module directory'),
509	('data-dir=',None,'installation directory for data (script) files')]	523	('data-dir=',None,'installation directory for data (script) files')]
510		524
Lines 518-526 Link Here
518	self.kde_kcm_lib_dir = None	532	self.kde_kcm_lib_dir = None
519	self.qt_inc_dir = None	533	self.qt_inc_dir = None
520	self.qt_lib_dir = None	534	self.qt_lib_dir = None
521	self.sip_dir = "/usr/lib/pyshared/python*"	535	self.sip_dir = None
522	self.clib = None	536	self.clib = None
523	self.pyqt_dir = "/usr/lib/pyshared/python*"	537	self.pyqt_dir = None
524	self.pytde_dir = None	538	self.pytde_dir = None
525	self.data_dir = None	539	self.data_dir = None
526		540
Lines 639-645 Link Here
639		653
640	# PyQt dir	654	# PyQt dir
641	if self.pyqt_dir is None:	655	if self.pyqt_dir is None:
642	self.pyqt_dir = sysconfig.get_python_lib()	656	self.pyqt_dir = m_pyqt_dir
		657	if self.pyqt_dir is None:
		658	self.pyqt_dir = os.path.join(sysconfig.get_python_lib(), 'python_tqt')
643	if (FindFileInPaths("libqtcmodule",[self.pyqt_dir]) is None) and (FindFileInPaths("qt",[self.pyqt_dir]) is None):	659	if (FindFileInPaths("libqtcmodule",[self.pyqt_dir]) is None) and (FindFileInPaths("qt",[self.pyqt_dir]) is None):
644	raise SystemExit, "Failed to find the PyQt directory: %s" % self.pyqt_dir	660	raise SystemExit, "Failed to find the PyQt directory: %s" % self.pyqt_dir
645	self.announce("Using %s for PyQt modules" % self.pyqt_dir)	661	self.announce("Using %s for PyQt modules" % self.pyqt_dir)
Lines 653-659 Link Here
653		669
654	# Sip dir	670	# Sip dir
655	if self.sip_dir is None:	671	if self.sip_dir is None:
656	self.sip_dir = sysconfig.get_python_lib()	672	self.sip_dir = m_sip_dir
		673	if self.sip_dir is None:
		674	self.sip_dir = os.path.join(sysconfig.get_python_lib(), 'sip4_tqt')
657	if (FindFileInPaths("libsip", [self.sip_dir]) is None) and (FindFileInPaths("sip", [self.sip_dir]) is None):	675	if (FindFileInPaths("libsip", [self.sip_dir]) is None) and (FindFileInPaths("sip", [self.sip_dir]) is None):
658	raise SystemExit, "Failed to find libsip files in directory: %s" % self.sip_dir	676	raise SystemExit, "Failed to find libsip files in directory: %s" % self.sip_dir
659	self.announce("Using %s for libsip files" % self.sip_dir)	677	self.announce("Using %s for libsip files" % self.sip_dir)
Lines 930-937 Link Here
930	}	948	}
931		949
932	// Inject a helper function	950	// Inject a helper function
933	TQString bridge = TQString("import sip\n"	951	TQString bridge = TQString("from sip4_tqt import sip\n"
934	"import qt\n"	952	"from python_tqt import qt\n"
935	"def kcontrol_bridge_" FACTORY "(parent,name):\n"	953	"def kcontrol_bridge_" FACTORY "(parent,name):\n"
936	" if parent!=0:\n"	954	" if parent!=0:\n"
937	#if SIP_VERSION >= 0x040200	955	#if SIP_VERSION >= 0x040200
Lines 1460-1468 Link Here
1460	self.kde_protocol_dir = None	1478	self.kde_protocol_dir = None
1461	self.qt_inc_dir = None	1479	self.qt_inc_dir = None
1462	self.qt_lib_dir = None	1480	self.qt_lib_dir = None
1463	self.sip_dir = "/usr/lib/pyshared/python*"	1481	self.sip_dir = None
1464	self.clib = None	1482	self.clib = None
1465	self.pyqt_dir = "/usr/lib/pyshared/python*"	1483	self.pyqt_dir = None
1466	self.pytde_dir = None	1484	self.pytde_dir = None
1467	self.data_dir = None	1485	self.data_dir = None
1468		1486
Lines 1579-1585 Link Here
1579		1597
1580	# PyQt dir	1598	# PyQt dir
1581	if self.pyqt_dir is None:	1599	if self.pyqt_dir is None:
1582	self.pyqt_dir = sysconfig.get_python_lib()	1600	self.pyqt_dir = m_pyqt_dir
		1601	if self.pyqt_dir is None:
		1602	self.pyqt_dir = os.path.join(sysconfig.get_python_lib(), 'python_tqt')
1583	if (FindFileInPaths("libqtcmodule",[self.pyqt_dir]) is None) and (FindFileInPaths("qt",[self.pyqt_dir]) is None):	1603	if (FindFileInPaths("libqtcmodule",[self.pyqt_dir]) is None) and (FindFileInPaths("qt",[self.pyqt_dir]) is None):
1584	raise SystemExit, "Failed to find the PyQt directory: %s" % self.pyqt_dir	1604	raise SystemExit, "Failed to find the PyQt directory: %s" % self.pyqt_dir
1585	self.announce("Using %s for PyQt modules" % self.pyqt_dir)	1605	self.announce("Using %s for PyQt modules" % self.pyqt_dir)
Lines 1593-1599 Link Here
1593		1613
1594	# Sip dir	1614	# Sip dir
1595	if self.sip_dir is None:	1615	if self.sip_dir is None:
1596	self.sip_dir = sysconfig.get_python_lib()	1616	self.sip_dir = m_sip_dir
		1617	if self.sip_dir is None:
		1618	self.sip_dir = os.path.join(sysconfig.get_python_lib(), 'sip4_tqt')
1597	if (FindFileInPaths("libsip", [self.sip_dir]) is None) and (FindFileInPaths("sip", [self.sip_dir]) is None):	1619	if (FindFileInPaths("libsip", [self.sip_dir]) is None) and (FindFileInPaths("sip", [self.sip_dir]) is None):
1598	raise SystemExit, "Failed to find libsip files in directory: %s" % self.sip_dir	1620	raise SystemExit, "Failed to find libsip files in directory: %s" % self.sip_dir
1599	self.announce("Using %s for libsip files" % self.sip_dir)	1621	self.announce("Using %s for libsip files" % self.sip_dir)