[Lldb-commits] [PATCH] Prevent xcode build from polluting the source directory with swig generated files. Contributed by Kuba Ober.

[Greg Clayton]

This works fine for Xcode. If we can get confirmation from folks that use CMake and make, then I will check this in.

On Mar 14, 2014, at 9:36 AM, Kuba Ober <kuba at mareimbrium.org> wrote:

> This is generally a good idea. Specifically, it is necessary to keep the source directory pristine so that cmake-based builds won't fail due to ignored source files - cmake scripts check for missed sources.
> 
> Please commit after trying it out.
> 
> Cheers, Kuba Ober
> ---
> .gitignore                          | 1 -
> lldb.xcodeproj/project.pbxproj      | 4 ++--
> scripts/Python/build-swig-Python.sh | 7 +------
> 3 files changed, 3 insertions(+), 9 deletions(-)
> 
> diff --git a/.gitignore b/.gitignore
> index c393e94..520f7ac 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -3,4 +3,3 @@ build/
> llvm-build/
> *xcuserdata
> test/20*
> -source/LLDBWrapPython.cpp
> diff --git a/lldb.xcodeproj/project.pbxproj b/lldb.xcodeproj/project.pbxproj
> index b2a4aac..2a44797 100644
> --- a/lldb.xcodeproj/project.pbxproj
> +++ b/lldb.xcodeproj/project.pbxproj
> @@ -1207,7 +1207,7 @@
> 		26A0DA4D140F721D006DA411 /* HashedNameToDIE.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HashedNameToDIE.h; sourceTree = "<group>"; };
> 		26A3B4AC1181454800381BC2 /* ObjectContainerBSDArchive.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ObjectContainerBSDArchive.cpp; sourceTree = "<group>"; };
> 		26A3B4AD1181454800381BC2 /* ObjectContainerBSDArchive.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ObjectContainerBSDArchive.h; sourceTree = "<group>"; };
> -		26A4EEB511682AAC007A372A /* LLDBWrapPython.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; name = LLDBWrapPython.cpp; path = source/LLDBWrapPython.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
> +		26A4EEB511682AAC007A372A /* LLDBWrapPython.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = LLDBWrapPython.cpp; sourceTree = BUILT_PRODUCTS_DIR; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
> 		26A527BD14E24F5F00F3A14A /* ProcessMachCore.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ProcessMachCore.cpp; sourceTree = "<group>"; };
> 		26A527BE14E24F5F00F3A14A /* ProcessMachCore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProcessMachCore.h; sourceTree = "<group>"; };
> 		26A527BF14E24F5F00F3A14A /* ThreadMachCore.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ThreadMachCore.cpp; sourceTree = "<group>"; };
> @@ -4313,7 +4313,7 @@
> 			inputPaths = (
> 				"$(BUILT_PRODUCTS_DIR)/lldb.py",
> 				"$(SRCROOT)/source/Interpreter/embedded_interpreter.py",
> -				"$(SRCROOT)/scripts/Python/LLDBWrapPython.o",
> +				"$(OBJECT_FILE_DIR_normal)/$(CURRENT_ARCH)/LLDBWrapPython.o",
> 			);
> 			name = "Finish swig wrapper classes (lldb)";
> 			outputPaths = (
> diff --git a/scripts/Python/build-swig-Python.sh b/scripts/Python/build-swig-Python.sh
> index 34a1ff2..402d085 100755
> --- a/scripts/Python/build-swig-Python.sh
> +++ b/scripts/Python/build-swig-Python.sh
> @@ -36,12 +36,7 @@ else
>     GenerateDependencies=0
> fi
> 
> -if [ $MakefileCalled -eq 0 ]
> -then
> -  swig_output_file=${SRC_ROOT}/source/LLDBWrapPython.cpp
> -else
> -  swig_output_file=${TARGET_DIR}/LLDBWrapPython.cpp
> -fi
> +swig_output_file=${TARGET_DIR}/LLDBWrapPython.cpp
> swig_input_file=${SRC_ROOT}/scripts/lldb.swig
> swig_python_extensions=${SRC_ROOT}/scripts/Python/python-extensions.swig
> swig_python_wrapper=${SRC_ROOT}/scripts/Python/python-wrapper.swig
> -- 
> 1.8.5.5
> 
> _______________________________________________
> lldb-commits mailing list
> lldb-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits