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.

Sign up for GitHub

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

Jump to bottom

Gitignore structure overhaul #1107

Merged
merged 17 commits into from
May 16, 2012
Merged

Gitignore structure overhaul #1107

merged 17 commits into from
May 16, 2012

Conversation

bilderbuchi
Copy link
Member

As good as done, this might as well make it into 0071, see below.

~~Relevant issue #1081. This is the first round of fixes to the existing structure.
I'd like to complete/refine the overhaul, but make the changes visible for everyone, so please DON'T MERGE this yet. ~~
Better, please take a look at #1081, and answer my questions. :-)

@bilderbuchi
Copy link
Member Author

Repo contents and .gitignores are in sync now, with the latest commit. I will start re-working the gitignore structure.

@bilderbuchi
Copy link
Member Author

Structure is overhauled now, should be much saner. I'm just waiting for a working PG to confirm that it's working correctly, but I'm quite confident it is.

@bilderbuchi
Additions to XCode gitignores.
ba2b988 
List according to http://stackoverflow.com/questions/3066698/what-is-the-standard-content-of-gitignore-for-an-iphone-xcode-project
@bilderbuchi
Remove superfluous vcxproj.filters files.
0d1e797 
Wouldn't have made sense without vcxproj files, and should be generated by PG.
@bilderbuchi
Merge branch 'develop' into gitignore-fixes
2357abc 
Conflicts:
	examples/android/androidEmptyExample/Makefile
	examples/android/androidEmptyExample/config.make
@bilderbuchi
Remove wrongly committed local.properties file.
4f6a0f6
@bilderbuchi
Copy link
Member Author

Aside from one clarification (see discussion in 0d85b22) needed from @arturoc, this is good to merge.
Would be great if people would give it a once-over and see if they object to anything. Some explanations are in the commit messages.

I think the structure is much saner/readable now, and the selection of what should and shouldn't be ignored has been improved.

@bilderbuchi
Revert "Remove Android examples' config.make and Makefile."
2f849f2 
This reverts commit 3c4d321.

Conflicts:

	examples/android/androidEmptyExample/Makefile
	examples/android/androidEmptyExample/config.make
@bilderbuchi
Adapt gitignore rules to except some Android files until PG works.
376d2cc
@bilderbuchi
Copy link
Member Author

@ofZach @ofTheo @arturoc :OK, this is clear for final inspection and merge now, from my side. All is clean, no files remain in the repository which would be ignored.

@bilderbuchi
Copy link
Member Author

So, anyone? This is the only PR for 0071 now. It would be great to get in, cause it gets rid of some unnecessary binaries and files, I don't think we want to carry those over into the release.

@bilderbuchi
Copy link
Member Author

What can I do to get some eyes/feedback on this? Talking to myself in here gets old... :-)

@ofTheo
Copy link
Member

ofTheo commented May 16, 2012

hey Christoph.
I think this is one of those things where we have to just trust your approach.
I think a .gitignore PR is safe enough just to merge and adjust later as needed. if everyone agrees maybe we can just merge this PR?

@bilderbuchi
Copy link
Member Author

I agree.
I just did a fresh merge of develop to confirm that everything is still clean, and no inappropriate files got committed since my last merge.
Sure, we can easily adjust later if needed.

ofTheo added a commit that referenced this pull request May 16, 2012
@ofTheo
Merge pull request #1107 from bilderbuchi/gitignore-fixes
591c052 
Gitignore structure overhaul
@ofTheo ofTheo merged commit 591c052 into openframeworks:develop May 16, 2012
@bilderbuchi bilderbuchi mentioned this pull request May 17, 2013
Closed
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
0071 Release
Development

Successfully merging this pull request may close these issues.
2 participants
@bilderbuchi @ofTheo