<div dir="ltr">Worked fine on Linux cmake and Linux configure/gmake.</div><div class="gmail_extra"><br><br><div class="gmail_quote">On Fri, Mar 14, 2014 at 10:10 AM, Todd Fiala <span dir="ltr"><<a href="mailto:tfiala@google.com" target="_blank">tfiala@google.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">I'll give this a shot now.</div><div class="gmail_extra"><div><div class="h5"><br><br><div class="gmail_quote">
On Fri, Mar 14, 2014 at 10:04 AM, Greg Clayton <span dir="ltr"><<a href="mailto:gclayton@apple.com" target="_blank">gclayton@apple.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">This works fine for Xcode. If we can get confirmation from folks that use CMake and make, then I will check this in.<br>
<div><div><br>
On Mar 14, 2014, at 9:36 AM, Kuba Ober <<a href="mailto:kuba@mareimbrium.org" target="_blank">kuba@mareimbrium.org</a>> wrote:<br>
<br>
> 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.<br>
><br>
> Please commit after trying it out.<br>
><br>
> Cheers, Kuba Ober<br>
> ---<br>
> .gitignore | 1 -<br>
> lldb.xcodeproj/project.pbxproj | 4 ++--<br>
> scripts/Python/build-swig-Python.sh | 7 +------<br>
> 3 files changed, 3 insertions(+), 9 deletions(-)<br>
><br>
> diff --git a/.gitignore b/.gitignore<br>
> index c393e94..520f7ac 100644<br>
> --- a/.gitignore<br>
> +++ b/.gitignore<br>
> @@ -3,4 +3,3 @@ build/<br>
> llvm-build/<br>
> *xcuserdata<br>
> test/20*<br>
> -source/LLDBWrapPython.cpp<br>
> diff --git a/lldb.xcodeproj/project.pbxproj b/lldb.xcodeproj/project.pbxproj<br>
> index b2a4aac..2a44797 100644<br>
> --- a/lldb.xcodeproj/project.pbxproj<br>
> +++ b/lldb.xcodeproj/project.pbxproj<br>
> @@ -1207,7 +1207,7 @@<br>
> 26A0DA4D140F721D006DA411 /* HashedNameToDIE.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HashedNameToDIE.h; sourceTree = "<group>"; };<br>
> 26A3B4AC1181454800381BC2 /* ObjectContainerBSDArchive.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ObjectContainerBSDArchive.cpp; sourceTree = "<group>"; };<br>
> 26A3B4AD1181454800381BC2 /* ObjectContainerBSDArchive.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ObjectContainerBSDArchive.h; sourceTree = "<group>"; };<br>
> - 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; };<br>
> + 26A4EEB511682AAC007A372A /* LLDBWrapPython.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = LLDBWrapPython.cpp; sourceTree = BUILT_PRODUCTS_DIR; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };<br>
> 26A527BD14E24F5F00F3A14A /* ProcessMachCore.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ProcessMachCore.cpp; sourceTree = "<group>"; };<br>
> 26A527BE14E24F5F00F3A14A /* ProcessMachCore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProcessMachCore.h; sourceTree = "<group>"; };<br>
> 26A527BF14E24F5F00F3A14A /* ThreadMachCore.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ThreadMachCore.cpp; sourceTree = "<group>"; };<br>
> @@ -4313,7 +4313,7 @@<br>
> inputPaths = (<br>
> "$(BUILT_PRODUCTS_DIR)/lldb.py",<br>
> "$(SRCROOT)/source/Interpreter/embedded_interpreter.py",<br>
> - "$(SRCROOT)/scripts/Python/LLDBWrapPython.o",<br>
> + "$(OBJECT_FILE_DIR_normal)/$(CURRENT_ARCH)/LLDBWrapPython.o",<br>
> );<br>
> name = "Finish swig wrapper classes (lldb)";<br>
> outputPaths = (<br>
> diff --git a/scripts/Python/build-swig-Python.sh b/scripts/Python/build-swig-Python.sh<br>
> index 34a1ff2..402d085 100755<br>
> --- a/scripts/Python/build-swig-Python.sh<br>
> +++ b/scripts/Python/build-swig-Python.sh<br>
> @@ -36,12 +36,7 @@ else<br>
> GenerateDependencies=0<br>
> fi<br>
><br>
> -if [ $MakefileCalled -eq 0 ]<br>
> -then<br>
> - swig_output_file=${SRC_ROOT}/source/LLDBWrapPython.cpp<br>
> -else<br>
> - swig_output_file=${TARGET_DIR}/LLDBWrapPython.cpp<br>
> -fi<br>
> +swig_output_file=${TARGET_DIR}/LLDBWrapPython.cpp<br>
> swig_input_file=${SRC_ROOT}/scripts/lldb.swig<br>
> swig_python_extensions=${SRC_ROOT}/scripts/Python/python-extensions.swig<br>
> swig_python_wrapper=${SRC_ROOT}/scripts/Python/python-wrapper.swig<br>
> --<br>
> 1.8.5.5<br>
><br>
> _______________________________________________<br>
> lldb-commits mailing list<br>
> <a href="mailto:lldb-commits@cs.uiuc.edu" target="_blank">lldb-commits@cs.uiuc.edu</a><br>
> <a href="http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits</a><br>
<br>
_______________________________________________<br>
lldb-commits mailing list<br>
<a href="mailto:lldb-commits@cs.uiuc.edu" target="_blank">lldb-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits</a><br>
</div></div></blockquote></div><br><br clear="all"><div><br></div></div></div><span class="HOEnZb"><font color="#888888">-- <br><div dir="ltr"><table cellspacing="0" cellpadding="0" style="color:rgb(136,136,136);font-family:'Times New Roman'">
<tbody><tr style="color:rgb(85,85,85);font-family:sans-serif;font-size:small">
<td nowrap style="border-top-style:solid;border-top-color:rgb(213,15,37);border-top-width:2px">Todd Fiala |</td><td nowrap style="border-top-style:solid;border-top-color:rgb(51,105,232);border-top-width:2px"> Software Engineer |</td>
<td nowrap style="border-top-style:solid;border-top-color:rgb(0,153,57);border-top-width:2px"> <a href="mailto:tfiala@google.com" style="color:rgb(17,85,204)" target="_blank"><span style="background-color:rgb(255,255,204);color:rgb(34,34,34);background-repeat:initial initial">tfiala@google.com</span></a> |</td>
<td nowrap style="border-top-style:solid;border-top-color:rgb(238,178,17);border-top-width:2px"><font color="#1155cc"> <a>650-943-3180</a></font></td></tr></tbody></table><br></div>
</font></span></div>
</blockquote></div><br><br clear="all"><div><br></div>-- <br><div dir="ltr"><table cellspacing="0" cellpadding="0" style="color:rgb(136,136,136);font-family:'Times New Roman'"><tbody><tr style="color:rgb(85,85,85);font-family:sans-serif;font-size:small">
<td nowrap style="border-top-style:solid;border-top-color:rgb(213,15,37);border-top-width:2px">Todd Fiala |</td><td nowrap style="border-top-style:solid;border-top-color:rgb(51,105,232);border-top-width:2px"> Software Engineer |</td>
<td nowrap style="border-top-style:solid;border-top-color:rgb(0,153,57);border-top-width:2px"> <a href="mailto:tfiala@google.com" style="color:rgb(17,85,204)" target="_blank"><span style="background-color:rgb(255,255,204);color:rgb(34,34,34);background-repeat:initial initial">tfiala@google.com</span></a> |</td>
<td nowrap style="border-top-style:solid;border-top-color:rgb(238,178,17);border-top-width:2px"><font color="#1155cc"> <a>650-943-3180</a></font></td></tr></tbody></table><br></div>
</div>