From 1408265197701d0452fb5040ab73b35f777316c6 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 4 Dec 2011 18:33:04 -0600 Subject: Part 1 of 2 rename pykde to pytde --- PKG-INFO | 4 ++-- README | 2 +- doc/en/index.docbook | 4 ++-- setup.py | 4 ++-- src/kdedistutils.py | 48 ++++++++++++++++++++++++------------------------ 5 files changed, 31 insertions(+), 31 deletions(-) diff --git a/PKG-INFO b/PKG-INFO index 52d05d4..c68e31e 100644 --- a/PKG-INFO +++ b/PKG-INFO @@ -1,8 +1,8 @@ Metadata-Version: 1.0 -Name: pykdeextensions +Name: pytdeextensions Version: 0.4.0 Summary: UNKNOWN -Home-page: http://www.simonzone.com/software/pykdeextensions/ +Home-page: http://www.simonzone.com/software/pytdeextensions/ Author: Simon Edwards Author-email: simon@simonzone.com License: LGPL diff --git a/README b/README index 3e074d2..f48e725 100644 --- a/README +++ b/README @@ -7,7 +7,7 @@ Read the INSTALL file for more information about how to install this. This software is on the web at: -http://www.simonzone.com/software/pykdeextensions/ +http://www.simonzone.com/software/pytdeextensions/ cheers, diff --git a/doc/en/index.docbook b/doc/en/index.docbook index cce3314..22fca8b 100644 --- a/doc/en/index.docbook +++ b/doc/en/index.docbook @@ -138,11 +138,11 @@ with all of the configuration information about your application, much like the setup() from distutils. -kdedistutils.setup(name="pykdeextensions", +kdedistutils.setup(name="pytdeextensions", version="0.1.0", author="Simon Edwards", author_email="simon@simonzone.com", - url="http://www.simonzone.com/software/pykdeextensions/", + url="http://www.simonzone.com/software/pytdeextensions/", min_kde_version = "3.0.0", min_qt_version = "3.0.0", license = "LGPL" ) diff --git a/setup.py b/setup.py index f7d90f2..e51f0fa 100755 --- a/setup.py +++ b/setup.py @@ -26,11 +26,11 @@ sys.path.insert(0,"src") # We need this for the import statement below. import kdedistutils def main(): - kdedistutils.setup(name="pykdeextensions", + kdedistutils.setup(name="pytdeextensions", version="0.4.0", author="Simon Edwards", author_email="simon@simonzone.com", - url="http://www.simonzone.com/software/pykdeextensions/", + url="http://www.simonzone.com/software/pytdeextensions/", min_kde_version = "3.0.0", min_qt_version = "3.0.0", license = "LGPL", diff --git a/src/kdedistutils.py b/src/kdedistutils.py index ff44670..77f6e82 100644 --- a/src/kdedistutils.py +++ b/src/kdedistutils.py @@ -56,7 +56,7 @@ def setup(**arg_dict): 'install_messages' : InstallI18NMessages, 'update_messages' : UpdateI18NMessages, 'checkpyqt' : CheckPyQt, - 'checkpykde' : CheckPyKDE, + 'checkpytde' : CheckPyKDE, 'uninstall' : Uninstall, 'build' : BuildKDE, 'build_kcm' : BuildKControlModule, @@ -177,7 +177,7 @@ class InstallKDE(install): user_options.append( ('install-protocol',None,"directory for kioslave protocol files") ) sub_commands = install.sub_commands[:] - sub_commands.insert(0, ('checkpykde',None) ) + sub_commands.insert(0, ('checkpytde',None) ) sub_commands.insert(0, ('checkpyqt',None) ) sub_commands.append( ('install_executable_links',has_executable_links) ) sub_commands.append( ('install_messages',has_messages) ) @@ -505,7 +505,7 @@ class BuildKControlModule(Command): ('sip-dir=','/usr/lib/pyshared/python2.6','Directory containing the sip library files'), ('clib=',None,'gcc library and path'), ('pyqt-dir=','/usr/lib/pyshared/python2.6','PyQt module directory'), - ('pykde-dir=',None,'PyKDE module directory'), + ('pytde-dir=',None,'PyKDE module directory'), ('data-dir=',None,'installation directory for data (script) files')] def initialize_options(self): @@ -521,7 +521,7 @@ class BuildKControlModule(Command): self.sip_dir = "/usr/lib/pyshared/python2.6" self.clib = None self.pyqt_dir = "/usr/lib/pyshared/python2.6" - self.pykde_dir = None + self.pytde_dir = None self.data_dir = None def finalize_options(self): @@ -619,11 +619,11 @@ class BuildKControlModule(Command): self.announce("Using %s for PyQt modules" % self.pyqt_dir) # 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("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) + if self.pytde_dir is None: + self.pytde_dir = sysconfig.get_python_lib() + if (FindFileInPaths("libtdecorecmodule*",[self.pytde_dir]) is None) and (FindFileInPaths("tdecore*",[self.pytde_dir]) is None): + raise SystemExit, "Failed to find the PyKDE directory: %s" % self.pytde_dir + self.announce("Using %s for PyKDE modules" % self.pytde_dir) # Sip dir if self.sip_dir is None: @@ -805,14 +805,14 @@ class BuildKControlModule(Command): # PyQt libs linklist.append(self.pyqt_dir+"/qt.so") # PyKDE libs - linklist.append(self.pykde_dir+"/tdecore.so") - linklist.append(self.pykde_dir+"/tdeui.so") + linklist.append(self.pytde_dir+"/tdecore.so") + linklist.append(self.pytde_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("-ltdecorecmodule"); linklist.append("-ltdeuicmodule") +# linklist.append("-L"+self.pytde_dir); linklist.append("-ltdecorecmodule"); linklist.append("-ltdeuicmodule") 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") @@ -825,7 +825,7 @@ class BuildKControlModule(Command): linklist.append("-R"); linklist.append(self.qt_lib_dir) linklist.append("-R"); linklist.append(self.sip_dir) linklist.append("-R"); linklist.append(self.pyqt_dir) - linklist.append("-R"); linklist.append(self.pykde_dir) + linklist.append("-R"); linklist.append(self.pytde_dir) linklist.append("-R"); linklist.append(self.kde_lib_dir) cmdlist.extend(linklist) @@ -1433,7 +1433,7 @@ class BuildKioslave(Command): ('sip-dir=','/usr/lib/pyshared/python2.6','Directory containing the sip library files'), ('clib=',None,'gcc library and path'), ('pyqt-dir=','/usr/lib/pyshared/python2.6','PyQt module directory'), - ('pykde-dir=',None,'PyKDE module directory'), + ('pytde-dir=',None,'PyKDE module directory'), ('data-dir=',None,'installation directory for data (script) files')] def initialize_options(self): @@ -1450,7 +1450,7 @@ class BuildKioslave(Command): self.sip_dir = "/usr/lib/pyshared/python2.6" self.clib = None self.pyqt_dir = "/usr/lib/pyshared/python2.6" - self.pykde_dir = None + self.pytde_dir = None self.data_dir = None def finalize_options(self): @@ -1547,11 +1547,11 @@ class BuildKioslave(Command): self.announce("Using %s for PyQt modules" % self.pyqt_dir) # 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("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) + if self.pytde_dir is None: + self.pytde_dir = sysconfig.get_python_lib() + if (FindFileInPaths("libtdecorecmodule*",[self.pytde_dir]) is None) and (FindFileInPaths("tdecore*",[self.pytde_dir]) is None): + raise SystemExit, "Failed to find the PyKDE directory: %s" % self.pytde_dir + self.announce("Using %s for PyKDE modules" % self.pytde_dir) # Sip dir if self.sip_dir is None: @@ -1718,13 +1718,13 @@ class BuildKioslave(Command): # PyQt libs linklist.append(self.pyqt_dir+"/qt.so") # PyKDE libs - linklist.append(self.pykde_dir+"/tdecore.so") + linklist.append(self.pytde_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("-ltdecorecmodule"); linklist.append("-ltdeuicmodule") +# linklist.append("-L"+self.pytde_dir); linklist.append("-ltdecorecmodule"); linklist.append("-ltdeuicmodule") 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") @@ -1737,7 +1737,7 @@ class BuildKioslave(Command): linklist.append("-R"); linklist.append(self.qt_lib_dir) linklist.append("-R"); linklist.append(self.sip_dir) linklist.append("-R"); linklist.append(self.pyqt_dir) - linklist.append("-R"); linklist.append(self.pykde_dir) + linklist.append("-R"); linklist.append(self.pytde_dir) linklist.append("-R"); linklist.append(self.kde_lib_dir) cmdlist.extend(linklist) @@ -2014,7 +2014,7 @@ class CheckPyKDE(Command): except: raise SystemExit, "Error: Couldn't find module '" + k_module + "'. \n" + \ "Couldn't import KDE! Please make sure that PyKDE is installed and working.\n" + \ - "PyKDE is available here: http://www.riverbankcomputing.co.uk/pykde/index.php" + "PyKDE is available here: http://www.riverbankcomputing.co.uk/pytde/index.php" self.announce(" ...PyKDE is working") def get_outputs(self): return [] -- cgit v1.2.1