From 01bd7e2ffdc3caa95228e03ad501d778b05270a9 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 4 Dec 2011 18:33:16 -0600 Subject: [PATCH] Part 1 of 2 rename pykde to pytde --- ChangeLog | 4 +- ChangeLog.2001-4 | 2 +- Changelog | 4 +- configure.py | 94 ++++++++++++++-------------- doc/index.html | 2 +- doc/index1.html | 4 +- doc/switches.html | 2 +- doc/trouble.html | 8 +-- examples/pykde-sampler/HOWTO.samples | 2 +- examples/pykde-sampler/about.py | 4 +- examples/uimodules/uidialogs.py | 2 +- importTest.py | 10 +-- pykdeconfig.py | 16 ++--- pykdeconfig.py.in | 4 +- 14 files changed, 79 insertions(+), 79 deletions(-) diff --git a/ChangeLog b/ChangeLog index 576da5f..e2b7e44 100644 --- a/ChangeLog +++ b/ChangeLog @@ -415,7 +415,7 @@ Changed pid_t type from int to long; enabled KParts::URLArgs::metaData () r39 | (jim) | 2005-02-28 23:49:09 -0800 (Mon, 28 Feb 2005) | 4 lines KFileMetaInfo typedefs removed; KProcessController versioning -corrected; KRecentDirs (and extra/ hfiles) added; pykde332.prj +corrected; KRecentDirs (and extra/ hfiles) added; pytde332.prj added ------------------------------------------------------------------------ @@ -446,7 +446,7 @@ Modified kmdidefines.sip for sip 4.2 enumerator name problem ------------------------------------------------------------------------ r32 | (jim) | 2004-11-28 13:56:19 -0800 (Sun, 28 Nov 2004) | 2 lines -Removed pykdeconfig.py from source control +Removed pytdeconfig.py from source control ------------------------------------------------------------------------ r31 | (jim) | 2004-11-27 23:29:03 -0800 (Sat, 27 Nov 2004) | 2 lines diff --git a/ChangeLog.2001-4 b/ChangeLog.2001-4 index a2e5386..f28fb21 100644 --- a/ChangeLog.2001-4 +++ b/ChangeLog.2001-4 @@ -42,7 +42,7 @@ kzip.sip for Python 2.3 in build.py 2003/8/31 18:37:00 jim No release; Revised generation of rm's in -pykdepanelapplet Makefile install target to use wild +pytdepanelapplet Makefile install target to use wild cards instead of one per lib link; finished applet installer handling of existing .desktop files; improved installer validation; updated docs. diff --git a/Changelog b/Changelog index 6ba2497..aa05f82 100644 --- a/Changelog +++ b/Changelog @@ -592,7 +592,7 @@ Changed pid_t type from int to long; enabled KParts::URLArgs::metaData () r39 | (no author) | 2005-02-28 23:49:09 -0800 (Mon, 28 Feb 2005) | 4 lines KFileMetaInfo typedefs removed; KProcessController versioning -corrected; KRecentDirs (and extra/ hfiles) added; pykde332.prj +corrected; KRecentDirs (and extra/ hfiles) added; pytde332.prj added ------------------------------------------------------------------------ @@ -623,7 +623,7 @@ Modified kmdidefines.sip for sip 4.2 enumerator name problem ------------------------------------------------------------------------ r32 | (no author) | 2004-11-28 13:56:19 -0800 (Sun, 28 Nov 2004) | 2 lines -Removed pykdeconfig.py from source control +Removed pytdeconfig.py from source control ------------------------------------------------------------------------ r31 | (no author) | 2004-11-27 23:29:03 -0800 (Sat, 27 Nov 2004) | 2 lines diff --git a/configure.py b/configure.py index 5ba7efa..ac9dd28 100644 --- a/configure.py +++ b/configure.py @@ -66,8 +66,8 @@ sipcfg = sipconfig.Configuration() pyqtcfg = pyqtconfig.Configuration () # Initialise the globals. -pykde_version = 0x031006 -pykde_version_str = "3.16.6" +pytde_version = 0x031006 +pytde_version_str = "3.16.6" kde_version = None kde_version_str = None kde_version_sfx = None @@ -81,8 +81,8 @@ pyqt_min_version = 0x031000 kde_sip_flags = [] # Command line options. -opt_pykdemoddir = sipcfg.default_mod_dir -opt_pykdesipdir = sipcfg.default_sip_dir +opt_pytdemoddir = sipcfg.default_mod_dir +opt_pytdesipdir = sipcfg.default_sip_dir opt_debug = 0 opt_concat = None opt_split = 1 @@ -96,10 +96,10 @@ opt_dep_warnings = 0 opt_libdir = "lib" opt_dist_name = "" -pykde_modules = ["dcop", "tdecore", "tdefx", "tdeui", "kio", "kresources", "kabc", "kutils", "kfile", "kparts",\ +pytde_modules = ["dcop", "tdecore", "tdefx", "tdeui", "kio", "kresources", "kabc", "kutils", "kfile", "kparts",\ "khtml", "kspell", "tdeprint", "kmdi"] #, "kspell2"] -pykde_imports = { +pytde_imports = { "dcop": ["qt"], "tdecore": ["qt", "dcop"], # "tdesu": ["qt", "dcop", "tdecore"], @@ -160,7 +160,7 @@ postProcess = { opt_startModName = "" opt_startmod = 0 -opt_endmod = len (pykde_modules) +opt_endmod = len (pytde_modules) def check_gcc (): global opt_concat @@ -230,7 +230,7 @@ def usage(rcode = 2): print "where:" print " -h displays this help message" print " -c concatenates each module's C/C++ source files [default]" - print " -d dir where the PyKDE modules will be installed [default %s]" % opt_pykdemoddir + print " -d dir where the PyKDE modules will be installed [default %s]" % opt_pytdemoddir print " -g always release the GIL (SIP v3.x behaviour)" print " -i no concatenation of each module's C/C++ source files" print " -j # splits the concatenated C++ source files into # pieces [default 1]" @@ -240,7 +240,7 @@ def usage(rcode = 2): print " -o dir the directory containing the KDE header files" print " -r generates code with tracing enabled [default disabled]" print " -u build with debugging symbols" - print " -v dir where the PyKDE .sip files will be installed [default %s]" % opt_pykdesipdir + print " -v dir where the PyKDE .sip files will be installed [default %s]" % opt_pytdesipdir print " -w turn on KDE deprecated object warnings when compiling [default off]" print " -z file the name of a file containing command line flags" @@ -252,7 +252,7 @@ def inform_user(stage): """ if stage == 0: print - print " PyKDE version %s" % pykde_version_str + print " PyKDE version %s" % pytde_version_str print " -------" print sipconfig.inform ("Python include directory is %s" % sipcfg.py_inc_dir) @@ -279,8 +279,8 @@ def inform_user(stage): sipconfig.inform ("KDE version is %s (0x%x)" % (kde_version_str, kde_version)) print - sipconfig.inform("PyKDE modules will be installed in %s" % opt_pykdemoddir) - sipconfig.inform("PyKDE .sip files will be installed in %s" % opt_pykdesipdir) + sipconfig.inform("PyKDE modules will be installed in %s" % opt_pytdemoddir) + sipconfig.inform("PyKDE .sip files will be installed in %s" % opt_pytdesipdir) print @@ -295,22 +295,22 @@ def create_config(module, template): sipconfig.inform("Creating %s..." % module) content = { - "pykde_version": pykde_version, - "pykde_version_str": pykde_version_str, + "pytde_version": pytde_version, + "pytde_version_str": pytde_version_str, "kde_version": kde_version, "kde_version_str": kde_version_str, "kde_version_sfx": kde_version_sfx, "kde_version_extra": kde_version_extra, -# "pykde_bin_dir": opt_pykdebindir, - "pykde_mod_dir": opt_pykdemoddir, - "pykde_sip_dir": opt_pykdesipdir, - "pykde_modules": pykde_modules, - "pykde_kde_sip_flags": kde_sip_flags, +# "pytde_bin_dir": opt_pytdebindir, + "pytde_mod_dir": opt_pytdemoddir, + "pytde_sip_dir": opt_pytdesipdir, + "pytde_modules": pytde_modules, + "pytde_kde_sip_flags": kde_sip_flags, "tdebasedir": opt_tdebasedir, "kdelibdir": opt_kdelibdir, "libdir": opt_libdir, "kdeincdir": opt_kdeincdir, - "pykde_modules": pykde_modules, + "pytde_modules": pytde_modules, "dist_name": opt_dist_name } @@ -622,7 +622,7 @@ def generate_code(mname, imports=None, extra_cflags=None, extra_cxxflags=None, e argv.append(srcPath("sip")) pyqtInclPathSeen = 0 - for mod in pykde_imports [mname]: + for mod in pytde_imports [mname]: if string.find (mod, "q") == 0 and not pyqtInclPathSeen: argv.append ("-I") argv.append (pyqtcfg.pyqt_sip_dir) @@ -670,16 +670,16 @@ def generate_code(mname, imports=None, extra_cflags=None, extra_cxxflags=None, e installs = [] if mname == "dcop": if has_objdir: - installs.append ([[srcPath("extensions/dcopext.py"), srcPath("extensions/dcopexport.py")], opt_pykdemoddir]) + installs.append ([[srcPath("extensions/dcopext.py"), srcPath("extensions/dcopexport.py")], opt_pytdemoddir]) else: - installs.append ([["../extensions/dcopext.py", "../extensions/dcopexport.py"], opt_pykdemoddir]) + installs.append ([["../extensions/dcopext.py", "../extensions/dcopexport.py"], opt_pytdemoddir]) if sipcfg.sip_version >= 0x040000: warnings = 1 else: warnings = 0 - installs.append([[mname + ".py", mname + ".pyc"], opt_pykdemoddir]) + installs.append([[mname + ".py", mname + ".pyc"], opt_pytdemoddir]) sipfiles = [] @@ -694,13 +694,13 @@ def generate_code(mname, imports=None, extra_cflags=None, extra_cxxflags=None, e - installs.append([sipfiles, os.path.join(opt_pykdesipdir, mname)]) + installs.append([sipfiles, os.path.join(opt_pytdesipdir, mname)]) makefile = sipconfig.SIPModuleMakefile( configuration = pyqtcfg, build_file = mname + ".sbf", dir = mname, - install_dir = opt_pykdemoddir, + install_dir = opt_pytdemoddir, installs = installs, qt = 1, opengl = opengl, @@ -779,14 +779,14 @@ def generate_code(mname, imports=None, extra_cflags=None, extra_cxxflags=None, e def create_makefiles(): """Create the additional Makefiles. """ - subdirs = pykde_modules[:] + subdirs = pytde_modules[:] sipconfig.inform("Creating top level Makefile...") sipconfig.ParentMakefile( configuration = pyqtcfg, subdirs = subdirs, - installs= [("pykdeconfig.py", opt_pykdemoddir), (srcPath("contrib/kdepyuic"), sipcfg.default_bin_dir)] + installs= [("pytdeconfig.py", opt_pytdemoddir), (srcPath("contrib/kdepyuic"), sipcfg.default_bin_dir)] ).generate() @@ -823,13 +823,13 @@ def main(argv): except getopt.GetoptError: usage() - global opt_pykdemoddir, opt_pykdesipdir + global opt_pytdemoddir, opt_pytdesipdir global opt_debug, opt_concat, opt_releasegil global opt_split, opt_tracing, opt_startModName global opt_startmod, opt_endmod global opt_tdebasedir, opt_kdelibdir, opt_kdeincdir, opt_libdir - global pykde_modules, opt_dep_warnings, opt_dist_name - global pykde_imports, kde_includes + global pytde_modules, opt_dep_warnings, opt_dist_name + global pytde_imports, kde_includes # Look for '-z' first and process that switch # (command line switches override file switches) @@ -851,7 +851,7 @@ def main(argv): opt_concat = 1 elif opt == "-d": - opt_pykdemoddir = arg + opt_pytdemoddir = arg elif opt == "-g": opt_releasegil = 1 @@ -885,7 +885,7 @@ def main(argv): elif opt == "-u": opt_debug = 1 elif opt == "-v": - opt_pykdesipdir = arg + opt_pytdesipdir = arg elif opt == "-w": opt_dep_warnings = 1 @@ -894,42 +894,42 @@ def main(argv): # Set the SIP platform, version and feature flags. if kde_version < 0x030200: - pykde_modules.remove ("kmdi") - pykde_modules.remove ("kresources") - pykde_imports ["kabc"].remove ("kresources") + pytde_modules.remove ("kmdi") + pytde_modules.remove ("kresources") + pytde_imports ["kabc"].remove ("kresources") kde_includes ["kabc"].remove ("kresources") if kde_version < 0x030300: - pykde_modules.remove ("kutils") -# pykde_modules.remove ("kspell2") - pykde_imports ["khtml"].remove ("kutils") + pytde_modules.remove ("kutils") +# pytde_modules.remove ("kspell2") + pytde_imports ["khtml"].remove ("kutils") - opt_endmod = len (pykde_modules) + opt_endmod = len (pytde_modules) if opt_startModName != "": - if opt_startModName in pykde_modules: + if opt_startModName in pytde_modules: single = opt_startModName [-1] != ":" if not single: opt_startModName = opt_startModName [:-1] try: - opt_startmod = pykde_modules.index (opt_startModName) + opt_startmod = pytde_modules.index (opt_startModName) if single: opt_endmod = opt_startmod + 1 except: sipconfig.error ("%s is not a PyKDE module" % opt_startModName) - print "PyKDE modules to be built:\n %s\n" % string.join(pykde_modules [opt_startmod:opt_endmod]) + print "PyKDE modules to be built:\n %s\n" % string.join(pytde_modules [opt_startmod:opt_endmod]) set_sip_flags() - for module in pykde_modules [opt_startmod:opt_endmod]: - generate_code (module, pykde_imports [module], extra_lib = module) + for module in pytde_modules [opt_startmod:opt_endmod]: + generate_code (module, pytde_imports [module], extra_lib = module) # Create the additional Makefiles. create_makefiles() # Install the configuration module. - create_config("pykdeconfig.py", srcPath("pykdeconfig.py.in")) + create_config("pytdeconfig.py", srcPath("pytdeconfig.py.in")) def reporting_msg (): @@ -938,7 +938,7 @@ If reporting errors, paste all of the output above into your message and post to the PyKDE mailing list at: mailto: PyKDE@mats.imk.fraunhofer.de - subscribe: http://mats.imk.fraunhofer.de/mailman/listinfo/pykde + subscribe: http://mats.imk.fraunhofer.de/mailman/listinfo/pytde You can redirect the output into a file (> output.txt) if needed """ diff --git a/doc/index.html b/doc/index.html index 113aaee..27f662a 100644 --- a/doc/index.html +++ b/doc/index.html @@ -39,7 +39,7 @@ This document describes a set of Python bindings for the KDE core libraries.. Contact the author at the PyKDE mailing list at PyKDE@mats.imk.fraunhofer.de or subscribe to the list or view the archives at the - PyKDE Mailing List + PyKDE Mailing List web site.

