From kde-commits  Wed Sep 28 23:34:02 2005
From: Thomas Nagy <tnagyemail-mail () yahoo ! fr>
Date: Wed, 28 Sep 2005 23:34:02 +0000
To: kde-commits
Subject: KDE/kdelibs
Message-Id: <1127950442.027688.18398.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=112795045117543

SVN commit 465035 by tnagy:

Minor fixes so that kdelibs compiles here:
dcop libltdl kdefx mimetypes kdecore kdeui
kdesu kwallet kjs kio qttestlib kded

The dcop and stub builders have been changed,
is the flag --no-signals mandatory ?



 M  +8 -4      SConstruct  
 M  +16 -3     bksys/kde4.py  
 M  +1 -1      bksys/qt4.py  
 M  +3 -3      kio/kio/SConscript  


--- trunk/KDE/kdelibs/SConstruct #465034:465035
@@ -51,15 +51,19 @@
 # and the config.h
 env=configure(config)
 
-# now the kdemacros (TODO a bootstrap module ?)
+# now the kdemacros (TODO put this into a bootstrap section somehow ?)
+dest = open(env.join('build','kdemacros.h'), 'w')
+dest.write('#include <kdemacros.h.in>\n')
+dest.close()
+
 import os
 try:
-   os.mkdir('build')
+   os.mkdir('build'+os.sep+'kjs')
 except OSError:
    pass
 
-dest = open(env.join('build','kdemacros.h'), 'w')
-dest.write('#include <kdemacros.h.in>\n')
+dest = open(env.join('build','kjs','global.h'), 'w')
+dest.write('#include "global.h.in"\n')
 dest.close()
 
 ###################################################################
--- trunk/KDE/kdelibs/bksys/kde4.py #465034:465035
@@ -87,12 +87,25 @@
 	if not env['_USECOLORS_']: creation_string=""
 	kidl_action=env.Action(kidl_str, creation_string)
 	env['BUILDERS']['Kidl']=Builder(action=kidl_action, suffix='.kidl', src_suffix='.h')
+
+	## TODO --no-signals (ita)
+
 	## DCOP
-	dcop_str='$DCOPIDL2CPP --c++-suffix cpp --no-signals --no-stub $SOURCE'
+	dcop_str='$DCOPIDL2CPP --c++-suffix cpp --no-stub $SOURCE'
 	dcop_action=env.Action(dcop_str, creation_string)
-	env['BUILDERS']['Dcop']=Builder(action=dcop_action, suffix='_skel.cpp', src_suffix='.kidl')
+
+        def dcopEmitter(target, source, env):
+		import os
+                adjustixes = SCons.Util.adjustixes
+                bs = SCons.Util.splitext(str(source[0].name))[0]
+                bs = os.path.join(str(target[0].get_dir()),bs)
+                target.append(bs+'_skel.h')
+                return target, source
+
+	env['BUILDERS']['Dcop']=Builder(action=dcop_action, suffix='_skel.cpp', src_suffix='.kidl', emitter=dcopEmitter)
+
 	## STUB
-	stub_str='$DCOPIDL2CPP --c++-suffix cpp --no-signals --no-skel $SOURCE'
+	stub_str='$DCOPIDL2CPP --c++-suffix cpp --no-skel $SOURCE'
 	stub_action=env.Action(stub_str, creation_string)
 
         def stubEmitter(target, source, env):
--- trunk/KDE/kdelibs/bksys/qt4.py #465034:465035
@@ -171,7 +171,7 @@
 
 	## MOC processing
 	moc_comp   = '$QT_MOC $_CPPINCFLAGS -o $TARGET $SOURCE'
-	moc_string = "%screating%s $TARGET.name" % (env['BKS_COLORS']['BLUE'], env['BKS_COLORS']['NORMAL'])
+	moc_string = "%screating%s $TARGET" % (env['BKS_COLORS']['BLUE'], env['BKS_COLORS']['NORMAL'])
 	if not env['_USECOLORS_']: moc_string=""
 	moc_action = env.Action(moc_comp, moc_string)
 
--- trunk/KDE/kdelibs/kio/kio/SConscript #465034:465035
@@ -16,14 +16,14 @@
 forwardingslavebase.cpp
 progressbase.cpp defaultprogress.cpp
 statusbarprogress.cpp
-kdirnotify.cpp kdirnotify.skel kdirnotify.stub
+kdirnotify.cpp kdirnotify.skel kdirnotify_stub.cpp
 ../misc/uiserver.stub observer.cpp observer.skel observer.stub
 kemailsettings.cpp
 kprotocolinfo.cpp
 renamedlg.cpp skipdlg.cpp kremoteencoding.cpp
 kmimetypechooser.cpp
 """
-# why kdirnotify_stub.cpp ?
+# do not use kdirnotify.stub
 
 ksycoca_sources = """
 kdirwatch.cpp
@@ -55,7 +55,7 @@
 coreobj.target   = 'libkiocore'
 coreobj.source   = kiocore_sources
 coreobj.uselib   = 'QTCORE QTGUI QT QT3SUPPORT KDE4 FAM'
-coreobj.includes = '../../kdecore/network ../kssl ../../interfaces ../misc'
+coreobj.includes = '../../kdecore/network ../kssl ../../interfaces #interfaces ../misc'
 coreobj.execute()
 
 sycocaobj = env.kdeobj('convenience',env)