diff options
Diffstat (limited to 'parts/appwizard')
| -rw-r--r-- | parts/appwizard/common/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | parts/appwizard/common/Makefile.am | 2 | ||||
| -rw-r--r-- | parts/appwizard/common/scons/admin/kde.py | 78 | ||||
| -rw-r--r-- | parts/appwizard/common/tde-configure.in.in (renamed from parts/appwizard/common/kde-configure.in.in) | 0 |
4 files changed, 41 insertions, 41 deletions
diff --git a/parts/appwizard/common/CMakeLists.txt b/parts/appwizard/common/CMakeLists.txt index 3e333dd8..85712104 100644 --- a/parts/appwizard/common/CMakeLists.txt +++ b/parts/appwizard/common/CMakeLists.txt @@ -30,7 +30,7 @@ install( FILES ${CMAKE_CURRENT_BINARY_DIR}/gnome2.tar.gz ${CMAKE_CURRENT_BINARY_DIR}/wxwidgets.tar.gz kde-app.lsm kde-Makefile.am kde-Makefile.cvs - kde-configure.in.in kde-index.docbook + tde-configure.in.in kde-index.docbook kde-po-Makefile.am kde-doc-Makefile.am kde-doc-en-Makefile.am hi16-app-app.png hi32-app-app.png kde-app.desktop diff --git a/parts/appwizard/common/Makefile.am b/parts/appwizard/common/Makefile.am index af7ddd01..e0e448ac 100644 --- a/parts/appwizard/common/Makefile.am +++ b/parts/appwizard/common/Makefile.am @@ -34,7 +34,7 @@ scons.tar.gz: appwizarddatadir = ${kde_datadir}/kdevappwizard commondatadir = ${appwizarddatadir}/template-common commondata_DATA = admin.tar.gz gnu.tar.gz incadmin.tar.gz gnome.tar.gz gnome2.tar.gz wxwidgets.tar.gz \ - kde-app.lsm kde-Makefile.am kde-Makefile.cvs kde-configure.in.in \ + kde-app.lsm kde-Makefile.am kde-Makefile.cvs tde-configure.in.in \ kde-index.docbook kde-po-Makefile.am kde-doc-Makefile.am kde-doc-en-Makefile.am \ hi16-app-app.png hi32-app-app.png kde-app.desktop kde-part.desktop \ gnome-app.lsm gnome-Makefile.am gnome-Makefile.cvs \ diff --git a/parts/appwizard/common/scons/admin/kde.py b/parts/appwizard/common/scons/admin/kde.py index 63be3e42..e205c109 100644 --- a/parts/appwizard/common/scons/admin/kde.py +++ b/parts/appwizard/common/scons/admin/kde.py @@ -27,7 +27,7 @@ def exists(env): return True def detect_kde(env): - """ Detect the qt and kde environment using kde-config mostly """ + """ Detect the qt and kde environment using tde-config mostly """ prefix = env['ARGS'].get('prefix', None) execprefix = env['ARGS'].get('execprefix', None) @@ -43,19 +43,19 @@ def detect_kde(env): libdir = libdir+libsuffix ## Detect the kde libraries - print "Checking for kde-config : ", - kde_config = os.popen("which kde-config 2>/dev/null").read().strip() + print "Checking for tde-config : ", + kde_config = os.popen("which tde-config 2>/dev/null").read().strip() if len(kde_config): - print GREEN+"kde-config was found"+NORMAL + print GREEN+"tde-config was found"+NORMAL else: - print RED+"kde-config was NOT found in your PATH"+NORMAL + print RED+"tde-config was NOT found in your PATH"+NORMAL print "Make sure kde is installed properly" print "(missing package tdebase-devel?)" env.Exit(1) - env['TDEDIR'] = os.popen('kde-config -prefix').read().strip() + env['TDEDIR'] = os.popen('tde-config -prefix').read().strip() print "Checking for kde version : ", - kde_version = os.popen("kde-config --version|grep KDE").read().strip().split()[1] + kde_version = os.popen("tde-config --version|grep KDE").read().strip().split()[1] if int(kde_version[0]) != 3 or int(kde_version[2]) < 2: print RED+kde_version print RED+"Your kde version can be too old"+NORMAL @@ -69,7 +69,7 @@ def detect_kde(env): if qtdir: print GREEN+"qt is in "+qtdir+NORMAL else: - libdir = os.popen('kde-config --expandvars --install lib').read().strip() + libdir = os.popen('tde-config --expandvars --install lib').read().strip() libtdeuiSO = libdir+'/'+getSOfromLA(libdir+'/libtdeui.la') m = re.search('(.*)/lib/libqt.*', os.popen('ldd ' + libtdeuiSO + ' | grep libqt').read().strip().split()[2]) if m: @@ -134,7 +134,7 @@ def detect_kde(env): env.Exit(1) print "Checking for the kde includes : ", - kdeprefix = os.popen("kde-config --prefix").read().strip() + kdeprefix = os.popen("tde-config --prefix").read().strip() if not kdeincludes: kdeincludes = kdeprefix+"/include/" if os.path.isfile(kdeincludes + "/klineedit.h"): @@ -159,42 +159,42 @@ def detect_kde(env): subst_vars = lambda x: x.replace('${exec_prefix}', execprefix).replace('${datadir}',datadir).replace('${libdir}', libdir) debian_fix = lambda x: x.replace('/usr/share', '${datadir}') - env['KDEBIN'] = subst_vars(os.popen('kde-config --install exe').read().strip()) - env['KDEAPPS'] = subst_vars(os.popen('kde-config --install apps').read().strip()) - env['KDEDATA'] = subst_vars(os.popen('kde-config --install data').read().strip()) - env['KDEMODULE']= subst_vars(os.popen('kde-config --install module').read().strip()) - env['KDELOCALE']= subst_vars(os.popen('kde-config --install locale').read().strip()) - env['KDEDOC'] = subst_vars( debian_fix(os.popen('kde-config --install html').read().strip()) ) - env['KDEKCFG'] = subst_vars(os.popen('kde-config --install kcfg').read().strip()) - env['KDEXDG'] = subst_vars(os.popen('kde-config --install xdgdata-apps').read().strip()) - env['KDEXDGDIR']= subst_vars(os.popen('kde-config --install xdgdata-dirs').read().strip()) - env['KDEMENU'] = subst_vars(os.popen('kde-config --install apps').read().strip()) - env['KDEMIME'] = subst_vars(os.popen('kde-config --install mime').read().strip()) - env['KDEICONS'] = subst_vars(os.popen('kde-config --install icon').read().strip()) - env['KDESERV'] = subst_vars(os.popen('kde-config --install services').read().strip()) + env['KDEBIN'] = subst_vars(os.popen('tde-config --install exe').read().strip()) + env['KDEAPPS'] = subst_vars(os.popen('tde-config --install apps').read().strip()) + env['KDEDATA'] = subst_vars(os.popen('tde-config --install data').read().strip()) + env['KDEMODULE']= subst_vars(os.popen('tde-config --install module').read().strip()) + env['KDELOCALE']= subst_vars(os.popen('tde-config --install locale').read().strip()) + env['KDEDOC'] = subst_vars( debian_fix(os.popen('tde-config --install html').read().strip()) ) + env['KDEKCFG'] = subst_vars(os.popen('tde-config --install kcfg').read().strip()) + env['KDEXDG'] = subst_vars(os.popen('tde-config --install xdgdata-apps').read().strip()) + env['KDEXDGDIR']= subst_vars(os.popen('tde-config --install xdgdata-dirs').read().strip()) + env['KDEMENU'] = subst_vars(os.popen('tde-config --install apps').read().strip()) + env['KDEMIME'] = subst_vars(os.popen('tde-config --install mime').read().strip()) + env['KDEICONS'] = subst_vars(os.popen('tde-config --install icon').read().strip()) + env['KDESERV'] = subst_vars(os.popen('tde-config --install services').read().strip()) else: # the user has given no prefix, install as a normal kde app - env['PREFIX'] = os.popen('kde-config --prefix').read().strip() - env['KDEBIN'] = os.popen('kde-config --expandvars --install exe').read().strip() - env['KDEAPPS'] = os.popen('kde-config --expandvars --install apps').read().strip() - env['KDEDATA'] = os.popen('kde-config --expandvars --install data').read().strip() - env['KDEMODULE']= os.popen('kde-config --expandvars --install module').read().strip() - env['KDELOCALE']= os.popen('kde-config --expandvars --install locale').read().strip() - env['KDEDOC'] = os.popen('kde-config --expandvars --install html').read().strip() - env['KDEKCFG'] = os.popen('kde-config --expandvars --install kcfg').read().strip() - env['KDEXDG'] = os.popen('kde-config --expandvars --install xdgdata-apps').read().strip() - env['KDEXDGDIR']= os.popen('kde-config --expandvars --install xdgdata-dirs').read().strip() - env['KDEMENU'] = os.popen('kde-config --expandvars --install apps').read().strip() - env['KDEMIME'] = os.popen('kde-config --expandvars --install mime').read().strip() - env['KDEICONS'] = os.popen('kde-config --expandvars --install icon').read().strip() - env['KDESERV'] = os.popen('kde-config --expandvars --install services').read().strip() - - env['QTPLUGINS']=os.popen('kde-config --expandvars --install qtplugins').read().strip() + env['PREFIX'] = os.popen('tde-config --prefix').read().strip() + env['KDEBIN'] = os.popen('tde-config --expandvars --install exe').read().strip() + env['KDEAPPS'] = os.popen('tde-config --expandvars --install apps').read().strip() + env['KDEDATA'] = os.popen('tde-config --expandvars --install data').read().strip() + env['KDEMODULE']= os.popen('tde-config --expandvars --install module').read().strip() + env['KDELOCALE']= os.popen('tde-config --expandvars --install locale').read().strip() + env['KDEDOC'] = os.popen('tde-config --expandvars --install html').read().strip() + env['KDEKCFG'] = os.popen('tde-config --expandvars --install kcfg').read().strip() + env['KDEXDG'] = os.popen('tde-config --expandvars --install xdgdata-apps').read().strip() + env['KDEXDGDIR']= os.popen('tde-config --expandvars --install xdgdata-dirs').read().strip() + env['KDEMENU'] = os.popen('tde-config --expandvars --install apps').read().strip() + env['KDEMIME'] = os.popen('tde-config --expandvars --install mime').read().strip() + env['KDEICONS'] = os.popen('tde-config --expandvars --install icon').read().strip() + env['KDESERV'] = os.popen('tde-config --expandvars --install services').read().strip() + + env['QTPLUGINS']=os.popen('tde-config --expandvars --install qtplugins').read().strip() ## kde libs and includes env['KDEINCLUDEPATH']=kdeincludes if not tdelibs: - tdelibs=os.popen('kde-config --expandvars --install lib').read().strip() + tdelibs=os.popen('tde-config --expandvars --install lib').read().strip() env['KDELIBPATH']=tdelibs ## qt libs and includes diff --git a/parts/appwizard/common/kde-configure.in.in b/parts/appwizard/common/tde-configure.in.in index f1244521..f1244521 100644 --- a/parts/appwizard/common/kde-configure.in.in +++ b/parts/appwizard/common/tde-configure.in.in |