diff options
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/detect_uds_hidden.diff | 6 | ||||
| -rw-r--r-- | admin/generic.py | 8 | ||||
| -rw-r--r-- | admin/kde.py | 8 |
3 files changed, 11 insertions, 11 deletions
diff --git a/admin/detect_uds_hidden.diff b/admin/detect_uds_hidden.diff index 98805c9..d92ccaf 100644 --- a/admin/detect_uds_hidden.diff +++ b/admin/detect_uds_hidden.diff @@ -1,7 +1,7 @@ -Only in kio-locate/admin/: .arch-ids -diff -ur bksys-1.5.1.pre4/admin/kde.py kio-locate/admin/kde.py +Only in tdeio-locate/admin/: .arch-ids +diff -ur bksys-1.5.1.pre4/admin/kde.py tdeio-locate/admin/kde.py --- bksys-1.5.1.pre4/admin/kde.py 2005-08-16 23:16:32.000000000 +0200 -+++ kio-locate/admin/kde.py 2005-08-17 12:27:49.000000000 +0200 ++++ tdeio-locate/admin/kde.py 2005-08-17 12:27:49.000000000 +0200 @@ -242,6 +242,15 @@ qtlibs=qtdir+"/lib"+libsuffix env['QTLIBPATH']=qtlibs diff --git a/admin/generic.py b/admin/generic.py index 0837fb9..b86d0b7 100644 --- a/admin/generic.py +++ b/admin/generic.py @@ -86,7 +86,7 @@ def pprint(env, col, str, label=''): class genobj: def __init__(self, val, env): - if not val in "program shlib kioslave staticlib".split(): + if not val in "program shlib tdeioslave staticlib".split(): print "unknown genobj given: "+val env.Exit(1) @@ -224,7 +224,7 @@ class genobj: self.env.pprint('RED',"no target given to object - self.target") self.env.Exit(1) if not self.env.has_key('nosmart_includes'): self.env.AppendUnique(CPPPATH=['./']) - if self.type == "kioslave": self.libprefix='' + if self.type == "tdeioslave": self.libprefix='' if len(self.includes)>0: self.env.AppendUnique(CPPPATH=self.fixpath(self.includes)) if len(self.cxxflags)>0: self.env.AppendUnique(CXXFLAGS=self.env.make_list(self.cxxflags)) @@ -250,7 +250,7 @@ class genobj: # the target to return - no more self.env modification is allowed after this part ret=None - if self.type=='shlib' or self.type=='kioslave': + if self.type=='shlib' or self.type=='tdeioslave': ret=self.env.bksys_shlib(self.p_localtarget, self.p_localsource, self.instdir, self.libprefix, self.vnum) elif self.type=='program': @@ -613,7 +613,7 @@ def generate(env): for dir in ldirs: lenv.BuildDir(buildto+os.path.sep+dir, dir) - #valid_targets = "program shlib kioslave staticlib".split() + #valid_targets = "program shlib tdeioslave staticlib".split() SConsEnvironment.bksys_install = bksys_install SConsEnvironment.bksys_shlib = bksys_shlib SConsEnvironment.subdirs = subdirs diff --git a/admin/kde.py b/admin/kde.py index d545474..3b7c179 100644 --- a/admin/kde.py +++ b/admin/kde.py @@ -373,7 +373,7 @@ def generate(env): env['BUILDERS']['Uic']=Builder(action=uic_processing,emitter=uicEmitter,suffix='.h',src_suffix='.ui') def kcfg_buildit(target, source, env): - comp='kconfig_compiler -d%s %s %s' % (str(source[0].get_dir()), source[1].path, source[0].path) + comp='tdeconfig_compiler -d%s %s %s' % (str(source[0].get_dir()), source[1].path, source[0].path) return env.Execute(comp) def kcfg_stringit(target, source, env): print "processing %s to get %s and %s" % (source[0].name, target[0].name, target[1].name) @@ -522,7 +522,7 @@ def generate(env): for ofile in other_files: if ofile == file: env.pprint('RED',"WARNING: You have included %s.kcfg and another file of the same prefix"%file) - print "Files generated by kconfig_compiler (settings.h, settings.cpp) must not be included" + print "Files generated by tdeconfig_compiler (settings.h, settings.cpp) must not be included" return src @@ -785,7 +785,7 @@ def generate(env): comp='mkdir -p %s && cd %s && rm -f common && ln -s ../common common' % (dir, dir) lenv.Execute(comp) - #valid_targets = "program shlib kioslave staticlib".split() + #valid_targets = "program shlib tdeioslave staticlib".split() import generic class kobject(generic.genobj): def __init__(self, val, senv=None): @@ -801,7 +801,7 @@ def generate(env): self.unlockchdir() self.executed=1 return - if (self.type=='shlib' or self.type=='kioslave'): + if (self.type=='shlib' or self.type=='tdeioslave'): install_dir = 'KDEMODULE' if self.iskdelib==1: install_dir = 'KDELIB' self.instdir=getInstDirForResType(self.orenv, install_dir) |