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

Already on GitHub? Sign in to your account

Gitignore structure overhaul #1107

Merged
merged 17 commits into from May 16, 2012

Conversation

Projects
None yet
2 participants
Owner

bilderbuchi commented Mar 24, 2012

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. :-)

Owner

bilderbuchi commented Mar 28, 2012

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

Owner

bilderbuchi commented on 3c4d321 Apr 2, 2012

@arturoc, could you confirm that removing those files is OK and they (will) get autogenerated? Otherwise I have to revert this.

Owner

bilderbuchi commented Apr 11, 2012

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.

Owner

bilderbuchi commented on 0d1e797 Apr 18, 2012

Here's some info what they are and why vcxproj-filter files exist: http://stackoverflow.com/questions/6941868/why-do-vcxproj-filters-files-exist

bilderbuchi added some commits Apr 22, 2012

Merge branch 'develop' into gitignore-fixes
Conflicts:
	examples/android/androidEmptyExample/Makefile
	examples/android/androidEmptyExample/config.make
Owner

bilderbuchi commented Apr 22, 2012

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 added some commits Apr 24, 2012

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

Conflicts:

	examples/android/androidEmptyExample/Makefile
	examples/android/androidEmptyExample/config.make
Owner

bilderbuchi commented Apr 24, 2012

@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.

Owner

bilderbuchi commented May 3, 2012

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.

Owner

bilderbuchi commented May 15, 2012

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

Contributor

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?

Owner

bilderbuchi commented May 16, 2012

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 ofTheo merged commit 591c052 into openframeworks:develop May 16, 2012

@bilderbuchi bilderbuchi referenced this pull request May 17, 2013

Closed

New .gitignore structure overhaul #2057

6 of 6 tasks complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment