diff options
Diffstat (limited to 'configure.py')
| -rw-r--r-- | configure.py | 80 |
1 files changed, 40 insertions, 40 deletions
diff --git a/configure.py b/configure.py index 54f4e53..242bd0e 100644 --- a/configure.py +++ b/configure.py @@ -37,9 +37,9 @@ except: sys.exit (-1) try: - from PyTQt import pyqtconfig + from PyTQt import pytqtconfig except: - sip_tqt_config.error ("Can't find pyqtconfig.py in sys.path - exiting") + sip_tqt_config.error ("Can't find pytqtconfig.py in sys.path - exiting") topsrcdir = os.path.dirname(os.path.abspath(__file__)) has_objdir = topsrcdir != os.path.abspath(os.path.curdir) @@ -63,7 +63,7 @@ def srcPath(filename): # Get the SIP-TQt configuration. sipcfg = sip_tqt_config.Configuration() -pyqtcfg = pyqtconfig.Configuration () +pytqtcfg = pytqtconfig.Configuration () # Initialise the globals. pytde_version = 0x031006 @@ -75,8 +75,8 @@ kde_version_extra = None kde_max_version = 0x030503 sip_min_v4_version = 0x040900 -qt_min_version = 0x030200 -pyqt_min_version = 0x031000 +tqt_min_version = 0x030200 +pytqt_min_version = 0x031000 kde_sip_flags = [] @@ -100,22 +100,22 @@ pytde_modules = ["dcop", "tdecore", "tdefx", "tdeui", "tdeio", "tderesources "tdehtml", "tdespell", "tdeprint", "tdemdi"] #, "tdespell2"] pytde_imports = { - "dcop": ["PyTQt.qt"], - "tdecore": ["PyTQt.qt", "dcop"], -# "tdesu": ["PyTQt.qt", "dcop", "tdecore"], - "tdefx": ["PyTQt.qt", "dcop", "tdecore"], - "tdeui": ["PyTQt.qt", "PyTQt.qtxml", "dcop", "tdecore", "tdefx"], - "tdeio": ["PyTQt.qt", "PyTQt.qtxml", "dcop", "tdecore", "tdefx", "tdeui"], - "tderesources": ["PyTQt.qt", "PyTQt.qtxml", "dcop", "tdecore", "tdefx", "tdeui", "tdeio"], - "tdeabc": ["PyTQt.qt", "PyTQt.qtxml", "dcop", "tdecore", "tdefx", "tdeui", "tdeio", "tderesources"], - "tdeutils": ["PyTQt.qt", "PyTQt.qtxml", "dcop", "tdecore", "tdefx", "tdeui", "tdeio"], - "tdefile": ["PyTQt.qt", "PyTQt.qtxml", "dcop", "tdecore", "tdefx", "tdeui", "tdeio"], - "tdeparts": ["PyTQt.qt", "PyTQt.qtxml", "dcop", "tdecore", "tdefx", "tdeui", "tdeio"], - "tdehtml": ["PyTQt.qt", "PyTQt.qtxml", "dcop", "tdecore", "tdefx", "tdeui", "tdeutils", "tdeio", "tdeparts"], - "tdespell": ["PyTQt.qt", "PyTQt.qtxml", "dcop", "tdecore", "tdefx", "tdeui", "tdeio", "tdefile"], - "tdeprint": ["PyTQt.qt", "PyTQt.qtxml", "dcop", "tdecore", "tdefx", "tdeui"], - "tdemdi": ["PyTQt.qt", "PyTQt.qtxml", "dcop", "tdecore", "tdefx", "tdeui", "tdeio", "tdeparts"], - "tdespell2": ["PyTQt.qt", "PyTQt.qtxml", "dcop", "tdecore", "tdefx", "tdeui"] + "dcop": ["PyTQt.tqt"], + "tdecore": ["PyTQt.tqt", "dcop"], +# "tdesu": ["PyTQt.tqt", "dcop", "tdecore"], + "tdefx": ["PyTQt.tqt", "dcop", "tdecore"], + "tdeui": ["PyTQt.tqt", "PyTQt.tqtxml", "dcop", "tdecore", "tdefx"], + "tdeio": ["PyTQt.tqt", "PyTQt.tqtxml", "dcop", "tdecore", "tdefx", "tdeui"], + "tderesources": ["PyTQt.tqt", "PyTQt.tqtxml", "dcop", "tdecore", "tdefx", "tdeui", "tdeio"], + "tdeabc": ["PyTQt.tqt", "PyTQt.tqtxml", "dcop", "tdecore", "tdefx", "tdeui", "tdeio", "tderesources"], + "tdeutils": ["PyTQt.tqt", "PyTQt.tqtxml", "dcop", "tdecore", "tdefx", "tdeui", "tdeio"], + "tdefile": ["PyTQt.tqt", "PyTQt.tqtxml", "dcop", "tdecore", "tdefx", "tdeui", "tdeio"], + "tdeparts": ["PyTQt.tqt", "PyTQt.tqtxml", "dcop", "tdecore", "tdefx", "tdeui", "tdeio"], + "tdehtml": ["PyTQt.tqt", "PyTQt.tqtxml", "dcop", "tdecore", "tdefx", "tdeui", "tdeutils", "tdeio", "tdeparts"], + "tdespell": ["PyTQt.tqt", "PyTQt.tqtxml", "dcop", "tdecore", "tdefx", "tdeui", "tdeio", "tdefile"], + "tdeprint": ["PyTQt.tqt", "PyTQt.tqtxml", "dcop", "tdecore", "tdefx", "tdeui"], + "tdemdi": ["PyTQt.tqt", "PyTQt.tqtxml", "dcop", "tdecore", "tdefx", "tdeui", "tdeio", "tdeparts"], + "tdespell2": ["PyTQt.tqt", "PyTQt.tqtxml", "dcop", "tdecore", "tdefx", "tdeui"] } kde_includes = { @@ -202,20 +202,20 @@ def init_and_check_sanity (): sipcfg.error("This version of PyKDE requires SIP-TQt v%s or later" % sipcfg.version_to_string(minv)) # Check SIP-TQt has TQt support enabled and check version - if pyqtcfg.qt_version == 0: + if pytqtcfg.tqt_version == 0: sip_tqt_config.error("SIP-TQt has been built with TQt support disabled.") - if pyqtcfg.qt_version < qt_min_version: + if pytqtcfg.tqt_version < tqt_min_version: sip_tqt_config.error("SIP-TQt has been built with an unsupported TQt version (%s)"\ - % sipcfg.version_to_string (sipcfg.qt_version)) + % sipcfg.version_to_string (sipcfg.tqt_version)) # Check PyTQt built with libtqt-mt - if pyqtcfg.qt_threaded == 0: + if pytqtcfg.tqt_threaded == 0: sip_tqt_config.error ("PyKDE requires a threaded TQt version (libtqt-mt)") # Check PyTQt version - if pyqtcfg.pyqt_version < pyqt_min_version: + if pytqtcfg.pytqt_version < pytqt_min_version: sipcfg.error("This version of PyKDE requires PyTQt v%s or later"\ - % pyqtcfg.version_to_string(pyqtcfg.pyqt_version)) + % pytqtcfg.version_to_string(pytqtcfg.pytqt_version)) # find the libs, includes, and version info check_kde_installation () @@ -262,12 +262,12 @@ def inform_user(stage): sip_tqt_config.inform ("sip-tqt version is %s (%s)" % (sipcfg.sip_version_str, sip_tqt_config.version_to_string (sipcfg.sip_version))) print() - sip_tqt_config.inform ("TQt directory is %s" % pyqtcfg.qt_dir) - sip_tqt_config.inform ("TQt version is %s" % sip_tqt_config.version_to_string (pyqtcfg.qt_version)) + sip_tqt_config.inform ("TQt directory is %s" % pytqtcfg.tqt_dir) + sip_tqt_config.inform ("TQt version is %s" % sip_tqt_config.version_to_string (pytqtcfg.tqt_version)) print() - sip_tqt_config.inform ("PyTQt directory is %s" % pyqtcfg.pyqt_sip_dir) - sip_tqt_config.inform ("PyTQt version is %s (%s)" % (pyqtcfg.pyqt_version_str, - sip_tqt_config.version_to_string (pyqtcfg.pyqt_version))) + sip_tqt_config.inform ("PyTQt directory is %s" % pytqtcfg.pytqt_sip_dir) + sip_tqt_config.inform ("PyTQt version is %s (%s)" % (pytqtcfg.pytqt_version_str, + sip_tqt_config.version_to_string (pytqtcfg.pytqt_version))) print() elif stage == 1: @@ -524,7 +524,7 @@ def set_sip_flags(): check_distribution () - kde_sip_flags.append (pyqtcfg.pyqt_qt_sip_flags) + kde_sip_flags.append (pytqtcfg.pytqt_tqt_sip_flags) kdetags = { 0x030001: "KDE_3_0_0", @@ -622,12 +622,12 @@ def generate_code(mname, imports=None, extra_cflags=None, extra_cxxflags=None, e argv.append("-I") argv.append(srcPath("sip")) - pyqtInclPathSeen = 0 + pytqtInclPathSeen = 0 for mod in pytde_imports [mname]: - if mod.find("PyTQt.q") == 0 and not pyqtInclPathSeen: + if mod.find("PyTQt.tq") == 0 and not pytqtInclPathSeen: argv.append ("-I") - argv.append (pyqtcfg.pyqt_sip_dir) - pyqtInclPathSeen = 1 + argv.append (pytqtcfg.pytqt_sip_dir) + pytqtInclPathSeen = 1 elif mod == "dcop" or mod.find("k") == 0 or mod.find("tde") == 0: subdir = os.path.join(srcPath("sip"), mod) @@ -697,12 +697,12 @@ def generate_code(mname, imports=None, extra_cflags=None, extra_cxxflags=None, e installs.append([sipfiles, os.path.join(opt_pytdesipdir, mname)]) makefile = sip_tqt_config.SIPModuleMakefile( - configuration = pyqtcfg, + configuration = pytqtcfg, build_file = mname + ".sbf", dir = mname, install_dir = opt_pytdemoddir, installs = installs, - qt = 1, + tqt = 1, opengl = opengl, warnings = warnings, static = opt_static, @@ -787,7 +787,7 @@ def create_makefiles(): sip_tqt_config.inform("Creating top level Makefile...") sip_tqt_config.ParentMakefile( - configuration = pyqtcfg, + configuration = pytqtcfg, subdirs = subdirs, installs= [("pytdeconfig.py", opt_pytdemoddir), (srcPath("contrib/tdepyuic"), opt_tdebasedir + "/bin")] ).generate() |