[Nvda-dev] commit r3416 - in trunk/source/NVDAHelper: . local remote vbufBackends/adobeAcrobat vbufBackends/gecko_ia2 vbufBackends/mshtml vbufBase

[NVDA Subversion]

Author: bzr
Date: Mon Dec  7 00:49:03 2009
New Revision: 3416

Log:
Reformatted many scons files for nvdaHelper, so that it will be much easier to read diffs if they are changed in the future. Specifically: Break up all source, lib and input lists so that each item is on its own line, with a final comma at the end of the list items. Export each target from the main sconstruct file where its defined, rather than using exports keywords on each sconscript call.

Modified:
   trunk/source/NVDAHelper/local/sconscript
   trunk/source/NVDAHelper/remote/sconscript
   trunk/source/NVDAHelper/sconstruct
   trunk/source/NVDAHelper/vbufBackends/adobeAcrobat/sconscript
   trunk/source/NVDAHelper/vbufBackends/gecko_ia2/sconscript
   trunk/source/NVDAHelper/vbufBackends/mshtml/sconscript
   trunk/source/NVDAHelper/vbufBase/sconscript

Modified: trunk/source/NVDAHelper/local/sconscript
==============================================================================
--- trunk/source/NVDAHelper/local/sconscript	(original)
+++ trunk/source/NVDAHelper/local/sconscript	Mon Dec  7 00:49:03 2009
@@ -1,9 +1,22 @@
-Import(['env','vbufRPCStubs','nvdaControllerRPCStubs'])
+Import([
+	'env',
+	'vbufRPCStubs',
+	'nvdaControllerRPCStubs',
+])
 
 localLib=env.SharedLibrary(
 	target="nvdaHelperLocal",
-	source=["nvdaHelperLocal.cpp","beeps.cpp",vbufRPCStubs[1],'rpcSrv.cpp','nvdaController.c',nvdaControllerRPCStubs[2]],
-	LIBS=["rpcrt4"],
+	source=[
+		"nvdaHelperLocal.cpp",
+		"beeps.cpp",
+		vbufRPCStubs[1],
+		'rpcSrv.cpp',
+		'nvdaController.c',
+		nvdaControllerRPCStubs[2],
+	],
+	LIBS=[
+		"rpcrt4",
+	],
 )
 
 Return('localLib')

Modified: trunk/source/NVDAHelper/remote/sconscript
==============================================================================
--- trunk/source/NVDAHelper/remote/sconscript	(original)
+++ trunk/source/NVDAHelper/remote/sconscript	Mon Dec  7 00:49:03 2009
@@ -1,11 +1,35 @@
-Import(['env','ia2RPCStubs','vbufRPCStubs','nvdaControllerRPCStubs'])
+Import([
+	'env',
+	'ia2RPCStubs',
+	'vbufRPCStubs',
+	'nvdaControllerRPCStubs',
+])
 
 ia2utilsObj=env.Object("./ia2utils","#common/ia2utils.cpp")
 
 remoteLib=env.SharedLibrary(
 	target="nvdaHelperRemote",
-	source=["nvdaHelperRemote.cpp","inputLangChange.cpp","typedCharacter.cpp","ia2Support.cpp","ia2LiveRegions.cpp",ia2utilsObj,ia2RPCStubs[2],"rpcSrv.cpp","vbufRemote.cpp",vbufRPCStubs[2],nvdaControllerRPCStubs[1]],
-	LIBS=["user32","ole32","rpcrt4","shlwapi","oleaut32","oleacc"],
+	source=[
+		"nvdaHelperRemote.cpp",
+		"inputLangChange.cpp",
+		"typedCharacter.cpp",
+		"ia2Support.cpp",
+		"ia2LiveRegions.cpp",
+		ia2utilsObj,
+		ia2RPCStubs[2],
+		"rpcSrv.cpp",
+		"vbufRemote.cpp",
+		vbufRPCStubs[2],
+		nvdaControllerRPCStubs[1],
+	],
+	LIBS=[
+		"user32",
+		"ole32",
+		"rpcrt4",
+		"shlwapi",
+		"oleaut32",
+		"oleacc",
+	],
 )
 
 Return('remoteLib')

