Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add MRR support, read build configs, and other small changes #16

Merged
merged 28 commits into from
Aug 31, 2012
Merged

Conversation

zadr
Copy link
Contributor

@zadr zadr commented Aug 27, 2012

I was working on some stuff (over at https://github.com/zadr/textmate), and wound up making a bunch of changes to Xcode-editor, and, well, here they are.

The changes fall under four basic categories:

  • Using MRR instead of ARC. This was originally done by adding calls to retain/release/autorelease, but, changed over to a set of macros instead, so code will compile in both modes. Sorry for some extra commits that this resulted in.
  • Don't re-sort members in XCTarget, XCGroup or XCProject's -- to let items to be displayed in the same way as they are within Xcode.
  • Add rudimentary, read-only support for build configurations. I don't think that it would be too hard to extend this to have support for writing build configs back into the project, however, it isn't something that I needed to do, so, I never got around to it.
  • Miscellaneous changes, such as:

-- Add a target file for the (non-Xcode-based) build system that is used
-- Add a -rootGroups property, since there can be > 1 XCGroup at the root level (I think this solves issue #12).
-- Some caching of XCGroup's in XCProject.
-- Remove a bunch of logging that was kind of noisy, sorry.

I had also cherry-picked felixLam's commits in from expanz/master, but, I don't think that it will cause any problems, as they're already in master.

Zach Drayer and others added 25 commits August 15, 2012 01:08
…n't finished yet, since there can also be multiple items at the root level, and those should be accounted for as well.
@jasperblues
Copy link
Member

Hi Zach,

Nice work.

When did you work on this? I tried pulling, but got some conflicts.

@zadr
Copy link
Contributor Author

zadr commented Aug 27, 2012

According to the commit history, over the past two weeks or so. I'll merge with master again, and see how it goes. Sorry about that!

@jasperblues
Copy link
Member

No worries.

I haven't done anything myself, but did get one pull request 10 days ago (not too big - it should be hard to resolve).

Thanks for your contribution, and look forward to trying out the new features in TextMate.

@zadr
Copy link
Contributor Author

zadr commented Aug 27, 2012

All merged, wasn't anything big, just git's algorithm getting confused.

@jasperblues
Copy link
Member

Damn - it looks like tests are broken. I think this happened during the last pull request that I merged 10 days ago. (Was really busy so didn't have time to check). A linking problem in the project setup, or something. Will fix this tomorrow (finished for the day here), and then merge yours.

Thanks again for the contribution.

@zadr
Copy link
Contributor Author

zadr commented Aug 27, 2012

That could also be related to me changing the xcodeproj around while playing around with enabling/disabling ARC. It might be worth double-checking to make sure that all the targets are defaulting to the right things.

Also, on the note of tests, I should note that they don't currently run in 32-bit/MRR mode -- Kiwi library requires ARC/64bit, and, I wasn't up for converting that over as well! I don't think this will be a big problem, though. Its not like XE is doing anything crazy with pointers or signed bits.

@zadr
Copy link
Contributor Author

zadr commented Aug 31, 2012

Don't mean to pester, but, have you had a chance to look into this yet? Thanks again.

@jasperblues jasperblues merged commit bd450f1 into appsquickly:master Aug 31, 2012
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants