[lldb-dev] Xcode project creates too many diffs if I just add or remove a file...

Greg Clayton via lldb-dev lldb-dev at lists.llvm.org
Tue Jul 24 07:09:35 PDT 2018


That would be great, thanks.


> On Jul 23, 2018, at 4:21 PM, Jason Molenda <jmolenda at apple.com> wrote:
> 
> Yeah, I wrote the script to accept stdin or a filename argument, and print its results.  I'll fix it to hardcode looking for lldb.xcodeproj/project.pbxproj or project.pbxproj in cwd and update it in place.
> 
> 
>> On Jul 23, 2018, at 3:37 PM, Raphael “Teemperor” Isemann <teemperor at gmail.com> wrote:
>> 
>> That’s just how IO redirection works in sh. But I agree that the expected default behavior is to just overwrite the file without having to redirect any streams/tmp files (+ Jason because he probably can easily fix this).
>> 
>> - Raphael
>> 
>>> On Jul 23, 2018, at 3:24 PM, Greg Clayton <clayborg at gmail.com> wrote:
>>> 
>>> The script will nuke the project.pbxproj file you do:
>>> 
>>> ../scripts/sort-pbxproj.rb > project.pbxproj
>>> 
>>> So it seems you must do:
>>> 
>>> ../scripts/sort-pbxproj.rb > project.pbxproj2
>>> mv project.pbxproj2 project.pbxproj
>>> 
>>> Is this expected??
>>> 
>>>> On Jul 23, 2018, at 3:07 PM, Raphael “Teemperor” Isemann <teemperor at gmail.com> wrote:
>>>> 
>>>> See Jason’s email from two weeks ago:
>>>> 
>>>>> I didn't intend for it, but when you add a file to the xcode project file, Xcode will reorder all the currently-sorted files and we'll get all the same merge conflicts we've had for the past couple years again.
>>>>> We could either back out my sorting of the project files (and continue to have constant merge conflicts like always) or we can sort the xcode project file every time we have to add something to it.  That's what we're doing.
>>>>> scripts/sort-pbxproj.rb is the script I threw together to do this.  Run it in the lldb.xcodeproj directory and it will output a new project file on stdout.  Not the most friendly UI, I can go back and revisit that later.
>>>>> J
>>>> 
>>>>> On Jul 23, 2018, at 3:04 PM, Greg Clayton via lldb-dev <lldb-dev at lists.llvm.org> wrote:
>>>>> 
>>>>> Anyone know if something has happened to the Xcode project file? Did someone sort or try to manually do something to the Xcode project? If I add or remove a file, then I end up with 1000s of diffs...
>>>>> 
>>>>> Greg
>>>>> 
>>>>> _______________________________________________
>>>>> lldb-dev mailing list
>>>>> lldb-dev at lists.llvm.org
>>>>> http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-dev
>>>> 
>>> 
>> 
> 



More information about the lldb-dev mailing list