Modified: trunk/source/NVDAHelper/sconstruct
==============================================================================
--- trunk/source/NVDAHelper/sconstruct	(original)
+++ trunk/source/NVDAHelper/sconstruct	Mon Dec  7 00:49:03 2009
@@ -35,32 +35,40 @@
 neededTargets=[]
 
 acrobatAccessRPCStubs=env.SConscript('acrobatAccess_sconscript')
+Export('acrobatAccessRPCStubs')
 
 ia2RPCStubs=env.SConscript('ia2_sconscript')
+Export('ia2RPCStubs')
 
 vbufRPCStubs=env.SConscript('interfaces/vbuf/sconscript')
+Export('vbufRPCStubs')
+
 nvdaControllerRPCStubs=env.SConscript('interfaces/nvdaController/sconscript')
+Export('nvdaControllerRPCStubs')
 
 if TARGET_ARCH=='x86':
-	localLib=env.SConscript('local/sconscript',exports=['vbufRPCStubs','nvdaControllerRPCStubs'])
+	localLib=env.SConscript('local/sconscript')
+	Export('localLib')
 	neededTargets.append(localLib)
 
-remoteLib=env.SConscript('remote/sconscript',exports=['ia2RPCStubs','vbufRPCStubs','nvdaControllerRPCStubs'])
+remoteLib=env.SConscript('remote/sconscript')
+Export('remoteLib')
 neededTargets.append(remoteLib)
 
 if TARGET_ARCH=='x86_64':
-	remoteLoaderProgram=env.SConscript('remoteLoader/sconscript',exports=['remoteLib'])
+	remoteLoaderProgram=env.SConscript('remoteLoader/sconscript')
 	neededTargets.append(remoteLoaderProgram)
 
-vbufBaseStaticLib=env.SConscript('vbufBase/sconscript',exports=['remoteLib'])
+vbufBaseStaticLib=env.SConscript('vbufBase/sconscript')
+Export('vbufBaseStaticLib')
 
-adobeAcrobatVBufBackend=env.SConscript('vbufBackends/adobeAcrobat/sconscript',exports=['vbufBaseStaticLib','acrobatAccessRPCStubs'])
+adobeAcrobatVBufBackend=env.SConscript('vbufBackends/adobeAcrobat/sconscript')
 neededTargets.append(adobeAcrobatVBufBackend)
 
-geckoVBufBackend=env.SConscript('vbufBackends/gecko_ia2/sconscript',exports=['vbufBaseStaticLib','ia2RPCStubs'])
+geckoVBufBackend=env.SConscript('vbufBackends/gecko_ia2/sconscript')
 neededTargets.append(geckoVBufBackend)
 
-mshtmlVBufBackend=env.SConscript('vbufBackends/mshtml/sconscript',exports=['vbufBaseStaticLib'])
+mshtmlVBufBackend=env.SConscript('vbufBackends/mshtml/sconscript')
 neededTargets.append(mshtmlVBufBackend)
 
 if TARGET_ARCH=='x86_64':

Modified: trunk/source/NVDAHelper/vbufBackends/adobeAcrobat/sconscript
==============================================================================
--- trunk/source/NVDAHelper/vbufBackends/adobeAcrobat/sconscript	(original)
+++ trunk/source/NVDAHelper/vbufBackends/adobeAcrobat/sconscript	Mon Dec  7 00:49:03 2009
@@ -1,9 +1,22 @@
-Import(['env','vbufBaseStaticLib','acrobatAccessRPCStubs'])
+Import([
+	'env',
+	'vbufBaseStaticLib',
+	'acrobatAccessRPCStubs',
+])
 
 adobeAcrobatBackendLib=env.SharedLibrary(
 	target="VBufBackend_adobeAcrobat",
-	source=["adobeAcrobat.cpp",acrobatAccessRPCStubs[2]],
-	LIBS=[vbufBaseStaticLib,"user32","kernel32","oleacc","oleaut32"],
+	source=[
+		"adobeAcrobat.cpp",
+		acrobatAccessRPCStubs[2],
+	],
+	LIBS=[
+		vbufBaseStaticLib,
+		"user32",
+		"kernel32",
+		"oleacc",
+		"oleaut32",
+	],
 )
 
 Return('adobeAcrobatBackendLib')

