diff options
Diffstat (limited to 'configure.py')
-rw-r--r-- | configure.py | 76 |
1 files changed, 38 insertions, 38 deletions
diff --git a/configure.py b/configure.py index a9b47b4..b4d6809 100644 --- a/configure.py +++ b/configure.py @@ -96,34 +96,34 @@ opt_dep_warnings = 0 opt_libdir = "lib" opt_dist_name = "" -pykde_modules = ["dcop", "kdecore", "kdefx", "kdeui", "kio", "kresources", "kabc", "kutils", "kfile", "kparts",\ - "khtml", "kspell", "kdeprint", "kmdi"] #, "kspell2"] +pykde_modules = ["dcop", "tdecore", "tdefx", "tdeui", "kio", "kresources", "kabc", "kutils", "kfile", "kparts",\ + "khtml", "kspell", "tdeprint", "kmdi"] #, "kspell2"] pykde_imports = { "dcop": ["qt"], - "kdecore": ["qt", "dcop"], -# "kdesu": ["qt", "dcop", "kdecore"], - "kdefx": ["qt", "dcop", "kdecore"], - "kdeui": ["qt", "qtxml", "dcop", "kdecore", "kdefx"], - "kio": ["qt", "qtxml", "dcop", "kdecore", "kdefx", "kdeui"], - "kresources": ["qt", "qtxml", "dcop", "kdecore", "kdefx", "kdeui", "kio"], - "kabc": ["qt", "qtxml", "dcop", "kdecore", "kdefx", "kdeui", "kio", "kresources"], - "kutils": ["qt", "qtxml", "dcop", "kdecore", "kdefx", "kdeui", "kio"], - "kfile": ["qt", "qtxml", "dcop", "kdecore", "kdefx", "kdeui", "kio"], - "kparts": ["qt", "qtxml", "dcop", "kdecore", "kdefx", "kdeui", "kio"], - "khtml": ["qt", "qtxml", "dcop", "kdecore", "kdefx", "kdeui", "kutils", "kio", "kparts"], - "kspell": ["qt", "qtxml", "dcop", "kdecore", "kdefx", "kdeui", "kio", "kfile"], - "kdeprint": ["qt", "qtxml", "dcop", "kdecore", "kdefx", "kdeui"], - "kmdi": ["qt", "qtxml", "dcop", "kdecore", "kdefx", "kdeui", "kio", "kparts"], - "kspell2": ["qt", "qtxml", "dcop", "kdecore", "kdefx", "kdeui"] + "tdecore": ["qt", "dcop"], +# "tdesu": ["qt", "dcop", "tdecore"], + "tdefx": ["qt", "dcop", "tdecore"], + "tdeui": ["qt", "qtxml", "dcop", "tdecore", "tdefx"], + "kio": ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui"], + "kresources": ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui", "kio"], + "kabc": ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui", "kio", "kresources"], + "kutils": ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui", "kio"], + "kfile": ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui", "kio"], + "kparts": ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui", "kio"], + "khtml": ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui", "kutils", "kio", "kparts"], + "kspell": ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui", "kio", "kfile"], + "tdeprint": ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui"], + "kmdi": ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui", "kio", "kparts"], + "kspell2": ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui"] } kde_includes = { "dcop": None, - "kdecore": None, -# "kdesu": ["kdesu"], - "kdefx": None, - "kdeui": None, + "tdecore": None, +# "tdesu": ["tdesu"], + "tdefx": None, + "tdeui": None, "kio": ["kio"], "kresources": ["kio", "../kio", "kresources"], "kabc": ["kio", "../kio", "kresources", "kabc"], @@ -131,7 +131,7 @@ kde_includes = { "kparts": ["kio", "../kio", "kparts"], "khtml": ["kio", "../kio", "kparts", "dom"], "kspell": ["kio"], - "kdeprint": ["kdeprint"], + "tdeprint": ["tdeprint"], "kmdi": ["kmdi", "kio", "../kio", "kparts"], "kutils": ["kio", "../kio"] #, # "kspell2": None @@ -139,12 +139,12 @@ kde_includes = { postProcess = { "dcop": None, - "kdecore": [["-p ", "kdecore", "-o", "appQuit", "kdecore.py"], - #["-p ", "kdecore", "-o", "fixQVariant", "kdecore.sbf"], - ["-p ", "kdecore", "-o", "fixSignal", "kdecorepart0.*"]], -# "kdesu": None, - "kdefx": None, - "kdeui": None, #[["-p ", "kdeui", "-o", "shpix", "sipkdeuiKSharedPixmap.cpp"]], + "tdecore": [["-p ", "tdecore", "-o", "appQuit", "tdecore.py"], + #["-p ", "tdecore", "-o", "fixQVariant", "tdecore.sbf"], + ["-p ", "tdecore", "-o", "fixSignal", "tdecorepart0.*"]], +# "tdesu": None, + "tdefx": None, + "tdeui": None, #[["-p ", "tdeui", "-o", "shpix", "siptdeuiKSharedPixmap.cpp"]], "kresources": None, "kabc": None, "kio": None, @@ -152,7 +152,7 @@ postProcess = { "kparts": None, "khtml": None, "kspell": None, - "kdeprint": None, + "tdeprint": None, "kmdi": None, "kutils": None #, # "kspell2": None @@ -599,7 +599,7 @@ def generate_code(mname, imports=None, extra_cflags=None, extra_cxxflags=None, e if opt_concat: argv.append("-j") - if mname == "kdeui" and opt_split == 1: + if mname == "tdeui" and opt_split == 1: splits = 2 else: splits = opt_split @@ -648,15 +648,15 @@ def generate_code(mname, imports=None, extra_cflags=None, extra_cxxflags=None, e if not os.access(buildfile, os.F_OK): sipconfig.error("Unable to create the C++ code.") - if mname == "kdecore" and not opt_concat: - postProcess ["kdecore"][-1][-1] = "kdecorecmodule.*" + if mname == "tdecore" and not opt_concat: + postProcess ["tdecore"][-1][-1] = "tdecorecmodule.*" # Compile the Python stub. if sipcfg.sip_version < 0x040000: sipconfig.inform("Compiling %s.py..." % mname) py_compile.compile(os.path.join(mname, mname + ".py"), os.path.join(mname, mname + ".pyc")) - elif mname == "kdecore": - postProcess ["kdecore"][-1][-1] = "sip" + postProcess ["kdecore"][-1][-1] + elif mname == "tdecore": + postProcess ["tdecore"][-1][-1] = "sip" + postProcess ["tdecore"][-1][-1] # needs to be here (not earlier) to catch .py files if any if postProcess [mname]: @@ -753,16 +753,16 @@ def generate_code(mname, imports=None, extra_cflags=None, extra_cxxflags=None, e extra_lib = "kio" makefile.extra_libs.append(extra_lib) - if extra_lib == "kdefx": - makefile.extra_libs.append ("kdecore") + if extra_lib == "tdefx": + makefile.extra_libs.append ("tdecore") if extra_lib == "kspell": - makefile.extra_libs.append ("kdeui") + makefile.extra_libs.append ("tdeui") if extra_lib == "kabc" and kde_version >= 0x030200: makefile.extra_libs.append ("kabc_file") if extra_lib == "kparts" and kde_version >= 0x030500: makefile.extra_lib_dirs.append (os.path.join (opt_kdelibdir, "trinity")) - if extra_lib == "kdeprint": + if extra_lib == "tdeprint": makefile.extra_cflags.append ("-fno-rtti") makefile.extra_cxxflags.append ("-fno-rtti") |