Changes

-Troy Melhase's "pykde_sampler" example application has been added to the examples/ directory. If -you're interested in making a contribution to PyKDE, expanding pykde_sample to support additional +Troy Melhase's "pytde_sampler" example application has been added to the examples/ directory. If +you're interested in making a contribution to PyKDE, expanding pytde_sample to support additional widgets and PyKDE features would be a good place to start.

diff --git a/doc/switches.html b/doc/switches.html index a6631fa..1bc4018 100644 --- a/doc/switches.html +++ b/doc/switches.html @@ -51,7 +51,7 @@ If reporting errors, paste all of the output above into your message and post to the PyKDE mailing list at: mailto: PyKDE@mats.imk.fraunhofer.de - subscribe: http://mats.imk.fraunhofer.de/mailman/listinfo/pykde + subscribe: http://mats.imk.fraunhofer.de/mailman/listinfo/pytde You can redirect the output into a file (> output.txt) if needed diff --git a/doc/trouble.html b/doc/trouble.html index c3f5576..5e8a24e 100644 --- a/doc/trouble.html +++ b/doc/trouble.html @@ -116,14 +116,14 @@ The PyKDE sources are mostly "sip" files which describe the interface to KDE's C to the sip code generator. These files should be error free. If a sip or code generation error occurs, please report it to the PyKDE mailing list at PyKDE@mats.imk.fraunhofer.de Subscribe to the list -here +here

