[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs
From:       Holger Schröder <holger () holgis ! net>
Date:       2005-10-15 17:08:18
Message-ID: 1129396098.154779.24173.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 470927 by schroder:

add KDEINCLUDE env variable, let scons install
headers and programs in dcop/ the same way as
unsermake



 M  +11 -6     bksys/unix/detect_kde4.py  
 M  +5 -4      bksys/win32/detect_kde4.py  
 M  +4 -0      dcop/SConscript  
 M  +1 -0      dcop/client/SConscript  


--- trunk/KDE/kdelibs/bksys/unix/detect_kde4.py #470926:470927
@@ -28,12 +28,13 @@
 	env['KDEDATA']   = env.join( env['PREFIX'], 'share')
 	env['KDEAPPS']   = env.join( env['PREFIX'], 'share/apps')
 	env['KDEKCFG']   = env.join( env['PREFIX'], 'share/config.kcfg')
-	env['KDEICONS']   = env.join( env['PREFIX'], 'share/icons')
+	env['KDEICONS']  = env.join( env['PREFIX'], 'share/icons')
 	env['KDEMIME']   = env.join( env['PREFIX'], 'share/mimelnk')
-	env['KDEDOC']   = env.join( env['PREFIX'], 'share/doc')
+	env['KDEDOC']    = env.join( env['PREFIX'], 'share/doc')
 	env['KDESERV']   = env.join( env['PREFIX'], 'share/services')
-	env['KDELOCALE']   = env.join( env['PREFIX'], 'share/locale')
+	env['KDELOCALE'] = env.join( env['PREFIX'], 'share/locale')
 	env['KDESERVTYPES']   = env.join( env['PREFIX'], 'share/servicetypes')
+	env['KDEINCLUDE']= env.join( env['PREFIX'], 'include')
 	
 	env['KDELIB']    = env.join( env['PREFIX'], 'lib')
 	env['KDECONF']    = env.join( env['PREFIX'], 'share/config')
@@ -43,7 +44,7 @@
 	env['DCOPIDL']        = env.join(os.getcwd(), 'dcop/dcopidlng/dcopidl --srcdir dcop/dcopidlng')
 	env['DCOPIDL2CPP']    = env.join(os.getcwd(), env['_BUILDDIR_'], 'dcop/dcopidl2cpp/dcopidl2cpp')
 
-	env['LIB_KDECORE'] = ['kdecore']
+	env['LIB_KDECORE'] = ['kdecore','DCOP']
 	env['LIB_KIO']     = ['kio', 'kwalletclient', 'kdesu']
 	env['LIB_KDEUI']   = ['kdeui']
 	env['LIB_QTTEST']  = ['qttest']
@@ -59,6 +60,8 @@
 	env['CPPPATH_KIO']     = [ env.join(os.getcwd(), env['_BUILDDIR_'], 'kio'), '#kio' ]
 	env['CPPPATH_KDEUI']   = [ env.join(os.getcwd(), env['_BUILDDIR_'], 'kdeui'), '#kdeui' ]
 	env['CPPPATH_QTTEST']  = [ env.join(os.getcwd(), env['_BUILDDIR_'], 'qttestlib'), '#qttestlib' ]
+	
+	print "end of bootstrapping, KDEBIN: %s" % env['KDEBIN']
 
 def detect(env):
 	"""
@@ -77,10 +80,12 @@
 	libsuffix	= ''
 	if env.has_key('ARGS'): libsuffix=env['ARGS'].get('libsuffix', '')
 	"""
-
+	
+	print "in unix/detect_kde4 detect"
 	if env.has_key('BOOTSTRAP_KDE'):
+		print "doing bootstrap"
 		bootstrap(env)
 		return
-
+	print "not doing bootstrap"
 	# normal detection functions go here
 
--- trunk/KDE/kdelibs/bksys/win32/detect_kde4.py #470926:470927
@@ -29,12 +29,13 @@
 	env['KDEDATA']   = env.join( env['PREFIX'], 'share')
 	env['KDEAPPS']   = env.join( env['PREFIX'], 'share/apps')
 	env['KDEKCFG']   = env.join( env['PREFIX'], 'share/config.kcfg')
-	env['KDEICONS']   = env.join( env['PREFIX'], 'share/icons')
+	env['KDEICONS']  = env.join( env['PREFIX'], 'share/icons')
 	env['KDEMIME']   = env.join( env['PREFIX'], 'share/mimelnk')
-	env['KDEDOC']   = env.join( env['PREFIX'], 'share/doc')
+	env['KDEDOC']    = env.join( env['PREFIX'], 'share/doc')
 	env['KDESERV']   = env.join( env['PREFIX'], 'share/services')
-	env['KDELOCALE']   = env.join( env['PREFIX'], 'share/locale')
-	env['KDESERVTYPES']   = env.join( env['PREFIX'], 'share/servicetypes')
+	env['KDELOCALE'] = env.join( env['PREFIX'], 'share/locale')
+	env['KDESERVTYPES'] = env.join( env['PREFIX'], 'share/servicetypes')
+	env['KDEINCLUDE']= env.join( env['PREFIX'], 'include')
 	
 	env['KDELIB']    = env.join( env['PREFIX'], 'lib')
 	env['KDECONF']    = env.join( env['PREFIX'], 'share/config')
--- trunk/KDE/kdelibs/dcop/SConscript #470926:470927
@@ -57,6 +57,10 @@
 	obj.instdir  = env['KDEBIN']
 	obj.execute()
 
+install_headers = "dcopclient.h dcopobject.h dcopstub.h dcopref.h dcoptypes.h kdatastream.h"
+
+env.bksys_insttype( 'KDEINCLUDE', '', install_headers )
+
 """
 SUBDIRS = KDE-ICE . dcopidlng dcopidl2cpp client tests
 KDE_OPTIONS = qtonly
--- trunk/KDE/kdelibs/dcop/client/SConscript #470926:470927
@@ -27,6 +27,7 @@
 	obj.source    = prog+'.c'
 	obj.uselib    = 'QT QTCORE QT3SUPPORT KDE4'
 	#obj.includes  = env['KDELIBS_INCLUDES']
+	obj.instdir   = env['KDEBIN']
 	obj.execute()
 
 """
[prev in list] [next in list] [prev in thread] [next in thread]