|
|
|
@ -621,7 +621,7 @@ class BuildKControlModule(Command):
|
|
|
|
|
# PyKDE dir
|
|
|
|
|
if self.pykde_dir is None:
|
|
|
|
|
self.pykde_dir = sysconfig.get_python_lib()
|
|
|
|
|
if (FindFileInPaths("libtdecorecmodule*",[self.pykde_dir]) is None) and (FindFileInPaths("kdecore*",[self.pykde_dir]) is None):
|
|
|
|
|
if (FindFileInPaths("libtdecorecmodule*",[self.pykde_dir]) is None) and (FindFileInPaths("tdecore*",[self.pykde_dir]) is None):
|
|
|
|
|
raise SystemExit, "Failed to find the PyKDE directory: %s" % self.pykde_dir
|
|
|
|
|
self.announce("Using %s for PyKDE modules" % self.pykde_dir)
|
|
|
|
|
|
|
|
|
@ -805,16 +805,16 @@ class BuildKControlModule(Command):
|
|
|
|
|
# PyQt libs
|
|
|
|
|
linklist.append(self.pyqt_dir+"/qt.so")
|
|
|
|
|
# PyKDE libs
|
|
|
|
|
linklist.append(self.pykde_dir+"/kdecore.so")
|
|
|
|
|
linklist.append(self.pykde_dir+"/kdeui.so")
|
|
|
|
|
linklist.append(self.pykde_dir+"/tdecore.so")
|
|
|
|
|
linklist.append(self.pykde_dir+"/tdeui.so")
|
|
|
|
|
|
|
|
|
|
# linklist.append("-L"+self.sip_dir); linklist.append("-lsip")
|
|
|
|
|
# # PyQt libs
|
|
|
|
|
# linklist.append("-L"+self.pyqt_dir); linklist.append("-lqtcmodule")
|
|
|
|
|
# # PyKDE libs
|
|
|
|
|
# linklist.append("-L"+self.pykde_dir); linklist.append("-lkdecorecmodule"); linklist.append("-lkdeuicmodule")
|
|
|
|
|
# linklist.append("-L"+self.pykde_dir); linklist.append("-ltdecorecmodule"); linklist.append("-ltdeuicmodule")
|
|
|
|
|
|
|
|
|
|
linklist.append("-L"+self.kde_lib_dir); linklist.append("-L/opt/trinity/lib"); linklist.append("-lkdecore"); linklist.append("-lpythonize")
|
|
|
|
|
linklist.append("-L"+self.kde_lib_dir); linklist.append("-L/opt/trinity/lib"); linklist.append("-ltdecore"); linklist.append("-lpythonize")
|
|
|
|
|
linklist.append("-L"+self.qt_lib_dir); linklist.append("-lqt-mt")
|
|
|
|
|
linklist.append("-lm")
|
|
|
|
|
linklist.append("-lstdc++")
|
|
|
|
@ -1549,7 +1549,7 @@ class BuildKioslave(Command):
|
|
|
|
|
# PyKDE dir
|
|
|
|
|
if self.pykde_dir is None:
|
|
|
|
|
self.pykde_dir = sysconfig.get_python_lib()
|
|
|
|
|
if (FindFileInPaths("libtdecorecmodule*",[self.pykde_dir]) is None) and (FindFileInPaths("kdecore*",[self.pykde_dir]) is None):
|
|
|
|
|
if (FindFileInPaths("libtdecorecmodule*",[self.pykde_dir]) is None) and (FindFileInPaths("tdecore*",[self.pykde_dir]) is None):
|
|
|
|
|
raise SystemExit, "Failed to find the PyKDE directory: %s" % self.pykde_dir
|
|
|
|
|
self.announce("Using %s for PyKDE modules" % self.pykde_dir)
|
|
|
|
|
|
|
|
|
@ -1718,15 +1718,15 @@ class BuildKioslave(Command):
|
|
|
|
|
# PyQt libs
|
|
|
|
|
linklist.append(self.pyqt_dir+"/qt.so")
|
|
|
|
|
# PyKDE libs
|
|
|
|
|
linklist.append(self.pykde_dir+"/kdecore.so")
|
|
|
|
|
linklist.append(self.pykde_dir+"/tdecore.so")
|
|
|
|
|
|
|
|
|
|
# linklist.append("-L"+self.sip_dir); linklist.append("-lsip")
|
|
|
|
|
# # PyQt libs
|
|
|
|
|
# linklist.append("-L"+self.pyqt_dir); linklist.append("-lqtcmodule")
|
|
|
|
|
# # PyKDE libs
|
|
|
|
|
# linklist.append("-L"+self.pykde_dir); linklist.append("-lkdecorecmodule"); linklist.append("-lkdeuicmodule")
|
|
|
|
|
# linklist.append("-L"+self.pykde_dir); linklist.append("-ltdecorecmodule"); linklist.append("-ltdeuicmodule")
|
|
|
|
|
|
|
|
|
|
linklist.append("-L"+self.kde_lib_dir); linklist.append("-L/opt/trinity/lib"); linklist.append("-lkdecore"); linklist.append("-lpythonize")
|
|
|
|
|
linklist.append("-L"+self.kde_lib_dir); linklist.append("-L/opt/trinity/lib"); linklist.append("-ltdecore"); linklist.append("-lpythonize")
|
|
|
|
|
linklist.append("-L"+self.qt_lib_dir); linklist.append("-lqt-mt")
|
|
|
|
|
linklist.append("-lm")
|
|
|
|
|
linklist.append("-lstdc++")
|
|
|
|
@ -2007,7 +2007,7 @@ class CheckPyKDE(Command):
|
|
|
|
|
self.announce("Checking for a working PyKDE...")
|
|
|
|
|
|
|
|
|
|
# Try to import modules one by one.
|
|
|
|
|
for k_module in ('dcop', 'kdecore', 'kdeui', 'kio', 'kfile', 'kparts', 'khtml', 'kspell'):
|
|
|
|
|
for k_module in ('dcop', 'tdecore', 'tdeui', 'kio', 'kfile', 'kparts', 'khtml', 'kspell'):
|
|
|
|
|
self.announce(k_module)
|
|
|
|
|
try:
|
|
|
|
|
exec('import ' + k_module)
|
|
|
|
|