|
Lines 62-68
Link Here
|
| 62 |
|
62 |
|
| 63 |
arg_dict.setdefault('data_files',[]) |
63 |
arg_dict.setdefault('data_files',[]) |
| 64 |
|
64 |
|
| 65 |
kdecmdclass = {'install' : InstallKDE, |
65 |
tdecmdclass = {'install' : InstallTDE, |
| 66 |
'install_executable_links' : InstallExecutableLinks, |
66 |
'install_executable_links' : InstallExecutableLinks, |
| 67 |
'install_application_data' : InstallApplicationDataAndLinks, |
67 |
'install_application_data' : InstallApplicationDataAndLinks, |
| 68 |
'build_messages' : BuildI18NMessages, |
68 |
'build_messages' : BuildI18NMessages, |
|
Lines 71-77
Link Here
|
| 71 |
'checkpyqt' : CheckPyQt, |
71 |
'checkpyqt' : CheckPyQt, |
| 72 |
'checkpytde' : CheckPyTDE, |
72 |
'checkpytde' : CheckPyTDE, |
| 73 |
'uninstall' : Uninstall, |
73 |
'uninstall' : Uninstall, |
| 74 |
'build' : BuildKDE, |
74 |
'build' : BuildTDE, |
| 75 |
'build_kcm' : BuildKControlModule, |
75 |
'build_kcm' : BuildKControlModule, |
| 76 |
'install_kcm' : InstallKControlModule, |
76 |
'install_kcm' : InstallKControlModule, |
| 77 |
'build_html' : BuildDocbookHTML, |
77 |
'build_html' : BuildDocbookHTML, |
|
Lines 80-96
Link Here
|
| 80 |
'build_tdeioslave' : BuildTdeioslave, |
80 |
'build_tdeioslave' : BuildTdeioslave, |
| 81 |
'install_tdeioslave' : InstallTdeioslave} |
81 |
'install_tdeioslave' : InstallTdeioslave} |
| 82 |
|
82 |
|
| 83 |
for key in kdecmdclass.iterkeys(): |
83 |
for key in tdecmdclass.iterkeys(): |
| 84 |
cmdclass.setdefault(key,kdecmdclass[key]) |
84 |
cmdclass.setdefault(key,tdecmdclass[key]) |
| 85 |
|
85 |
|
| 86 |
arg_dict.setdefault('distclass',KDEDistribution) |
86 |
arg_dict.setdefault('distclass',TDEDistribution) |
| 87 |
|
87 |
|
| 88 |
apply(distutils.core.setup,[],arg_dict) |
88 |
apply(distutils.core.setup,[],arg_dict) |
| 89 |
|
89 |
|
| 90 |
########################################################################### |
90 |
########################################################################### |
| 91 |
class KDEDistribution(Distribution): |
91 |
class TDEDistribution(Distribution): |
| 92 |
def __init__(self,attrs=None): |
92 |
def __init__(self,attrs=None): |
| 93 |
self.min_kde_version = None |
93 |
self.min_tde_version = None |
| 94 |
self.min_qt_version = None |
94 |
self.min_qt_version = None |
| 95 |
self.kcontrol_modules = None |
95 |
self.kcontrol_modules = None |
| 96 |
self.tdeioslaves = None |
96 |
self.tdeioslaves = None |
|
Lines 128-134
Link Here
|
| 128 |
|
128 |
|
| 129 |
########################################################################### |
129 |
########################################################################### |
| 130 |
# Our slightly extended build command. This also does kcontrol modules. |
130 |
# Our slightly extended build command. This also does kcontrol modules. |
| 131 |
class BuildKDE(build): |
131 |
class BuildTDE(build): |
| 132 |
|
132 |
|
| 133 |
user_options = build.user_options[:] |
133 |
user_options = build.user_options[:] |
| 134 |
user_options.append( ('msgfmt-exe=',None,'Path to the msgfmt executable') ) |
134 |
user_options.append( ('msgfmt-exe=',None,'Path to the msgfmt executable') ) |
|
Lines 158-164
Link Here
|
| 158 |
if self.msgfmt_exe is None: |
158 |
if self.msgfmt_exe is None: |
| 159 |
# Find msgfmt |
159 |
# Find msgfmt |
| 160 |
canidatepaths = [] |
160 |
canidatepaths = [] |
| 161 |
canidatepaths.append( ask_kde_config('--install exe --expandvars').strip() ) |
161 |
canidatepaths.append( ask_tde_config('--install exe --expandvars').strip() ) |
| 162 |
self.msgfmt_exe = FindExeOnPath('msgfmt',canidatepaths) |
162 |
self.msgfmt_exe = FindExeOnPath('msgfmt',canidatepaths) |
| 163 |
if self.msgfmt_exe is None: |
163 |
if self.msgfmt_exe is None: |
| 164 |
raise SystemExit, "Unable to find 'msgfmt', needed to build i18n messages." |
164 |
raise SystemExit, "Unable to find 'msgfmt', needed to build i18n messages." |
|
Lines 166-172
Link Here
|
| 166 |
if self.meinproc_exe is None: |
166 |
if self.meinproc_exe is None: |
| 167 |
# Find meinproc |
167 |
# Find meinproc |
| 168 |
canidatepaths = [] |
168 |
canidatepaths = [] |
| 169 |
canidatepaths.append( ask_kde_config('--install exe --expandvars').strip() ) |
169 |
canidatepaths.append( ask_tde_config('--install exe --expandvars').strip() ) |
| 170 |
self.meinproc_exe = FindExeOnPath('meinproc',canidatepaths) |
170 |
self.meinproc_exe = FindExeOnPath('meinproc',canidatepaths) |
| 171 |
if self.meinproc_exe is None: |
171 |
if self.meinproc_exe is None: |
| 172 |
raise SystemExit, "Unable to find 'meinproc', needed to generate Docbook HTML documentation." |
172 |
raise SystemExit, "Unable to find 'meinproc', needed to generate Docbook HTML documentation." |
|
Lines 178-186
Link Here
|
| 178 |
return len(self.distribution.executable_links)!=0 |
178 |
return len(self.distribution.executable_links)!=0 |
| 179 |
|
179 |
|
| 180 |
########################################################################### |
180 |
########################################################################### |
| 181 |
class InstallKDE(install): |
181 |
class InstallTDE(install): |
| 182 |
user_options = install.user_options[:] |
182 |
user_options = install.user_options[:] |
| 183 |
user_options.append( ('kde-prefix=',None,"TDE installation prefix") ) |
183 |
user_options.append( ('tde-prefix=',None,"TDE installation prefix") ) |
| 184 |
user_options.append( ('install-messages=',None,"installation directory for i18n message files") ) |
184 |
user_options.append( ('install-messages=',None,"installation directory for i18n message files") ) |
| 185 |
user_options.append( ('install-html=',None,"installation directory for Docbook HTML files") ) |
185 |
user_options.append( ('install-html=',None,"installation directory for Docbook HTML files") ) |
| 186 |
user_options.append( ('install-cmd=',None,"Command to use to install the files") ) |
186 |
user_options.append( ('install-cmd=',None,"Command to use to install the files") ) |
|
Lines 200-206
Link Here
|
| 200 |
sub_commands.append( ('install_application_data',has_application_data) ) |
200 |
sub_commands.append( ('install_application_data',has_application_data) ) |
| 201 |
|
201 |
|
| 202 |
def initialize_options(self): |
202 |
def initialize_options(self): |
| 203 |
self.kde_prefix = None |
203 |
self.tde_prefix = None |
| 204 |
self.install_messages = None |
204 |
self.install_messages = None |
| 205 |
self.install_html = None |
205 |
self.install_html = None |
| 206 |
self.install_cmd = None |
206 |
self.install_cmd = None |
|
Lines 212-258
Link Here
|
| 212 |
install.initialize_options(self) |
212 |
install.initialize_options(self) |
| 213 |
|
213 |
|
| 214 |
def finalize_options(self): |
214 |
def finalize_options(self): |
| 215 |
# If no install prefix was provided, then we try to detect the KDE install prefix. |
215 |
# If no install prefix was provided, then we try to detect the TDE install prefix. |
| 216 |
self.user_supplied_kde_prefix = True |
216 |
self.user_supplied_tde_prefix = True |
| 217 |
|
217 |
|
| 218 |
if self.install_scripts is None: |
218 |
if self.install_scripts is None: |
| 219 |
if self.kde_prefix is not None: |
219 |
if self.tde_prefix is not None: |
| 220 |
self.install_scripts = os.path.join(self.kde_prefix,'bin') |
220 |
self.install_scripts = os.path.join(self.tde_prefix,'bin') |
| 221 |
else: |
221 |
else: |
| 222 |
self.announce("Detecting TDE 'bin' directory...") |
222 |
self.announce("Detecting TDE 'bin' directory...") |
| 223 |
self.install_scripts = ask_kde_config('--install exe --expandvars').strip() |
223 |
self.install_scripts = ask_tde_config('--install exe --expandvars').strip() |
| 224 |
self.announce(" ...TDE 'bin' directory is %s" % self.install_scripts) |
224 |
self.announce(" ...TDE 'bin' directory is %s" % self.install_scripts) |
| 225 |
|
225 |
|
| 226 |
if self.install_application_data is None: |
226 |
if self.install_application_data is None: |
| 227 |
if self.kde_prefix is not None: |
227 |
if self.tde_prefix is not None: |
| 228 |
self.install_application_data = os.path.join(self.kde_prefix,'share/apps',self.distribution.metadata.name) |
228 |
self.install_application_data = os.path.join(self.tde_prefix,'share/apps',self.distribution.metadata.name) |
| 229 |
else: |
229 |
else: |
| 230 |
self.announce("Detecting TDE application directory...") |
230 |
self.announce("Detecting TDE application directory...") |
| 231 |
kdeappdir = ask_kde_config('--install data --expandvars').strip() |
231 |
tdeappdir = ask_tde_config('--install data --expandvars').strip() |
| 232 |
self.announce(" ...TDE application directory is %s" % self.install_application_data) |
232 |
self.announce(" ...TDE application directory is %s" % self.install_application_data) |
| 233 |
self.install_application_data = os.path.join(kdeappdir,self.distribution.metadata.name) |
233 |
self.install_application_data = os.path.join(tdeappdir,self.distribution.metadata.name) |
| 234 |
|
234 |
|
| 235 |
if self.install_messages is None: |
235 |
if self.install_messages is None: |
| 236 |
if self.kde_prefix is not None: |
236 |
if self.tde_prefix is not None: |
| 237 |
self.install_messages = os.path.join(self.kde_prefix,'share/locale') |
237 |
self.install_messages = os.path.join(self.tde_prefix,'share/locale') |
| 238 |
else: |
238 |
else: |
| 239 |
self.announce("Detecting TDE messages directory...") |
239 |
self.announce("Detecting TDE messages directory...") |
| 240 |
self.install_messages = ask_kde_config('--install locale --expandvars').strip() |
240 |
self.install_messages = ask_tde_config('--install locale --expandvars').strip() |
| 241 |
self.announce(" ...TDE messages directory is %s" % self.install_messages) |
241 |
self.announce(" ...TDE messages directory is %s" % self.install_messages) |
| 242 |
|
242 |
|
| 243 |
if self.install_html is None: |
243 |
if self.install_html is None: |
| 244 |
if self.kde_prefix is not None: |
244 |
if self.tde_prefix is not None: |
| 245 |
self.install_html = os.path.join(self.kde_prefix,'share/doc/tde/HTML') |
245 |
self.install_html = os.path.join(self.tde_prefix,'share/doc/tde/HTML') |
| 246 |
else: |
246 |
else: |
| 247 |
self.announce("Detecting TDE HTML directory...") |
247 |
self.announce("Detecting TDE HTML directory...") |
| 248 |
self.install_html = ask_kde_config('--install html --expandvars').strip() |
248 |
self.install_html = ask_tde_config('--install html --expandvars').strip() |
| 249 |
self.announce(" ...TDE HTML directory is %s" % self.install_html) |
249 |
self.announce(" ...TDE HTML directory is %s" % self.install_html) |
| 250 |
|
250 |
|
| 251 |
if self.kde_prefix is None: |
251 |
if self.tde_prefix is None: |
| 252 |
self.announce("Detecting TDE install prefix...") |
252 |
self.announce("Detecting TDE install prefix...") |
| 253 |
self.kde_prefix = ask_kde_config('--prefix').strip() |
253 |
self.tde_prefix = ask_tde_config('--prefix').strip() |
| 254 |
self.announce(" ...TDE install prefix is %s" % self.kde_prefix) |
254 |
self.announce(" ...TDE install prefix is %s" % self.tde_prefix) |
| 255 |
self.user_supplied_kde_prefix = False |
255 |
self.user_supplied_tde_prefix = False |
| 256 |
|
256 |
|
| 257 |
if self.install_cmd is None: |
257 |
if self.install_cmd is None: |
| 258 |
self.announce("Detecting 'install' command...") |
258 |
self.announce("Detecting 'install' command...") |
|
Lines 264-285
Link Here
|
| 264 |
|
264 |
|
| 265 |
if self.install_xdg_apps is None: |
265 |
if self.install_xdg_apps is None: |
| 266 |
self.announce("Detecting XDG apps directory...") |
266 |
self.announce("Detecting XDG apps directory...") |
| 267 |
self.install_xdg_apps = ask_kde_config('--install xdgdata-apps --expandvars').strip() |
267 |
self.install_xdg_apps = ask_tde_config('--install xdgdata-apps --expandvars').strip() |
| 268 |
self.announce(" ...XDG apps directory is %s" % self.install_xdg_apps) |
268 |
self.announce(" ...XDG apps directory is %s" % self.install_xdg_apps) |
| 269 |
|
269 |
|
| 270 |
if self.install_kcm is None: |
270 |
if self.install_kcm is None: |
| 271 |
self.announce("Detecting kcm library directory...") |
271 |
self.announce("Detecting kcm library directory...") |
| 272 |
self.install_kcm = os.path.join(ask_kde_config('--install lib --expandvars').strip(),'trinity') |
272 |
self.install_kcm = os.path.join(ask_tde_config('--install lib --expandvars').strip(),'trinity') |
| 273 |
self.announce(" ...kcm library directory is %s" % self.install_kcm) |
273 |
self.announce(" ...kcm library directory is %s" % self.install_kcm) |
| 274 |
|
274 |
|
| 275 |
if self.install_tdeioslave is None: |
275 |
if self.install_tdeioslave is None: |
| 276 |
self.announce("Detecting tdeioslave library directory...") |
276 |
self.announce("Detecting tdeioslave library directory...") |
| 277 |
self.install_tdeioslave = os.path.join(ask_kde_config('--install lib --expandvars').strip(),'trinity') |
277 |
self.install_tdeioslave = os.path.join(ask_tde_config('--install lib --expandvars').strip(),'trinity') |
| 278 |
self.announce(" ...tdeioslave library directory is %s" % self.install_tdeioslave) |
278 |
self.announce(" ...tdeioslave library directory is %s" % self.install_tdeioslave) |
| 279 |
|
279 |
|
| 280 |
if self.install_protocol is None: |
280 |
if self.install_protocol is None: |
| 281 |
self.announce("Detecting tdeioslave protocol directory...") |
281 |
self.announce("Detecting tdeioslave protocol directory...") |
| 282 |
self.install_protocol = ask_kde_config('--install services --expandvars').strip() |
282 |
self.install_protocol = ask_tde_config('--install services --expandvars').strip() |
| 283 |
self.announce(" ...tdeioslave protocol directory is %s" % self.install_protocol) |
283 |
self.announce(" ...tdeioslave protocol directory is %s" % self.install_protocol) |
| 284 |
|
284 |
|
| 285 |
install.finalize_options(self) |
285 |
install.finalize_options(self) |
|
Lines 510-520
Link Here
|
| 510 |
('build-dir=','b', "build directory (where to install from)"), |
510 |
('build-dir=','b', "build directory (where to install from)"), |
| 511 |
('python-dir=',None,'Directory containing the Python installation'), |
511 |
('python-dir=',None,'Directory containing the Python installation'), |
| 512 |
('python-inc-dir=',None,'Directory containing C Header files for Python'), |
512 |
('python-inc-dir=',None,'Directory containing C Header files for Python'), |
| 513 |
('kde-inc-dir=',None,'Directory containing C++ header files for KDE'), |
513 |
('tde-inc-dir=',None,'Directory containing C++ header files for TDE'), |
| 514 |
('kde-lib-dir=',None,'Directory containing library files for KDE'), |
514 |
('tde-lib-dir=',None,'Directory containing library files for TDE'), |
| 515 |
('kde-kcm-lib-dir=',None,'Directory for KDE kcm library files'), |
515 |
('tde-kcm-lib-dir=',None,'Directory for TDE kcm library files'), |
| 516 |
('qt-inc-dir=',None,'Directory containing C++ header files for Qt'), |
516 |
('qt-inc-dir=',None,'Directory containing C++ header files for TQt'), |
| 517 |
('qt-lib-dir=',None,'Directory containing library files for Qt'), |
517 |
('qt-lib-dir=',None,'Directory containing library files for TQt'), |
| 518 |
('sip-dir=',None,'Directory containing the sip library files'), |
518 |
('sip-dir=',None,'Directory containing the sip library files'), |
| 519 |
('clib=',None,'gcc library and path'), |
519 |
('clib=',None,'gcc library and path'), |
| 520 |
('pyqt-dir=',None,'PyQt module directory'), |
520 |
('pyqt-dir=',None,'PyQt module directory'), |
|
Lines 526-534
Link Here
|
| 526 |
self.build_dir = None |
526 |
self.build_dir = None |
| 527 |
self.python_inc_dir = None |
527 |
self.python_inc_dir = None |
| 528 |
self.python_dir = None |
528 |
self.python_dir = None |
| 529 |
self.kde_inc_dir = None |
529 |
self.tde_inc_dir = None |
| 530 |
self.kde_lib_dir = None |
530 |
self.tde_lib_dir = None |
| 531 |
self.kde_kcm_lib_dir = None |
531 |
self.tde_kcm_lib_dir = None |
| 532 |
self.qt_inc_dir = None |
532 |
self.qt_inc_dir = None |
| 533 |
self.qt_lib_dir = None |
533 |
self.qt_lib_dir = None |
| 534 |
self.sip_dir = None |
534 |
self.sip_dir = None |
|
Lines 542-551
Link Here
|
| 542 |
self.set_undefined_options('install', ('build_base', 'build_dir'),('install_application_data','data_dir')) |
542 |
self.set_undefined_options('install', ('build_base', 'build_dir'),('install_application_data','data_dir')) |
| 543 |
|
543 |
|
| 544 |
install = self.get_finalized_command('install') |
544 |
install = self.get_finalized_command('install') |
| 545 |
self.install_prefix = ask_kde_config('--prefix').strip() |
545 |
self.install_prefix = ask_tde_config('--prefix').strip() |
| 546 |
|
546 |
|
| 547 |
# KDE inc dir: find it! |
547 |
# TDE inc dir: find it! |
| 548 |
if self.kde_inc_dir is None: |
548 |
if self.tde_inc_dir is None: |
| 549 |
canidatepaths = [] |
549 |
canidatepaths = [] |
| 550 |
tdedir = os.getenv("TDEDIR") |
550 |
tdedir = os.getenv("TDEDIR") |
| 551 |
if tdedir!=None: |
551 |
if tdedir!=None: |
|
Lines 553-578
Link Here
|
| 553 |
canidatepaths.append(os.path.join(install.prefix,"include")) |
553 |
canidatepaths.append(os.path.join(install.prefix,"include")) |
| 554 |
canidatepaths.append(os.path.join(self.install_prefix,'include')) |
554 |
canidatepaths.append(os.path.join(self.install_prefix,'include')) |
| 555 |
canidatepaths.append(os.path.join(self.install_prefix,'include','tde')) |
555 |
canidatepaths.append(os.path.join(self.install_prefix,'include','tde')) |
| 556 |
self.kde_inc_dir = FindFileInPaths('tdeapplication.h',canidatepaths) |
556 |
self.tde_inc_dir = FindFileInPaths('tdeapplication.h',canidatepaths) |
| 557 |
if self.kde_inc_dir is None: |
557 |
if self.tde_inc_dir is None: |
| 558 |
raise SystemExit, "Failed to find the KDE header file directory." |
558 |
raise SystemExit, "Failed to find the TDE header file directory." |
| 559 |
if FindFileInPaths('tdeapplication.h',[self.kde_inc_dir]) is None: |
559 |
if FindFileInPaths('tdeapplication.h',[self.tde_inc_dir]) is None: |
| 560 |
raise SystemExit, "Failed to find KDE header files in: %s" % self.kde_inc_dir |
560 |
raise SystemExit, "Failed to find TDE header files in: %s" % self.tde_inc_dir |
| 561 |
self.announce("Using %s for KDE header files" % self.kde_inc_dir) |
561 |
self.announce("Using %s for TDE header files" % self.tde_inc_dir) |
| 562 |
|
562 |
|
| 563 |
# KDE lib dir |
563 |
# TDE lib dir |
| 564 |
if self.kde_lib_dir is None: |
564 |
if self.tde_lib_dir is None: |
| 565 |
self.kde_lib_dir = os.path.join(self.install_prefix,"lib") |
565 |
self.tde_lib_dir = os.path.join(self.install_prefix,"lib") |
| 566 |
self.announce("Using %s for KDE library files" % self.kde_lib_dir) |
566 |
self.announce("Using %s for TDE library files" % self.tde_lib_dir) |
| 567 |
|
567 |
|
| 568 |
# KDE KCM lib dir |
568 |
# TDE KCM lib dir |
| 569 |
if self.kde_kcm_lib_dir is None: |
569 |
if self.tde_kcm_lib_dir is None: |
| 570 |
self.kde_kcm_lib_dir = os.path.join(self.kde_lib_dir,"trinity") |
570 |
self.tde_kcm_lib_dir = os.path.join(self.tde_lib_dir,"trinity") |
| 571 |
if FindFileInPaths('*kcm*.so',[self.kde_kcm_lib_dir]) is None: |
571 |
if FindFileInPaths('*kcm*.so',[self.tde_kcm_lib_dir]) is None: |
| 572 |
raise SystemExit, "Failed to find KDE KCM files in: %s" % self.kde_kcm_lib_dir |
572 |
raise SystemExit, "Failed to find TDE KCM files in: %s" % self.tde_kcm_lib_dir |
| 573 |
self.announce("Using %s for KDE KCM library files" % self.kde_kcm_lib_dir) |
573 |
self.announce("Using %s for TDE KCM library files" % self.tde_kcm_lib_dir) |
| 574 |
|
574 |
|
| 575 |
# Qt inc dir |
575 |
# TQt inc dir |
| 576 |
if self.qt_inc_dir is None: |
576 |
if self.qt_inc_dir is None: |
| 577 |
canidatepaths = [] |
577 |
canidatepaths = [] |
| 578 |
qtinc = os.getenv("QTINC") |
578 |
qtinc = os.getenv("QTINC") |
|
Lines 594-606
Link Here
|
| 594 |
if self.qt_inc_dir is None: |
594 |
if self.qt_inc_dir is None: |
| 595 |
self.qt_inc_dir = FindFileInPaths('qstring.h',canidatepaths) |
595 |
self.qt_inc_dir = FindFileInPaths('qstring.h',canidatepaths) |
| 596 |
if self.qt_inc_dir is None: |
596 |
if self.qt_inc_dir is None: |
| 597 |
raise SystemExit,"Failed to find the Qt header file directory" |
597 |
raise SystemExit,"Failed to find the TQt header file directory" |
| 598 |
if FindFileInPaths('ntqstring.h',[self.qt_inc_dir]) is None: |
598 |
if FindFileInPaths('ntqstring.h',[self.qt_inc_dir]) is None: |
| 599 |
if FindFileInPaths('qstring.h',[self.qt_inc_dir]) is None: |
599 |
if FindFileInPaths('qstring.h',[self.qt_inc_dir]) is None: |
| 600 |
raise SystemExit, "Failed to find Qt header files in: %s" % self.qt_inc_dir |
600 |
raise SystemExit, "Failed to find TQt header files in: %s" % self.qt_inc_dir |
| 601 |
self.announce("Using %s for Qt header files" % self.qt_inc_dir) |
601 |
self.announce("Using %s for TQt header files" % self.qt_inc_dir) |
| 602 |
|
602 |
|
| 603 |
# Qt lib dir |
603 |
# TQt lib dir |
| 604 |
if self.qt_lib_dir is None: |
604 |
if self.qt_lib_dir is None: |
| 605 |
canidatepaths = [] |
605 |
canidatepaths = [] |
| 606 |
qtlib = os.getenv("TQTLIB") |
606 |
qtlib = os.getenv("TQTLIB") |
|
Lines 634-641
Link Here
|
| 634 |
canidatepaths.append("/opt/qt3/lib/"+get_libdir_name()) |
634 |
canidatepaths.append("/opt/qt3/lib/"+get_libdir_name()) |
| 635 |
self.qt_lib_dir = FindFileInPaths('libqt*',canidatepaths) |
635 |
self.qt_lib_dir = FindFileInPaths('libqt*',canidatepaths) |
| 636 |
if self.qt_lib_dir is None: |
636 |
if self.qt_lib_dir is None: |
| 637 |
raise SystemExit, "Failed to find Qt library files" |
637 |
raise SystemExit, "Failed to find TQt library files" |
| 638 |
self.announce("Using %s for Qt library files" % self.qt_lib_dir) |
638 |
self.announce("Using %s for TQt library files" % self.qt_lib_dir) |
| 639 |
|
639 |
|
| 640 |
# Python dir |
640 |
# Python dir |
| 641 |
if self.python_dir is None: |
641 |
if self.python_dir is None: |
|
Lines 810-817
Link Here
|
| 810 |
cmdlist.append("-I" + sysconfig.get_config_var("INCLUDEDIR")) |
810 |
cmdlist.append("-I" + sysconfig.get_config_var("INCLUDEDIR")) |
| 811 |
cmdlist.append("-I" + sysconfig.get_config_var("INCLUDEPY")) |
811 |
cmdlist.append("-I" + sysconfig.get_config_var("INCLUDEPY")) |
| 812 |
cmdlist.append("-I" + self.python_inc_dir) |
812 |
cmdlist.append("-I" + self.python_inc_dir) |
| 813 |
cmdlist.append("-I" + self.kde_inc_dir) |
813 |
cmdlist.append("-I" + self.tde_inc_dir) |
| 814 |
cmdlist.append("-I" + self.kde_inc_dir + "/tde") |
814 |
cmdlist.append("-I" + self.tde_inc_dir + "/tde") |
| 815 |
cmdlist.append("-I" + self.qt_inc_dir) |
815 |
cmdlist.append("-I" + self.qt_inc_dir) |
| 816 |
cmdlist.append("-I/usr/include/tqt") |
816 |
cmdlist.append("-I/usr/include/tqt") |
| 817 |
cmdlist.append("-I.") |
817 |
cmdlist.append("-I.") |
|
Lines 838-844
Link Here
|
| 838 |
cmdlist.append("-export-dynamic") |
838 |
cmdlist.append("-export-dynamic") |
| 839 |
# object |
839 |
# object |
| 840 |
cmdlist.append(outputfile) |
840 |
cmdlist.append(outputfile) |
| 841 |
cmdlist.append("-rpath"); cmdlist.append(self.kde_kcm_lib_dir) |
841 |
cmdlist.append("-rpath"); cmdlist.append(self.tde_kcm_lib_dir) |
| 842 |
cmdlist.append("-o"); cmdlist.append(os.path.join(self.build_dir,stub_la_name)) |
842 |
cmdlist.append("-o"); cmdlist.append(os.path.join(self.build_dir,stub_la_name)) |
| 843 |
# Link libs |
843 |
# Link libs |
| 844 |
linklist = [] |
844 |
linklist = [] |
|
Lines 859-865
Link Here
|
| 859 |
# # PyTDE libs |
859 |
# # PyTDE libs |
| 860 |
# linklist.append("-L"+self.pytde_dir); linklist.append("-ltdecorecmodule"); linklist.append("-ltdeuicmodule") |
860 |
# linklist.append("-L"+self.pytde_dir); linklist.append("-ltdecorecmodule"); linklist.append("-ltdeuicmodule") |
| 861 |
|
861 |
|
| 862 |
linklist.append("-L"+self.kde_lib_dir); linklist.append("-L/opt/trinity/lib"); linklist.append("-ltdecore"); linklist.append("-lpythonize") |
862 |
linklist.append("-L"+self.tde_lib_dir); linklist.append("-L/opt/trinity/lib"); linklist.append("-ltdecore"); linklist.append("-lpythonize") |
| 863 |
linklist.append("-L"+self.qt_lib_dir); linklist.append("-ltqt-mt") |
863 |
linklist.append("-L"+self.qt_lib_dir); linklist.append("-ltqt-mt") |
| 864 |
linklist.append("-lm") |
864 |
linklist.append("-lm") |
| 865 |
linklist.append("-lc") |
865 |
linklist.append("-lc") |
|
Lines 870-876
Link Here
|
| 870 |
linklist.append("-R"); linklist.append(self.sip_dir) |
870 |
linklist.append("-R"); linklist.append(self.sip_dir) |
| 871 |
linklist.append("-R"); linklist.append(self.pyqt_dir) |
871 |
linklist.append("-R"); linklist.append(self.pyqt_dir) |
| 872 |
linklist.append("-R"); linklist.append(self.pytde_dir) |
872 |
linklist.append("-R"); linklist.append(self.pytde_dir) |
| 873 |
linklist.append("-R"); linklist.append(self.kde_lib_dir) |
873 |
linklist.append("-R"); linklist.append(self.tde_lib_dir) |
| 874 |
|
874 |
|
| 875 |
cmdlist.extend(linklist) |
875 |
cmdlist.extend(linklist) |
| 876 |
spawn(cmdlist) # Execute!! |
876 |
spawn(cmdlist) # Execute!! |
|
Lines 1265-1288
Link Here
|
| 1265 |
description = "Extract and update messages for translation" |
1265 |
description = "Extract and update messages for translation" |
| 1266 |
|
1266 |
|
| 1267 |
user_options = [('xgettext-exe=',None,'Full path to the xgetext executable'),\ |
1267 |
user_options = [('xgettext-exe=',None,'Full path to the xgetext executable'),\ |
| 1268 |
('kde-pot=',None,'Location of the the KDE pot file'),\ |
1268 |
('tde-pot=',None,'Location of the the TDE pot file'),\ |
| 1269 |
('msgmerge-exe=',None,'Full path to the msgmerge executable')] |
1269 |
('msgmerge-exe=',None,'Full path to the msgmerge executable')] |
| 1270 |
|
1270 |
|
| 1271 |
def initialize_options(self): |
1271 |
def initialize_options(self): |
| 1272 |
self.xgettext_exe = None |
1272 |
self.xgettext_exe = None |
| 1273 |
self.msgmerge_exe = None |
1273 |
self.msgmerge_exe = None |
| 1274 |
self.kde_pot = None |
1274 |
self.tde_pot = None |
| 1275 |
|
1275 |
|
| 1276 |
def finalize_options(self): |
1276 |
def finalize_options(self): |
| 1277 |
if self.xgettext_exe is None: |
1277 |
if self.xgettext_exe is None: |
| 1278 |
install = self.get_finalized_command('install') |
1278 |
install = self.get_finalized_command('install') |
| 1279 |
|
1279 |
|
| 1280 |
canidate_paths = [] |
1280 |
canidate_paths = [] |
| 1281 |
if install.user_supplied_kde_prefix: |
1281 |
if install.user_supplied_tde_prefix: |
| 1282 |
canidate_paths.append(os.path.join(install.kde_prefix,'bin')) |
1282 |
canidate_paths.append(os.path.join(install.tde_prefix,'bin')) |
| 1283 |
|
1283 |
|
| 1284 |
self.announce("Detecting xgettext...") |
1284 |
self.announce("Detecting xgettext...") |
| 1285 |
canidate_paths.append(ask_kde_config('--install exe --expandvars').strip()) |
1285 |
canidate_paths.append(ask_tde_config('--install exe --expandvars').strip()) |
| 1286 |
self.xgettext_exe = FindExeOnPath('xgettext',canidate_paths) |
1286 |
self.xgettext_exe = FindExeOnPath('xgettext',canidate_paths) |
| 1287 |
if self.xgettext_exe is None: |
1287 |
if self.xgettext_exe is None: |
| 1288 |
raise SystemExit, "Unable to find 'xgettext'." |
1288 |
raise SystemExit, "Unable to find 'xgettext'." |
|
Lines 1292-1324
Link Here
|
| 1292 |
install = self.get_finalized_command('install') |
1292 |
install = self.get_finalized_command('install') |
| 1293 |
|
1293 |
|
| 1294 |
canidate_paths = [] |
1294 |
canidate_paths = [] |
| 1295 |
if install.user_supplied_kde_prefix: |
1295 |
if install.user_supplied_tde_prefix: |
| 1296 |
canidate_paths.append(os.path.join(install.kde_prefix,'bin')) |
1296 |
canidate_paths.append(os.path.join(install.tde_prefix,'bin')) |
| 1297 |
|
1297 |
|
| 1298 |
self.announce("Detecting msgmerge...") |
1298 |
self.announce("Detecting msgmerge...") |
| 1299 |
canidate_paths.append(ask_kde_config('--install exe --expandvars').strip()) |
1299 |
canidate_paths.append(ask_tde_config('--install exe --expandvars').strip()) |
| 1300 |
self.msgmerge_exe = FindExeOnPath('msgmerge',canidate_paths) |
1300 |
self.msgmerge_exe = FindExeOnPath('msgmerge',canidate_paths) |
| 1301 |
if self.msgmerge_exe is None: |
1301 |
if self.msgmerge_exe is None: |
| 1302 |
raise SystemExit, "Unable to find 'xgettext'." |
1302 |
raise SystemExit, "Unable to find 'xgettext'." |
| 1303 |
self.announce(" ...msgmerge found at %s" % self.msgmerge_exe) |
1303 |
self.announce(" ...msgmerge found at %s" % self.msgmerge_exe) |
| 1304 |
|
1304 |
|
| 1305 |
if self.kde_pot is None: |
1305 |
if self.tde_pot is None: |
| 1306 |
self.announce("Detecting kde.pot...") |
1306 |
self.announce("Detecting tde.pot...") |
| 1307 |
canidatepaths = [] |
1307 |
canidatepaths = [] |
| 1308 |
tdedir = os.getenv("TDEDIR") |
1308 |
tdedir = os.getenv("TDEDIR") |
| 1309 |
if tdedir!=None: |
1309 |
if tdedir!=None: |
| 1310 |
canidatepaths.append(os.path.join(tdedir,"include")) |
1310 |
canidatepaths.append(os.path.join(tdedir,"include")) |
| 1311 |
install = self.get_finalized_command('install') |
1311 |
install = self.get_finalized_command('install') |
| 1312 |
canidatepaths.append(os.path.join(install.kde_prefix,"include")) |
1312 |
canidatepaths.append(os.path.join(install.tde_prefix,"include")) |
| 1313 |
canidatepaths.append('/opt/trinity/include') |
1313 |
canidatepaths.append('/opt/trinity/include') |
| 1314 |
canidatepaths.append('/opt/kde/include') |
1314 |
canidatepaths.append('/opt/kde/include') |
| 1315 |
kde_pot_dir = FindFileInPaths('kde.pot',canidatepaths) |
1315 |
tde_pot_dir = FindFileInPaths('tde.pot',canidatepaths) |
| 1316 |
|
1316 |
|
| 1317 |
if kde_pot_dir is None: |
1317 |
if tde_pot_dir is None: |
| 1318 |
raise SystemExit, "Failed to find the kde.pot file." |
1318 |
raise SystemExit, "Failed to find the tde.pot file." |
| 1319 |
|
1319 |
|
| 1320 |
self.kde_pot = os.path.join(kde_pot_dir,'kde.pot') |
1320 |
self.tde_pot = os.path.join(tde_pot_dir,'tde.pot') |
| 1321 |
self.announce(" ...kde.pot found at %s" % self.kde_pot) |
1321 |
self.announce(" ...tde.pot found at %s" % self.tde_pot) |
| 1322 |
|
1322 |
|
| 1323 |
def get_command_name(self): |
1323 |
def get_command_name(self): |
| 1324 |
return 'update_messages' |
1324 |
return 'update_messages' |
|
Lines 1335-1341
Link Here
|
| 1335 |
# Compile any UI files |
1335 |
# Compile any UI files |
| 1336 |
for dir in self.distribution.i18n[1]: |
1336 |
for dir in self.distribution.i18n[1]: |
| 1337 |
for file in glob.glob(os.path.join(dir,'*.ui')): |
1337 |
for file in glob.glob(os.path.join(dir,'*.ui')): |
| 1338 |
qtuicompiler.UpdateUI(file,kde=True) |
1338 |
qtuicompiler.UpdateUI(file,tde=True) |
| 1339 |
|
1339 |
|
| 1340 |
# Fetch all of the python files. |
1340 |
# Fetch all of the python files. |
| 1341 |
for dir in self.distribution.i18n[1]: |
1341 |
for dir in self.distribution.i18n[1]: |
|
Lines 1344-1350
Link Here
|
| 1344 |
target_pot = os.path.join(po_dir,self.distribution.metadata.name+".pot") |
1344 |
target_pot = os.path.join(po_dir,self.distribution.metadata.name+".pot") |
| 1345 |
|
1345 |
|
| 1346 |
cmd = [self.xgettext_exe, '-o', target_pot, '-ki18n', '-ktr2i18n', \ |
1346 |
cmd = [self.xgettext_exe, '-o', target_pot, '-ki18n', '-ktr2i18n', \ |
| 1347 |
'-kI18N_NOOP', '-ktranslate', '-kaliasLocale','-x',self.kde_pot] |
1347 |
'-kI18N_NOOP', '-ktranslate', '-kaliasLocale','-x',self.tde_pot] |
| 1348 |
cmd.extend(input_files) |
1348 |
cmd.extend(input_files) |
| 1349 |
spawn(cmd) |
1349 |
spawn(cmd) |
| 1350 |
|
1350 |
|
|
Lines 1460-1471
Link Here
|
| 1460 |
('build-dir=','b', "build directory (where to install from)"), |
1460 |
('build-dir=','b', "build directory (where to install from)"), |
| 1461 |
('python-dir=',None,'Directory containing the Python installation'), |
1461 |
('python-dir=',None,'Directory containing the Python installation'), |
| 1462 |
('python-inc-dir=',None,'Directory containing C Header files for Python'), |
1462 |
('python-inc-dir=',None,'Directory containing C Header files for Python'), |
| 1463 |
('kde-inc-dir=',None,'Directory containing C++ header files for KDE'), |
1463 |
('tde-inc-dir=',None,'Directory containing C++ header files for TDE'), |
| 1464 |
('kde-lib-dir=',None,'Directory containing library files for KDE'), |
1464 |
('tde-lib-dir=',None,'Directory containing library files for TDE'), |
| 1465 |
('kde-tdeioslave-lib-dir=',None,'Directory for KDE tdeioslave library files'), |
1465 |
('tde-tdeioslave-lib-dir=',None,'Directory for TDE tdeioslave library files'), |
| 1466 |
('kde-protocol-dir=',None,'Directory for KDE tdeioslave protocol files'), |
1466 |
('tde-protocol-dir=',None,'Directory for TDE tdeioslave protocol files'), |
| 1467 |
('qt-inc-dir=',None,'Directory containing C++ header files for Qt'), |
1467 |
('qt-inc-dir=',None,'Directory containing C++ header files for TQt'), |
| 1468 |
('qt-lib-dir=',None,'Directory containing library files for Qt'), |
1468 |
('qt-lib-dir=',None,'Directory containing library files for TQt'), |
| 1469 |
('sip-dir=','/usr/lib/pyshared/python*','Directory containing the sip library files'), |
1469 |
('sip-dir=','/usr/lib/pyshared/python*','Directory containing the sip library files'), |
| 1470 |
('clib=',None,'gcc library and path'), |
1470 |
('clib=',None,'gcc library and path'), |
| 1471 |
('pyqt-dir=','/usr/lib/pyshared/python*','PyQt module directory'), |
1471 |
('pyqt-dir=','/usr/lib/pyshared/python*','PyQt module directory'), |
|
Lines 1477-1486
Link Here
|
| 1477 |
self.build_dir = None |
1477 |
self.build_dir = None |
| 1478 |
self.python_inc_dir = None |
1478 |
self.python_inc_dir = None |
| 1479 |
self.python_dir = None |
1479 |
self.python_dir = None |
| 1480 |
self.kde_inc_dir = None |
1480 |
self.tde_inc_dir = None |
| 1481 |
self.kde_lib_dir = None |
1481 |
self.tde_lib_dir = None |
| 1482 |
self.kde_tdeioslave_lib_dir = None |
1482 |
self.tde_tdeioslave_lib_dir = None |
| 1483 |
self.kde_protocol_dir = None |
1483 |
self.tde_protocol_dir = None |
| 1484 |
self.qt_inc_dir = None |
1484 |
self.qt_inc_dir = None |
| 1485 |
self.qt_lib_dir = None |
1485 |
self.qt_lib_dir = None |
| 1486 |
self.sip_dir = None |
1486 |
self.sip_dir = None |
|
Lines 1494-1503
Link Here
|
| 1494 |
self.set_undefined_options('install', ('build_base', 'build_dir'),('install_application_data','data_dir')) |
1494 |
self.set_undefined_options('install', ('build_base', 'build_dir'),('install_application_data','data_dir')) |
| 1495 |
|
1495 |
|
| 1496 |
install = self.get_finalized_command('install') |
1496 |
install = self.get_finalized_command('install') |
| 1497 |
self.install_prefix = ask_kde_config('--prefix').strip() |
1497 |
self.install_prefix = ask_tde_config('--prefix').strip() |
| 1498 |
|
1498 |
|
| 1499 |
# KDE inc dir: find it! |
1499 |
# TDE inc dir: find it! |
| 1500 |
if self.kde_inc_dir is None: |
1500 |
if self.tde_inc_dir is None: |
| 1501 |
canidatepaths = [] |
1501 |
canidatepaths = [] |
| 1502 |
tdedir = os.getenv("TDEDIR") |
1502 |
tdedir = os.getenv("TDEDIR") |
| 1503 |
if tdedir!=None: |
1503 |
if tdedir!=None: |
|
Lines 1505-1530
Link Here
|
| 1505 |
canidatepaths.append(os.path.join(install.prefix,"include")) |
1505 |
canidatepaths.append(os.path.join(install.prefix,"include")) |
| 1506 |
canidatepaths.append(os.path.join(self.install_prefix,'include')) |
1506 |
canidatepaths.append(os.path.join(self.install_prefix,'include')) |
| 1507 |
canidatepaths.append(os.path.join(self.install_prefix,'include','tde')) |
1507 |
canidatepaths.append(os.path.join(self.install_prefix,'include','tde')) |
| 1508 |
self.kde_inc_dir = FindFileInPaths('tdeapplication.h',canidatepaths) |
1508 |
self.tde_inc_dir = FindFileInPaths('tdeapplication.h',canidatepaths) |
| 1509 |
if self.kde_inc_dir is None: |
1509 |
if self.tde_inc_dir is None: |
| 1510 |
raise SystemExit, "Failed to find the KDE header file directory." |
1510 |
raise SystemExit, "Failed to find the TDE header file directory." |
| 1511 |
if FindFileInPaths('tdeapplication.h',[self.kde_inc_dir]) is None: |
1511 |
if FindFileInPaths('tdeapplication.h',[self.tde_inc_dir]) is None: |
| 1512 |
raise SystemExit, "Failed to find KDE header files in: %s" % self.kde_inc_dir |
1512 |
raise SystemExit, "Failed to find TDE header files in: %s" % self.tde_inc_dir |
| 1513 |
self.announce("Using %s for KDE header files" % self.kde_inc_dir) |
1513 |
self.announce("Using %s for TDE header files" % self.tde_inc_dir) |
| 1514 |
|
1514 |
|
| 1515 |
# KDE lib dir |
1515 |
# TDE lib dir |
| 1516 |
if self.kde_lib_dir is None: |
1516 |
if self.tde_lib_dir is None: |
| 1517 |
self.kde_lib_dir = os.path.join(self.install_prefix,"lib") |
1517 |
self.tde_lib_dir = os.path.join(self.install_prefix,"lib") |
| 1518 |
self.announce("Using %s for KDE library files" % self.kde_lib_dir) |
1518 |
self.announce("Using %s for TDE library files" % self.tde_lib_dir) |
| 1519 |
|
1519 |
|
| 1520 |
# KDE tdeioslave lib dir |
1520 |
# TDE tdeioslave lib dir |
| 1521 |
if self.kde_tdeioslave_lib_dir is None: |
1521 |
if self.tde_tdeioslave_lib_dir is None: |
| 1522 |
self.kde_tdeioslave_lib_dir = os.path.join(self.kde_lib_dir,"trinity") |
1522 |
self.tde_tdeioslave_lib_dir = os.path.join(self.tde_lib_dir,"trinity") |
| 1523 |
if FindFileInPaths('tdeio_*.so',[self.kde_tdeioslave_lib_dir]) is None: |
1523 |
if FindFileInPaths('tdeio_*.so',[self.tde_tdeioslave_lib_dir]) is None: |
| 1524 |
raise SystemExit, "Failed to find KDE Tdeioslave library files in: %s" % self.kde_tdeioslave_lib_dir |
1524 |
raise SystemExit, "Failed to find TDE Tdeioslave library files in: %s" % self.tde_tdeioslave_lib_dir |
| 1525 |
self.announce("Using %s for KDE Tdeioslave library files" % self.kde_tdeioslave_lib_dir) |
1525 |
self.announce("Using %s for TDE Tdeioslave library files" % self.tde_tdeioslave_lib_dir) |
| 1526 |
|
1526 |
|
| 1527 |
# Qt inc dir |
1527 |
# TQt inc dir |
| 1528 |
if self.qt_inc_dir is None: |
1528 |
if self.qt_inc_dir is None: |
| 1529 |
canidatepaths = [] |
1529 |
canidatepaths = [] |
| 1530 |
qtinc = os.getenv("QTINC") |
1530 |
qtinc = os.getenv("QTINC") |
|
Lines 1544-1556
Link Here
|
| 1544 |
if self.qt_inc_dir is None: |
1544 |
if self.qt_inc_dir is None: |
| 1545 |
self.qt_inc_dir = FindFileInPaths('qstring.h',canidatepaths) |
1545 |
self.qt_inc_dir = FindFileInPaths('qstring.h',canidatepaths) |
| 1546 |
if self.qt_inc_dir is None: |
1546 |
if self.qt_inc_dir is None: |
| 1547 |
raise SystemExit,"Failed to find the Qt header file directory" |
1547 |
raise SystemExit,"Failed to find the TQt header file directory" |
| 1548 |
if FindFileInPaths('ntqstring.h',[self.qt_inc_dir]) is None: |
1548 |
if FindFileInPaths('ntqstring.h',[self.qt_inc_dir]) is None: |
| 1549 |
if FindFileInPaths('qstring.h',[self.qt_inc_dir]) is None: |
1549 |
if FindFileInPaths('qstring.h',[self.qt_inc_dir]) is None: |
| 1550 |
raise SystemExit, "Failed to find Qt header files in: %s" % self.qt_inc_dir |
1550 |
raise SystemExit, "Failed to find TQt header files in: %s" % self.qt_inc_dir |
| 1551 |
self.announce("Using %s for Qt header files" % self.qt_inc_dir) |
1551 |
self.announce("Using %s for TQt header files" % self.qt_inc_dir) |
| 1552 |
|
1552 |
|
| 1553 |
# Qt lib dir |
1553 |
# TQt lib dir |
| 1554 |
if self.qt_lib_dir is None: |
1554 |
if self.qt_lib_dir is None: |
| 1555 |
canidatepaths = [] |
1555 |
canidatepaths = [] |
| 1556 |
qtlib = os.getenv("TQTLIB") |
1556 |
qtlib = os.getenv("TQTLIB") |
|
Lines 1584-1591
Link Here
|
| 1584 |
canidatepaths.append("/opt/qt3/lib/"+get_libdir_name()) |
1584 |
canidatepaths.append("/opt/qt3/lib/"+get_libdir_name()) |
| 1585 |
self.qt_lib_dir = FindFileInPaths('libqt*',canidatepaths) |
1585 |
self.qt_lib_dir = FindFileInPaths('libqt*',canidatepaths) |
| 1586 |
if self.qt_lib_dir is None: |
1586 |
if self.qt_lib_dir is None: |
| 1587 |
raise SystemExit, "Failed to find Qt library files" |
1587 |
raise SystemExit, "Failed to find TQt library files" |
| 1588 |
self.announce("Using %s for Qt library files" % self.qt_lib_dir) |
1588 |
self.announce("Using %s for TQt library files" % self.qt_lib_dir) |
| 1589 |
|
1589 |
|
| 1590 |
# Python dir |
1590 |
# Python dir |
| 1591 |
if self.python_dir is None: |
1591 |
if self.python_dir is None: |
|
Lines 1744-1751
Link Here
|
| 1744 |
cmdlist.append("-I" + sysconfig.get_config_var("INCLUDEDIR")) |
1744 |
cmdlist.append("-I" + sysconfig.get_config_var("INCLUDEDIR")) |
| 1745 |
cmdlist.append("-I" + sysconfig.get_config_var("INCLUDEPY")) |
1745 |
cmdlist.append("-I" + sysconfig.get_config_var("INCLUDEPY")) |
| 1746 |
cmdlist.append("-I" + self.python_inc_dir) |
1746 |
cmdlist.append("-I" + self.python_inc_dir) |
| 1747 |
cmdlist.append("-I" + self.kde_inc_dir) |
1747 |
cmdlist.append("-I" + self.tde_inc_dir) |
| 1748 |
cmdlist.append("-I" + self.kde_inc_dir + "/tde") |
1748 |
cmdlist.append("-I" + self.tde_inc_dir + "/tde") |
| 1749 |
cmdlist.append("-I" + self.qt_inc_dir) |
1749 |
cmdlist.append("-I" + self.qt_inc_dir) |
| 1750 |
cmdlist.append("-I/usr/include/tqt") |
1750 |
cmdlist.append("-I/usr/include/tqt") |
| 1751 |
cmdlist.append("-I.") |
1751 |
cmdlist.append("-I.") |
|
Lines 1772-1778
Link Here
|
| 1772 |
cmdlist.append("-export-dynamic") |
1772 |
cmdlist.append("-export-dynamic") |
| 1773 |
# object |
1773 |
# object |
| 1774 |
cmdlist.append(outputfile) |
1774 |
cmdlist.append(outputfile) |
| 1775 |
cmdlist.append("-rpath"); cmdlist.append(self.kde_tdeioslave_lib_dir) |
1775 |
cmdlist.append("-rpath"); cmdlist.append(self.tde_tdeioslave_lib_dir) |
| 1776 |
cmdlist.append("-o"); cmdlist.append(os.path.join(self.build_dir,stub_la_name)) |
1776 |
cmdlist.append("-o"); cmdlist.append(os.path.join(self.build_dir,stub_la_name)) |
| 1777 |
# Link libs |
1777 |
# Link libs |
| 1778 |
linklist = [] |
1778 |
linklist = [] |
|
Lines 1792-1798
Link Here
|
| 1792 |
# # PyTDE libs |
1792 |
# # PyTDE libs |
| 1793 |
# linklist.append("-L"+self.pytde_dir); linklist.append("-ltdecorecmodule"); linklist.append("-ltdeuicmodule") |
1793 |
# linklist.append("-L"+self.pytde_dir); linklist.append("-ltdecorecmodule"); linklist.append("-ltdeuicmodule") |
| 1794 |
|
1794 |
|
| 1795 |
linklist.append("-L"+self.kde_lib_dir); linklist.append("-L/opt/trinity/lib"); linklist.append("-ltdecore"); linklist.append("-lpythonize") |
1795 |
linklist.append("-L"+self.tde_lib_dir); linklist.append("-L/opt/trinity/lib"); linklist.append("-ltdecore"); linklist.append("-lpythonize") |
| 1796 |
linklist.append("-L"+self.qt_lib_dir); linklist.append("-lqt-mt") |
1796 |
linklist.append("-L"+self.qt_lib_dir); linklist.append("-lqt-mt") |
| 1797 |
linklist.append("-lm") |
1797 |
linklist.append("-lm") |
| 1798 |
linklist.append("-lc") |
1798 |
linklist.append("-lc") |
|
Lines 1803-1809
Link Here
|
| 1803 |
linklist.append("-R"); linklist.append(self.sip_dir) |
1803 |
linklist.append("-R"); linklist.append(self.sip_dir) |
| 1804 |
linklist.append("-R"); linklist.append(self.pyqt_dir) |
1804 |
linklist.append("-R"); linklist.append(self.pyqt_dir) |
| 1805 |
linklist.append("-R"); linklist.append(self.pytde_dir) |
1805 |
linklist.append("-R"); linklist.append(self.pytde_dir) |
| 1806 |
linklist.append("-R"); linklist.append(self.kde_lib_dir) |
1806 |
linklist.append("-R"); linklist.append(self.tde_lib_dir) |
| 1807 |
|
1807 |
|
| 1808 |
cmdlist.extend(linklist) |
1808 |
cmdlist.extend(linklist) |
| 1809 |
spawn(cmdlist) # Execute!! |
1809 |
spawn(cmdlist) # Execute!! |
|
Lines 2038-2047
Link Here
|
| 2038 |
|
2038 |
|
| 2039 |
def run(self): |
2039 |
def run(self): |
| 2040 |
if self.min_qt_version!=None: |
2040 |
if self.min_qt_version!=None: |
| 2041 |
qtver,kdever = get_qt_kde_versions() |
2041 |
qtver,tdever = get_qt_tde_versions() |
| 2042 |
if compare_versions(self.min_qt_version,qtver)==1: |
2042 |
if compare_versions(self.min_qt_version,qtver)==1: |
| 2043 |
raise SystemExit, "Your Qt version is too old. Version %s or higher is required, found %s." % (self.min_qt_version,qtver) |
2043 |
raise SystemExit, "Your TQt version is too old. Version %s or higher is required, found %s." % (self.min_qt_version,qtver) |
| 2044 |
self.announce("Found Qt version %s." % qtver) |
2044 |
self.announce("Found TQt version %s." % qtver) |
| 2045 |
try: |
2045 |
try: |
| 2046 |
self.announce("Checking for a working PyQt...") |
2046 |
self.announce("Checking for a working PyQt...") |
| 2047 |
import qt |
2047 |
import qt |
|
Lines 2061-2074
Link Here
|
| 2061 |
pass |
2061 |
pass |
| 2062 |
|
2062 |
|
| 2063 |
def finalize_options(self): |
2063 |
def finalize_options(self): |
| 2064 |
self.min_kde_version = self.distribution.min_kde_version |
2064 |
self.min_tde_version = self.distribution.min_tde_version |
| 2065 |
|
2065 |
|
| 2066 |
def run(self): |
2066 |
def run(self): |
| 2067 |
if self.min_kde_version!=None: |
2067 |
if self.min_tde_version!=None: |
| 2068 |
qtver,kdever = get_qt_kde_versions() |
2068 |
qtver,tdever = get_qt_tde_versions() |
| 2069 |
if compare_versions(self.min_kde_version,kdever)==1: |
2069 |
if compare_versions(self.min_tde_version,tdever)==1: |
| 2070 |
raise SystemExit, "Your KDE version is too old. Version %s or higher is required, found %s." % (self.min_kde_version,kdever) |
2070 |
raise SystemExit, "Your TDE version is too old. Version %s or higher is required, found %s." % (self.min_tde_version,tdever) |
| 2071 |
self.announce("Found KDE version %s." % kdever) |
2071 |
self.announce("Found TDE version %s." % tdever) |
| 2072 |
self.announce("Checking for a working PyTDE...") |
2072 |
self.announce("Checking for a working PyTDE...") |
| 2073 |
|
2073 |
|
| 2074 |
# Try to import modules one by one. |
2074 |
# Try to import modules one by one. |
|
Lines 2078-2084
Link Here
|
| 2078 |
exec('import ' + k_module) |
2078 |
exec('import ' + k_module) |
| 2079 |
except: |
2079 |
except: |
| 2080 |
raise SystemExit, "Error: Couldn't find module '" + k_module + "'. \n" + \ |
2080 |
raise SystemExit, "Error: Couldn't find module '" + k_module + "'. \n" + \ |
| 2081 |
"Couldn't import KDE! Please make sure that PyTDE is installed and working.\n" + \ |
2081 |
"Couldn't import TDE! Please make sure that PyTDE is installed and working.\n" + \ |
| 2082 |
"PyTDE is available here: http://www.trinitydesktop.org" |
2082 |
"PyTDE is available here: http://www.trinitydesktop.org" |
| 2083 |
self.announce(" ...PyTDE is working") |
2083 |
self.announce(" ...PyTDE is working") |
| 2084 |
|
2084 |
|
|
Lines 2137-2149
Link Here
|
| 2137 |
|
2137 |
|
| 2138 |
########################################################################### |
2138 |
########################################################################### |
| 2139 |
|
2139 |
|
| 2140 |
def ask_kde_config(question): |
2140 |
def ask_tde_config(question): |
| 2141 |
# Look for the tde-config program |
2141 |
# Look for the tde-config program |
| 2142 |
kdeconfig = find_executable("tde-config", os.environ['PATH'] + os.pathsep + \ |
2142 |
tdeconfig = find_executable("tde-config", os.environ['PATH'] + os.pathsep + \ |
| 2143 |
os.pathsep.join(['/bin','/usr/bin','/opt/trinity/bin','/opt/kde/bin','/usr/local/bin'])) |
2143 |
os.pathsep.join(['/bin','/usr/bin','/opt/trinity/bin','/opt/kde/bin','/usr/local/bin'])) |
| 2144 |
if kdeconfig!=None: |
2144 |
if tdeconfig!=None: |
| 2145 |
# Ask the tde-config program for the |
2145 |
# Ask the tde-config program for the |
| 2146 |
fhandle = os.popen(kdeconfig+' ' + question,'r') |
2146 |
fhandle = os.popen(tdeconfig+' ' + question,'r') |
| 2147 |
result = fhandle.read() |
2147 |
result = fhandle.read() |
| 2148 |
fhandle.close() |
2148 |
fhandle.close() |
| 2149 |
return result |
2149 |
return result |
|
Lines 2223-2239
Link Here
|
| 2223 |
return 0 |
2223 |
return 0 |
| 2224 |
|
2224 |
|
| 2225 |
########################################################################### |
2225 |
########################################################################### |
| 2226 |
def get_qt_kde_versions(): |
2226 |
def get_qt_tde_versions(): |
| 2227 |
versioninfo = ask_kde_config('--version') |
2227 |
versioninfo = ask_tde_config('--version') |
| 2228 |
qtver = None |
2228 |
qtver = None |
| 2229 |
kdever = None |
2229 |
tdever = None |
| 2230 |
if versioninfo!=None: |
2230 |
if versioninfo!=None: |
| 2231 |
for line in versioninfo.splitlines(): |
2231 |
for line in versioninfo.splitlines(): |
| 2232 |
if line.startswith("Qt: "): |
2232 |
if line.startswith("Qt: "): |
| 2233 |
qtver = line[4:] |
2233 |
qtver = line[4:] |
| 2234 |
elif line.startswith("TDE: "): |
2234 |
elif line.startswith("TDE: "): |
| 2235 |
kdever = line[5:] |
2235 |
tdever = line[5:] |
| 2236 |
return qtver,kdever |
2236 |
return qtver,tdever |
| 2237 |
|
2237 |
|
| 2238 |
########################################################################### |
2238 |
########################################################################### |
| 2239 |
def compile_qtdesigner(ui_files, |
2239 |
def compile_qtdesigner(ui_files, |