Skip to content
Browse files

Merge pull request #1107 from bilderbuchi/gitignore-fixes

Gitignore structure overhaul
  • Loading branch information...
2 parents e765c40 + 7218666 commit 591c052a7c4583d8ea86c691074997bdfb944bb3 @ofTheo ofTheo committed May 16, 2012
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 ...src/pugixmlLib/scripts/xcode3/Universal/Debug/pugixml.build/Objects-normal/i386/pugixml.o
Binary file not shown.
View
BIN ...c/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.

2 comments on commit 591c052

@julapy
openFrameworks member
julapy commented on 591c052 May 18, 2012

nice, this solved all iOS Default.png and Icon.png gitignore issues.

@bilderbuchi
openFrameworks member

thanks. yeah, that was the idea.

Please sign in to comment.
Something went wrong with that request. Please try again.