OSDN Git Service

Integrate the building of nvdaHelper into NVDA's scons files:
authorMichael Curran <mick@kulgan.net>
Fri, 12 Nov 2010 05:29:57 +0000 (15:29 +1000)
committerMichael Curran <mick@kulgan.net>
Fri, 12 Nov 2010 05:29:57 +0000 (15:29 +1000)
commitbf995b7d2376294e4f0ac6a92d8a0d870b22f26c
treef1fafea83e7c39093f130e43eaf83656d0ecdf66
parent60cf4d5d4c92d7617234369fd8074a06a00201ed
Integrate the building of nvdaHelper into NVDA's scons files:
*NVDA's new root sconstruct: declare and export clientDir, sourceLibDir and sourceLibDir64 variables, which can be used by nvdaHelper and client etc.
* Move source/include to include (at NVDA's root). also change all mentions of the path '#../include' to '#/include' in nvdaHelper's sconscript files.
* Move contents of nvdaHelper's site_scons to NVDA's root site_scons
*Move the nvdaHelper dir out of source and in to the root of NVDA.
* Rename nvdaHelper's sconstruct file to sconscript
* nvdaHelper's archBuild_sconscript: Remove the 'install' target, and at the same time no longer collect built targets to make them be required by the install target.
* NVDAHelper's sconscript (previously sconstruct):  no longer create a base environment from which to clone the arch-specific environments, instead Import  the environment called 'env' and clone from that.
*nvdaHelper's sconscript: import clientDir, sourceLibDir and sourceLibDir64, and pass arch-specific variants of these to archBuild_sconscript.
*nvdaHelper's archBuild_ssconscript: do not hardcode libInstallDir and clientInstallDir, instead import them (given by nvdaHelper's sconscript).
* Remove pointless print statements from NVDAHelper scons files
* Move the commandline variable declarations (such as targetArchitectures and logLevel) from nvdaHelper's archBuild_sconscript and in to NVDA's new root sconstruct.
* rename the 'isRelease' commandline variable in NVDA's new root sconstruct to 'release' to be compatible with nvdaHelper -- it uses it in quite a few places.
*NVDAHelper's remote, client and local sconscript files: change all mentions of the path '#interfaces' to '../interfaces' (we can no longer really use # as its now at NVDA's root.
*nvdaHelper's remote/apiHooks.cpp: explicitly include nvdaControllerInternal.h above common/log.h as for some reason now scons is failing to scan more than one level deep for implicit dependencies -- all other files including log.h already did this.
*NVDA's new root sconstruct: no longer build an nvdaHelper archive (its no longer needed)
*NVDA's new root sconstruct: there is now a target called 'client' which will build the nvda controller client archive.

