Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Gitignore structure overhaul #1107

Merged
merged 17 commits into from

2 participants

@bilderbuchi
Owner

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
Owner

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

@bilderbuchi
Owner

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

@bilderbuchi
Owner

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

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
@bilderbuchi bilderbuchi Merge branch 'develop' into gitignore-fixes
Conflicts:
	examples/android/androidEmptyExample/Makefile
	examples/android/androidEmptyExample/config.make
2357abc
@bilderbuchi bilderbuchi Remove wrongly committed local.properties file.
4f6a0f6
@bilderbuchi
Owner

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
@bilderbuchi bilderbuchi Revert "Remove Android examples' config.make and Makefile."
This reverts commit 3c4d321.

Conflicts:

	examples/android/androidEmptyExample/Makefile
	examples/android/androidEmptyExample/config.make
2f849f2
@bilderbuchi bilderbuchi Adapt gitignore rules to except some Android files until PG works.
376d2cc
@bilderbuchi
Owner

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

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
Owner

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

@ofTheo
Owner

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
Owner

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 ofTheo merged commit 591c052 into from
@bilderbuchi bilderbuchi referenced this pull request
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
Commits on Mar 24, 2012
  1. @bilderbuchi
  2. @bilderbuchi
Commits on Mar 28, 2012
  1. @bilderbuchi
  2. @bilderbuchi
Commits on Apr 7, 2012
  1. @bilderbuchi
  2. @bilderbuchi
  3. @bilderbuchi
  4. @bilderbuchi
Commits on Apr 9, 2012
  1. @bilderbuchi
Commits on Apr 10, 2012
  1. @bilderbuchi

    Merge branch 'develop' into gitignore-fixes

    bilderbuchi authored
    Conflicts:
    	.gitignore
Commits on Apr 18, 2012
  1. @bilderbuchi
  2. @bilderbuchi

    Remove superfluous vcxproj.filters files.

    bilderbuchi authored
    Wouldn't have made sense without vcxproj files, and should be generated by PG.
Commits on Apr 22, 2012
  1. @bilderbuchi

    Merge branch 'develop' into gitignore-fixes

    bilderbuchi authored
    Conflicts:
    	examples/android/androidEmptyExample/Makefile
    	examples/android/androidEmptyExample/config.make
  2. @bilderbuchi
Commits on Apr 24, 2012
  1. @bilderbuchi

    Revert "Remove Android examples' config.make and Makefile."

    bilderbuchi authored
    This reverts commit 3c4d321.
    
    Conflicts:
    
    	examples/android/androidEmptyExample/Makefile
    	examples/android/androidEmptyExample/config.make
  2. @bilderbuchi
Commits on May 16, 2012
  1. @bilderbuchi