Compile errors
PyKDE should not experience any compile errors. Currently sip 4.0 based compiles will generate a number of warnings - these can be safely ignored. If errors occur, please report them to the PyKDE mailing list at PyKDE@mats.imk.fraunhofer.de . -Subscribe to the list here +Subscribe to the list here

Compile-time errors

@@ -182,7 +182,7 @@ If you can locate the sip file for the class, you can comment out ("//") the mis report it on the PyKDE mailing list at PyKDE@mats.imk.fraunhofer.de . Subscribe to the list

-here +here
Other run-time errors
@@ -193,7 +193,7 @@ because it's running from Python and not C++. If you suspect an error, please do code and review the PyKDE docs to be sure the argument lists and expected return types are what you thought they were. If the problem persists, report it to the PyKDE mailing list at PyKDE@mats.imk.fraunhofer.de . Subscribe to the list -here. When reporting errors to the +here. When reporting errors to the list, it's always helpful if you provide:
  • diff --git a/examples/pykde-sampler/HOWTO.samples b/examples/pykde-sampler/HOWTO.samples index 0ccf630..2b20c52 100644 --- a/examples/pykde-sampler/HOWTO.samples +++ b/examples/pykde-sampler/HOWTO.samples @@ -33,7 +33,7 @@ In side the module, add the following: example: ('tdeui', 'KAboutDialog') If specified, this sequence should contain two items, first item - name of pykde module, second item name of class within the module. + name of pytde module, second item name of class within the module. These two values are used to form the URL to the documentation for the sample. diff --git a/examples/pykde-sampler/about.py b/examples/pykde-sampler/about.py index ae35b99..108194b 100644 --- a/examples/pykde-sampler/about.py +++ b/examples/pykde-sampler/about.py @@ -8,7 +8,7 @@ from os.path import dirname, join from tdecore import KAboutData -appName = 'pykdesampler' +appName = 'pytdesampler' progName = 'PyKDE Sampler' authorName = 'Troy Melhase' authorEmail = bugsEmailAddress = 'troy@gci.net' @@ -16,7 +16,7 @@ version = '0.1' shortDescription = 'The PyKDE Sampler' licenseType = KAboutData.License_GPL_V2 copyrightStatement = '(c) 2006, %s' % (authorName, ) -homePageAddress = 'http://www.riverbankcomputing.co.uk/pykde/' +homePageAddress = 'http://www.riverbankcomputing.co.uk/pytde/' aboutText = ("The application sampler for PyKDE.") contributors = [] # module-level global for keeping the strings around; intentional diff --git a/examples/uimodules/uidialogs.py b/examples/uimodules/uidialogs.py index 1c85fbe..ba03a9a 100644 --- a/examples/uimodules/uidialogs.py +++ b/examples/uimodules/uidialogs.py @@ -130,7 +130,7 @@ def dlgKAboutDialog (parent): dlg.setTitle ("UISampler for PyKDE") dlg.setAuthor ("Jim Bublitz", "jbublitz@nwinternet.com", "http://www.riverbankcomputing.co.uk",\ "\n\nPyKDE -- Python bindings\n\tfor KDE") - dlg.addContributor ("PyKDE list", "pykde@mats.gmd.de", TQString.null, TQString.null) + dlg.addContributor ("PyKDE list", "pytde@mats.gmd.de", TQString.null, TQString.null) dlg.show () diff --git a/importTest.py b/importTest.py index d57571b..1a36338 100644 --- a/importTest.py +++ b/importTest.py @@ -1,20 +1,20 @@ print "\nTesting PyKDE module imports\n" try: - import pykdeconfig + import pytdeconfig except: - print "Can't find pykdeconfig.py - please check installation" + print "Can't find pytdeconfig.py - please check installation" raise -pykdecfg = pykdeconfig.Configuration () +pytdecfg = pytdeconfig.Configuration () #modules = ["dcop", "tdecore", "tdesu", "tdefx", "tdeui", "kio", "kfile", "kparts", "khtml", "kjs", "kspell", "tdeprint"] print "Modules built:" -print " ",pykdecfg.pykde_modules +print " ",pytdecfg.pytde_modules print print "Importing:" print -for mod in pykdecfg.pykde_modules.split(): +for mod in pytdecfg.pytde_modules.split(): print mod if mod != "tdesu": exec ("import " + mod) diff --git a/pykdeconfig.py b/pykdeconfig.py index 5de2e47..fe44ff0 100644 --- a/pykdeconfig.py +++ b/pykdeconfig.py @@ -36,12 +36,12 @@ _pkg_config = { 'kdeincdir': '/opt/trinity/include', 'kdelibdir': '/opt/trinity/lib', 'libdir': 'lib', - 'pykde_kde_sip_flags': '-t ALL -x TQt_STYLE_WINDOWSXP -x TQt_STYLE_INTERLACE -x TQt_STYLE_WINDOWSXP -x TQt_SIP_PRE_4_7_2 -x VendorID -t WS_X11 -t TQt_3_3_6 -t KDE_3_5_3', - 'pykde_mod_dir': '/usr/lib/python2.5/site-packages', - 'pykde_modules': 'dcop tdecore tdefx tdeui kio kresources kabc kutils kfile kparts khtml kspell tdeprint kmdi', - 'pykde_sip_dir': '/usr/share/sip', - 'pykde_version': 0x031000, - 'pykde_version_str': '3.16.0' + 'pytde_kde_sip_flags': '-t ALL -x TQt_STYLE_WINDOWSXP -x TQt_STYLE_INTERLACE -x TQt_STYLE_WINDOWSXP -x TQt_SIP_PRE_4_7_2 -x VendorID -t WS_X11 -t TQt_3_3_6 -t KDE_3_5_3', + 'pytde_mod_dir': '/usr/lib/python2.5/site-packages', + 'pytde_modules': 'dcop tdecore tdefx tdeui kio kresources kabc kutils kfile kparts khtml kspell tdeprint kmdi', + 'pytde_sip_dir': '/usr/share/sip', + 'pytde_version': 0x031000, + 'pytde_version_str': '3.16.0' } _default_macros = None @@ -75,8 +75,8 @@ class DCOPModuleMakefile(pyqtconfig.TQtModuleMakefile): if self.config.sip_version < 0x040000: # Note that we don't use self.extra_lib_dirs because we don't want # it to be added to the rpath. - self.LIBDIR.append(self.config.pykde_mod_dir) - self.LIBDIR.append(self.config.pykde_lib_dir) + self.LIBDIR.append(self.config.pytde_mod_dir) + self.LIBDIR.append(self.config.pytde_lib_dir) self.extra_libs.append(self.module_as_lib("DCOP")) pyqtconfig.TQtModuleMakefile.finalise(self) diff --git a/pykdeconfig.py.in b/pykdeconfig.py.in index 6735179..9a075b1 100644 --- a/pykdeconfig.py.in +++ b/pykdeconfig.py.in @@ -57,8 +57,8 @@ class DCOPModuleMakefile(pyqtconfig.TQtModuleMakefile): if self.config.sip_version < 0x040000: # Note that we don't use self.extra_lib_dirs because we don't want # it to be added to the rpath. - self.LIBDIR.append(self.config.pykde_mod_dir) - self.LIBDIR.append(self.config.pykde_lib_dir) + self.LIBDIR.append(self.config.pytde_mod_dir) + self.LIBDIR.append(self.config.pytde_lib_dir) self.extra_libs.append(self.module_as_lib("DCOP")) pyqtconfig.TQtModuleMakefile.finalise(self)