Further notes:
*As dist (portable, installer etc) depends on source, any nvdaHelper related libs / EXEs that should be in source will automatically get built when needed.
*controller client will no longer get built just because the rest of nvdaHelper is built, unless you specifically tell scons to build the 'client' target.
98 files changed:
nvdaHelper/Doxyfile [moved from source/NVDAHelper/Doxyfile with 100% similarity]
nvdaHelper/acrobatAccess_sconscript [moved from source/NVDAHelper/acrobatAccess_sconscript with 86% similarity]
nvdaHelper/archBuild_sconscript [moved from source/NVDAHelper/archBuild_sconscript with 71% similarity]
nvdaHelper/building.txt [moved from source/NVDAHelper/building.txt with 100% similarity]
nvdaHelper/client/client.cpp [moved from source/NVDAHelper/client/client.cpp with 100% similarity]
nvdaHelper/client/nvdaControllerClient.def [moved from source/NVDAHelper/client/nvdaControllerClient.def with 100% similarity]
nvdaHelper/client/sconscript [moved from source/NVDAHelper/client/sconscript with 84% similarity]
nvdaHelper/common/debug.cpp [moved from source/NVDAHelper/common/debug.cpp with 100% similarity]
nvdaHelper/common/debug.h [moved from source/NVDAHelper/common/debug.h with 100% similarity]
nvdaHelper/common/ia2utils.cpp [moved from source/NVDAHelper/common/ia2utils.cpp with 100% similarity]
nvdaHelper/common/ia2utils.h [moved from source/NVDAHelper/common/ia2utils.h with 100% similarity]
nvdaHelper/common/lock.h [moved from source/NVDAHelper/common/lock.h with 100% similarity]
nvdaHelper/common/log.h [moved from source/NVDAHelper/common/log.h with 100% similarity]
nvdaHelper/common/winIPCUtils.cpp [moved from source/NVDAHelper/common/winIPCUtils.cpp with 100% similarity]
nvdaHelper/common/winIPCUtils.h [moved from source/NVDAHelper/common/winIPCUtils.h with 100% similarity]
nvdaHelper/contributors.txt [moved from source/NVDAHelper/contributors.txt with 100% similarity]
nvdaHelper/ia2_sconscript [moved from source/NVDAHelper/ia2_sconscript with 89% similarity]
nvdaHelper/interfaces/displayModel/displayModel.acf [moved from source/NVDAHelper/interfaces/displayModel/displayModel.acf with 100% similarity]
nvdaHelper/interfaces/displayModel/displayModel.idl [moved from source/NVDAHelper/interfaces/displayModel/displayModel.idl with 100% similarity]
nvdaHelper/interfaces/nvdaController/nvdaController.acf [moved from source/NVDAHelper/interfaces/nvdaController/nvdaController.acf with 100% similarity]
nvdaHelper/interfaces/nvdaController/nvdaController.idl [moved from source/NVDAHelper/interfaces/nvdaController/nvdaController.idl with 100% similarity]
nvdaHelper/interfaces/nvdaControllerInternal/nvdaControllerInternal.acf [moved from source/NVDAHelper/interfaces/nvdaControllerInternal/nvdaControllerInternal.acf with 100% similarity]
nvdaHelper/interfaces/nvdaControllerInternal/nvdaControllerInternal.idl [moved from source/NVDAHelper/interfaces/nvdaControllerInternal/nvdaControllerInternal.idl with 100% similarity]
nvdaHelper/interfaces/vbuf/vbuf.acf [moved from source/NVDAHelper/interfaces/vbuf/vbuf.acf with 100% similarity]
nvdaHelper/interfaces/vbuf/vbuf.idl [moved from source/NVDAHelper/interfaces/vbuf/vbuf.idl with 100% similarity]
nvdaHelper/local/beeps.cpp [moved from source/NVDAHelper/local/beeps.cpp with 100% similarity]
nvdaHelper/local/beeps.h [moved from source/NVDAHelper/local/beeps.h with 100% similarity]
nvdaHelper/local/nvdaController.c [moved from source/NVDAHelper/local/nvdaController.c with 100% similarity]
nvdaHelper/local/nvdaControllerInternal.c [moved from source/NVDAHelper/local/nvdaControllerInternal.c with 100% similarity]
nvdaHelper/local/nvdaHelperLocal.cpp [moved from source/NVDAHelper/local/nvdaHelperLocal.cpp with 100% similarity]
nvdaHelper/local/nvdaHelperLocal.h [moved from source/NVDAHelper/local/nvdaHelperLocal.h with 100% similarity]
nvdaHelper/local/rpcSrv.cpp [moved from source/NVDAHelper/local/rpcSrv.cpp with 100% similarity]
nvdaHelper/local/rpcSrv.h [moved from source/NVDAHelper/local/rpcSrv.h with 100% similarity]
nvdaHelper/local/sconscript [moved from source/NVDAHelper/local/sconscript with 76% similarity]
nvdaHelper/minHook.def [moved from source/NVDAHelper/minHook.def with 100% similarity]
nvdaHelper/minHook_sconscript [moved from source/NVDAHelper/minHook_sconscript with 69% similarity]
nvdaHelper/remote/IA2Support.cpp [moved from source/NVDAHelper/remote/IA2Support.cpp with 100% similarity]
nvdaHelper/remote/IA2Support.h [moved from source/NVDAHelper/remote/IA2Support.h with 100% similarity]
nvdaHelper/remote/apiHook.cpp [moved from source/NVDAHelper/remote/apiHook.cpp with 95% similarity]
nvdaHelper/remote/apiHook.h [moved from source/NVDAHelper/remote/apiHook.h with 100% similarity]
nvdaHelper/remote/displayModel.cpp [moved from source/NVDAHelper/remote/displayModel.cpp with 100% similarity]
nvdaHelper/remote/displayModel.h [moved from source/NVDAHelper/remote/displayModel.h with 100% similarity]
nvdaHelper/remote/displayModelRemote.cpp [moved from source/NVDAHelper/remote/displayModelRemote.cpp with 100% similarity]
nvdaHelper/remote/dllmain.h [moved from source/NVDAHelper/remote/dllmain.h with 100% similarity]
nvdaHelper/remote/gdiHooks.cpp [moved from source/NVDAHelper/remote/gdiHooks.cpp with 100% similarity]
nvdaHelper/remote/gdiHooks.h [moved from source/NVDAHelper/remote/gdiHooks.h with 100% similarity]
nvdaHelper/remote/ia2LiveRegions.cpp [moved from source/NVDAHelper/remote/ia2LiveRegions.cpp with 100% similarity]
nvdaHelper/remote/ia2LiveRegions.h [moved from source/NVDAHelper/remote/ia2LiveRegions.h with 100% similarity]
nvdaHelper/remote/inProcess.cpp [moved from source/NVDAHelper/remote/inProcess.cpp with 100% similarity]
nvdaHelper/remote/inProcess.h [moved from source/NVDAHelper/remote/inProcess.h with 100% similarity]
nvdaHelper/remote/injection.cpp [moved from source/NVDAHelper/remote/injection.cpp with 100% similarity]
nvdaHelper/remote/inputLangChange.cpp [moved from source/NVDAHelper/remote/inputLangChange.cpp with 100% similarity]
nvdaHelper/remote/inputLangChange.h [moved from source/NVDAHelper/remote/inputLangChange.h with 100% similarity]
nvdaHelper/remote/nvdaHelperRemote.def [moved from source/NVDAHelper/remote/nvdaHelperRemote.def with 100% similarity]
nvdaHelper/remote/nvdaHelperRemote.h [moved from source/NVDAHelper/remote/nvdaHelperRemote.h with 100% similarity]
nvdaHelper/remote/rpcSrv.cpp [moved from source/NVDAHelper/remote/rpcSrv.cpp with 100% similarity]
nvdaHelper/remote/rpcSrv.h [moved from source/NVDAHelper/remote/rpcSrv.h with 100% similarity]
nvdaHelper/remote/sconscript [moved from source/NVDAHelper/remote/sconscript with 76% similarity]
nvdaHelper/remote/typedCharacter.cpp [moved from source/NVDAHelper/remote/typedCharacter.cpp with 100% similarity]
nvdaHelper/remote/typedCharacter.h [moved from source/NVDAHelper/remote/typedCharacter.h with 100% similarity]
nvdaHelper/remote/vbufRemote.cpp [moved from source/NVDAHelper/remote/vbufRemote.cpp with 100% similarity]
nvdaHelper/remoteLoader/loader.cpp [moved from source/NVDAHelper/remoteLoader/loader.cpp with 100% similarity]
nvdaHelper/remoteLoader/sconscript [moved from source/NVDAHelper/remoteLoader/sconscript with 100% similarity]
nvdaHelper/sconstruct [moved from source/NVDAHelper/sconstruct with 100% similarity]
nvdaHelper/vbufBackends/adobeAcrobat/adobeAcrobat.cpp [moved from source/NVDAHelper/vbufBackends/adobeAcrobat/adobeAcrobat.cpp with 100% similarity]
nvdaHelper/vbufBackends/adobeAcrobat/adobeAcrobat.h [moved from source/NVDAHelper/vbufBackends/adobeAcrobat/adobeAcrobat.h with 100% similarity]
nvdaHelper/vbufBackends/adobeAcrobat/sconscript [moved from source/NVDAHelper/vbufBackends/adobeAcrobat/sconscript with 100% similarity]
nvdaHelper/vbufBackends/adobeFlash/adobeFlash.cpp [moved from source/NVDAHelper/vbufBackends/adobeFlash/adobeFlash.cpp with 100% similarity]
nvdaHelper/vbufBackends/adobeFlash/adobeFlash.h [moved from source/NVDAHelper/vbufBackends/adobeFlash/adobeFlash.h with 100% similarity]
nvdaHelper/vbufBackends/adobeFlash/sconscript [moved from source/NVDAHelper/vbufBackends/adobeFlash/sconscript with 100% similarity]
nvdaHelper/vbufBackends/gecko_ia2/gecko_ia2.cpp [moved from source/NVDAHelper/vbufBackends/gecko_ia2/gecko_ia2.cpp with 100% similarity]
nvdaHelper/vbufBackends/gecko_ia2/gecko_ia2.h [moved from source/NVDAHelper/vbufBackends/gecko_ia2/gecko_ia2.h with 100% similarity]
nvdaHelper/vbufBackends/gecko_ia2/sconscript [moved from source/NVDAHelper/vbufBackends/gecko_ia2/sconscript with 89% similarity]
nvdaHelper/vbufBackends/mshtml/mshtml.cpp [moved from source/NVDAHelper/vbufBackends/mshtml/mshtml.cpp with 100% similarity]
nvdaHelper/vbufBackends/mshtml/mshtml.h [moved from source/NVDAHelper/vbufBackends/mshtml/mshtml.h with 100% similarity]
nvdaHelper/vbufBackends/mshtml/node.cpp [moved from source/NVDAHelper/vbufBackends/mshtml/node.cpp with 100% similarity]
nvdaHelper/vbufBackends/mshtml/node.h [moved from source/NVDAHelper/vbufBackends/mshtml/node.h with 100% similarity]
nvdaHelper/vbufBackends/mshtml/sconscript [moved from source/NVDAHelper/vbufBackends/mshtml/sconscript with 100% similarity]
nvdaHelper/vbufBase/backend.cpp [moved from source/NVDAHelper/vbufBase/backend.cpp with 100% similarity]
nvdaHelper/vbufBase/backend.h [moved from source/NVDAHelper/vbufBase/backend.h with 100% similarity]
nvdaHelper/vbufBase/lock.cpp [moved from source/NVDAHelper/vbufBase/lock.cpp with 100% similarity]
nvdaHelper/vbufBase/lock.h [moved from source/NVDAHelper/vbufBase/lock.h with 100% similarity]
nvdaHelper/vbufBase/sconscript [moved from source/NVDAHelper/vbufBase/sconscript with 78% similarity]
nvdaHelper/vbufBase/storage.cpp [moved from source/NVDAHelper/vbufBase/storage.cpp with 100% similarity]
nvdaHelper/vbufBase/storage.h [moved from source/NVDAHelper/vbufBase/storage.h with 100% similarity]
nvdaHelper/vbufBase/utils.cpp [moved from source/NVDAHelper/vbufBase/utils.cpp with 100% similarity]
nvdaHelper/vbufBase/utils.h [moved from source/NVDAHelper/vbufBase/utils.h with 100% similarity]
nvdaHelper/vbufTests/Makefile [moved from source/NVDAHelper/vbufTests/Makefile with 100% similarity]
nvdaHelper/vbufTests/storage/Makefile [moved from source/NVDAHelper/vbufTests/storage/Makefile with 100% similarity]
nvdaHelper/vbufTests/storage/createDestroy.cpp [moved from source/NVDAHelper/vbufTests/storage/createDestroy.cpp with 100% similarity]
nvdaHelper/vbufTests/test_printExampleBackendXML/Makefile [moved from source/NVDAHelper/vbufTests/test_printExampleBackendXML/Makefile with 100% similarity]
nvdaHelper/vbufTests/test_printExampleBackendXML/test_printExampleBackendXML.cpp [moved from source/NVDAHelper/vbufTests/test_printExampleBackendXML/test_printExampleBackendXML.cpp with 100% similarity]
nvdaHelper/vbufTests/test_utils/Makefile [moved from source/NVDAHelper/vbufTests/test_utils/Makefile with 100% similarity]
nvdaHelper/vbufTests/test_utils/test_utils.cpp [moved from source/NVDAHelper/vbufTests/test_utils/test_utils.cpp with 100% similarity]
sconstruct
site_scons/site_tools/boost.py [moved from source/NVDAHelper/site_scons/site_tools/boost.py with 100% similarity]
site_scons/site_tools/msrpc.py [moved from source/NVDAHelper/site_scons/site_tools/msrpc.py with 100% similarity]
site_scons/site_tools/windowsSdk.py [moved from source/NVDAHelper/site_scons/site_tools/windowsSdk.py with 100% similarity]