Modified: trunk/source/NVDAHelper/vbufBackends/gecko_ia2/sconscript
==============================================================================
--- trunk/source/NVDAHelper/vbufBackends/gecko_ia2/sconscript	(original)
+++ trunk/source/NVDAHelper/vbufBackends/gecko_ia2/sconscript	Mon Dec  7 00:49:03 2009
@@ -1,11 +1,25 @@
-Import(['env','vbufBaseStaticLib','ia2RPCStubs'])
+Import([
+	'env',
+	'vbufBaseStaticLib',
+	'ia2RPCStubs',
+])
 
 ia2utilsObj=env.Object("./ia2utils","#common/ia2utils.cpp")
 
 geckoBackendLib=env.SharedLibrary(
 	target="VBufBackend_gecko_ia2",
-	source=["gecko_ia2.cpp",ia2utilsObj,ia2RPCStubs[2]],
-	LIBS=[vbufBaseStaticLib,"user32","kernel32","oleacc","oleaut32"],
+	source=[
+		"gecko_ia2.cpp",
+		ia2utilsObj,
+		ia2RPCStubs[2],
+	],
+	LIBS=[
+		vbufBaseStaticLib,
+		"user32",
+		"kernel32",
+		"oleacc",
+		"oleaut32",
+	],
 )
 
 Return('geckoBackendLib')

Modified: trunk/source/NVDAHelper/vbufBackends/mshtml/sconscript
==============================================================================
--- trunk/source/NVDAHelper/vbufBackends/mshtml/sconscript	(original)
+++ trunk/source/NVDAHelper/vbufBackends/mshtml/sconscript	Mon Dec  7 00:49:03 2009
@@ -1,9 +1,21 @@
-Import(['env','vbufBaseStaticLib'])
+Import([
+	'env',
+	'vbufBaseStaticLib',
+])
 
 mshtmlBackendLib=env.SharedLibrary(
 	target="VBufBackend_mshtml",
-	source=["mshtml.cpp","node.cpp"],
-	LIBS=[vbufBaseStaticLib,"user32","kernel32","oleacc","oleaut32"],
+	source=[
+		"mshtml.cpp",
+		"node.cpp",
+	],
+	LIBS=[
+		vbufBaseStaticLib,
+		"user32",
+		"kernel32",
+		"oleacc",
+		"oleaut32",
+	],
 )
 
 Return('mshtmlBackendLib')

Modified: trunk/source/NVDAHelper/vbufBase/sconscript
==============================================================================
--- trunk/source/NVDAHelper/vbufBase/sconscript	(original)
+++ trunk/source/NVDAHelper/vbufBase/sconscript	Mon Dec  7 00:49:03 2009
@@ -1,10 +1,20 @@
-Import(['env','remoteLib'])
+Import([
+	'env',
+	'remoteLib',
+])
 
 debugObj=env.Object("./debug","#common/debug.cpp")
 
 vbufBaseStaticLib=env.StaticLibrary(
 	target="vbufBase_static",
-	source=["storage.cpp","utils.cpp","lock.cpp","backend.cpp",debugObj,remoteLib[1] if env['release'] else remoteLib[2]],
+	source=[
+		"storage.cpp",
+		"utils.cpp",
+		"lock.cpp",
+		"backend.cpp",
+		debugObj,
+		remoteLib[1] if env['release'] else remoteLib[2],
+	],
 )
 
 Return('vbufBaseStaticLib')