This page is out of date. Refresh to see the latest.
View
137 .gitignore
@@ -1,105 +1,78 @@
-*.mode*
-build/
-obj/
-*.o
+
+# OF-specific ignore patterns
+
openFrameworks.a
openFrameworksDebug.a
openFrameworksUniversal.a
-*.app/
#rule to avoid non-official addons going into git
#see addons/.gitignore
-addons/**
-
-#xcode files
-*.pbxuser
-*.perspectivev3
-examples/*/*/*.xcodeproj
-examples/*/*/Project.xcconfig
-examples/*/*/openFrameworks-Info.plist
-examples/*/*/ofxiphone-Info.plist
-examples/*/*/iPhone_Prefix.pch
-examples/*/*/*/*/Default.png
-examples/*/*/*/*/Icon.png
-
-#codeblocks files
-examples/*/*/*.layout
-examples/*/*/*.depend
-examples/*/*/bin/clickToLaunch*
-examples/*/*/bin/libs
-examples/*/*/obj
-examples/*/*/*.cbp
-examples/*/*/*.workspace
-
-#vs files
-examples/*/*/*.sln
-examples/*/*/*.vcxproj
-examples/*/*/*.vcxproj.user
-examples/*/*/*.vcxproj.filters
+addons/*
#rule to avoid non-official apps going into git
#see apps/.gitignore
apps/*
-#codeblocks OF lib files
-libs/openFrameworksCompiled/project/*/*.depend
-libs/openFrameworksCompiled/project/*/*.layout
+#also, see examples/.gitignore
-#linux temporary files
-*~
+# Some general ignore patterns
+
+build/
+obj/
+*.o
+Debug*/
+Release*/
+*.mode*
+*.app/
+*.pyc
+
+# IDE-specific ignore patterns
+
+#XCode
+*.pbxuser
+*.perspective
+*.perspectivev3
+*.mode1v3
+*.mode2v3
+#XCode 4
+xcuserdata
+*.xcworkspace
+
+#Code::Blocks
+*.depend
+*.layout
-#vs2010 user files
+#Visual Studio
*.sdf
*.opensdf
*.suo
+ipch/
-#eclipse build folders
-#Mac OS X
-addons/Debug Mac OS X
-addons/Release Mac OS X
-libs/openFrameworks/Debug Mac OS X
-libs/openFrameworks/Release Mac OS X
-examples/*/*/Debug Mac OS X
-examples/*/*/Release Mac OS X
-xcuserdata
-project.xcworkspace
-.DS_Store
+#Eclipse
+.metadata
+local.properties
+.externalToolBuilders
+
+# OS-specific ignore patterns
#Linux
-addons/Debug Linux
-addons/Release Linux
-libs/openFrameworks/Debug Linux
-libs/openFrameworks/Release Linux
-examples/*/*/Debug Linux
-examples/*/*/Release Linux
-examples/*/*/Debug Linux64
-examples/*/*/Release Linux64
-examples/*/*/Makefile
-examples/*/*/config.make
-*.pyc
+*~
+# KDE
+.directory
+
+#OSX
+.DS_Store
+*.swp
+*~.nib
+# Thumbnails
+._*
-#eclipse
-examples/*/*/.cproject
-examples/*/*/.project
-examples/*/*/.settings
+#Windows
+# Windows image file caches
+Thumbs.db
+# Folder config file
+Desktop.ini
#Android
-addons/Debug Android
-addons/Release Android
-libs/openFrameworks/Debug Android
-libs/openFrameworks/Release Android
-libs/openFrameworks/Release
-libs/openFrameworks/Debug
-libs/openFrameworks/Release_arm7
-examples/*/*/Debug Android
-examples/*/*/Release Android
-examples/*/*/Debug
-examples/*/*/Release
-examples/*/*/Release_arm7
-examples/*/*/test link
-examples/*/*/obj
.csettings
-paths.make
-!examples/android/*/.cproject
-!examples/android/*/.project
-!examples/android/*/.settings
+
View
24 addons/.gitignore
@@ -1,34 +1,22 @@
!ofAddons.h
+!.project
!ofx3DModelLoader
-!ofx3DModelLoader/**
!ofxAccelerometer
-!ofxAccelerometer/**
!ofxDirList
-!ofxDirList/**
!ofxiPhone
-!ofxiPhone/**
!ofxMultiTouch
-!ofxMultiTouch/**
!ofxNetwork
-!ofxNetwork/**
!ofxOpenCv
-!ofxOpenCv/**
!ofxOsc
-!ofxOsc/**
!ofxThread
-!ofxThread/**
!ofxVectorGraphics
-!ofxVectorGraphics/**
!ofxVectorMath
-!ofxVectorMath/**
!ofxXmlSettings
-!ofxXmlSettings/**
!ofxAndroid
-!ofxAndroid/**
-!ofxAssimpModelLoader
-!ofxAssimpModelLoader/**
-!ofxGui
-!ofxGui/**
-!ofxGui/*/**
ofxAndroid/ofAndroidLib/bin
ofxAndroid/ofAndroidLib/gen
+!ofxAssimpModelLoader
+!ofxGui
+
+# don't ignore the .gitignore file
+!.gitignore
View
10 addons/ofxAndroid/ofAndroidLib/local.properties
@@ -1,10 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must *NOT* be checked in Version Control Systems,
-# as it contains information specific to your local configuration.
-
-# location of the SDK. This is only used by Ant
-# For customization when using a Version Control System, please read the
-# header note.
-sdk.dir=/home/arturo/Downloads/android-sdk-linux
View
7 apps/.gitignore
@@ -4,3 +4,10 @@
# ignore bin folders' contents, except data folder therein
/devApps/*/bin/*
!/devApps/*/bin/data/
+
+/devApps/*/.cproject
+/devApps/*/.project
+/devApps/*/.settings/
+
+# don't ignore the .gitignore file
+!.gitignore
View
4 apps/devApps/AdvancedImageLoading/bin/data/resaved/exrFloat/.gitignore
@@ -1 +1,3 @@
-*
+*
+# don't ignore the .gitignore file
+!.gitignore
View
4 apps/devApps/AdvancedImageLoading/bin/data/resaved/jpg8/.gitignore
@@ -1 +1,3 @@
-*
+*
+# don't ignore the .gitignore file
+!.gitignore
View
4 apps/devApps/AdvancedImageLoading/bin/data/resaved/png16/.gitignore
@@ -1 +1,3 @@
-*
+*
+# don't ignore the .gitignore file
+!.gitignore
View
4 apps/devApps/AdvancedImageLoading/bin/data/resaved/png8/.gitignore
@@ -1 +1,3 @@
-*
+*
+# don't ignore the .gitignore file
+!.gitignore
View
BIN  ...ojectGenerator/src/pugixmlLib/scripts/xcode3/Universal/Debug/pugixml.build/Objects-normal/i386/pugixml.o
Binary file not shown
View
BIN  ...ectGenerator/src/pugixmlLib/scripts/xcode3/Universal/Debug/pugixml.build/Objects-normal/x86_64/pugixml.o
Binary file not shown
View
56 examples/.gitignore
@@ -1,14 +1,5 @@
-*/.metadata
-android/*/Debug
-android/*/Release
-android/*/Release_arm7
android/*/test link
-android/*/bin
-android/*/obj
android/*/gen
-android/*/local.properties
-android/*/.settings
-android/*/.externalToolBuilders
android/*/res/raw
libOFAndroidApp.so
libOFAndroidApp_neon.so
@@ -17,8 +8,47 @@ gdb.setup
libneondetection.so
Application.mk
Android.mk
+
*/*/bin/*
-!*/*/bin/data
-!*/*/bin/data/*
-!*/*/bin/data/**
-!*/*/bin/data/**/*
+!*/*/bin/data/
+
+# IDE-specific ignore patterns
+
+#XCode
+/*/*/*.xcodeproj
+/*/*/Project.xcconfig
+/*/*/openFrameworks-Info.plist
+/*/*/ofxiphone-Info.plist
+/*/*/iPhone_Prefix.pch
+/*/*/*/*/Default.png
+/*/*/*/*/Icon.png
+
+#Code::Blocks
+/*/*/*.cbp
+/*/*/*.workspace
+
+#Visual Studio
+/*/*/*.sln
+/*/*/*.vcxproj
+/*/*/*.vcxproj.user
+/*/*/*.vcxproj.filters
+
+#Eclipse
+/*/*/.cproject
+/*/*/.project
+/*/*/.settings/
+
+# OS-specific ignore patterns
+
+#Linux
+/*/*/Makefile
+/*/*/config.make
+# Leave Android files in until project generation works
+!/android/*/Makefile
+!/android/*/config.make
+
+#Android
+/*/*/test link
+!/android/*/.cproject
+!/android/*/.project
+!/android/*/.settings
View
9 examples/3d/QuaternionLatLongExample/Project.xcconfig
@@ -1,9 +0,0 @@
-//THE PATH TO THE ROOT OF OUR OF PATH RELATIVE TO THIS PROJECT.
-//THIS NEEDS TO BE DEFINED BEFORE CoreOF.xcconfig IS INCLUDED
-OF_PATH = ../../..
-
-//THIS HAS ALL THE HEADER AND LIBS FOR OF CORE
-#include "../../../libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig"
-
-OTHER_LDFLAGS = $(OF_CORE_LIBS)
-HEADER_SEARCH_PATHS = $(OF_CORE_HEADERS)
View
BIN  scripts/linux/codeblocks_wizard/openframeworks/Thumbs.db
Binary file not shown
View
BIN  scripts/win_cb/codeblocks_wizard/openframeworks/Thumbs.db
Binary file not shown
Something went wrong with that request. Please try again.