Rename kde-config to tde-config

pull/1/head
Timothy Pearson před 12 roky
rodič 4675c0929b
revize 5855358429

@ -47,12 +47,12 @@ build in parallel : scons -j2
CONFIGURATION NOTES
-------------------
The installation scripts are relying on the kde-config program.
The programs kde-config, qmake, uic and moc must be accesssible
The installation scripts are relying on the tde-config program.
The programs tde-config, qmake, uic and moc must be accesssible
through your PATH.
Qt and kde may not be installed as expected (in QTDIR and TDEDIR)
So until kde-config is able to give that information, you may
So until tde-config is able to give that information, you may
have to give those paths.
Here are some examples :

@ -30,7 +30,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)
@ -42,19 +42,19 @@ def detect_kde(env):
qtlibs = env['ARGS'].get('qtlibs', None)
## 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
@ -68,7 +68,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:
@ -137,7 +137,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"):
@ -161,40 +161,40 @@ def detect_kde(env):
libdir = execprefix+"/lib"
subst_vars = lambda x: x.replace('${exec_prefix}',execprefix).replace('${datadir}',datadir).replace('${libdir}',libdir)
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(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['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(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['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['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['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

@ -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]
try:
env['KDEm1']=int(kde_version[0])
except:
@ -81,7 +81,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:
@ -150,7 +150,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"):
@ -175,42 +175,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

@ -17,9 +17,9 @@
SRCDIR=../test1-kconfigxt # srcdir is the directory containing the source code
TIPSDIR=$SRCDIR # tipsdir is the directory containing the tips
TDEDIR=`kde-config --prefix`
TDEDIR=`tde-config --prefix`
EXTRACTRC=extractrc
KDEPOT=`kde-config --prefix`/include/kde.pot
KDEPOT=`tde-config --prefix`/include/kde.pot
XGETTEXT="xgettext -C -ki18n -ktr2i18n -kI18N_NOOP -ktranslate -kaliasLocale -x $KDEPOT "
## check that kde.pot is available

Načítá se…
Zrušit
Uložit