From 0e5e58a1f87dd6f2feea6cc1366c681129b55358 Mon Sep 17 00:00:00 2001 From: David Bernard Date: Tue, 3 Jun 2014 17:30:33 +0200 Subject: [PATCH 1/4] .gitignore : simplify + ignore private --- .gitignore | 64 +++++------------------------------------------------- 1 file changed, 5 insertions(+), 59 deletions(-) diff --git a/.gitignore b/.gitignore index 782b60710..e567b5de3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,74 +1,20 @@ -/.gradle/ -/.nb-gradle/private/ -/jme3-core/build/ -/jme3-plugins/build/ -/jme3-desktop/build/ -/jme3-android-native/build/ -/jme3-android/build/ -/jme3-blender/build/ -/jme3-effects/build/ -/jme3-bullet/build/ -/jme3-terrain/build/ -/jme3-bullet-native/build/ -/jme3-jogg/build/ -/jme3-jbullet/build/ -/jme3-lwjgl/build/ -/jme3-networking/build/ -/jme3-niftygui/build/ -/jme3-testdata/build/ -/jme3-examples/build/ -/jme3-jogl/build/ -/dist/ +.gradle/ +build/ +gradle-app.setting +dist/ +private/ /jme3-bullet-native/bullet.zip /jme3-bullet-native/bullet-2.82-r2704/ -/sdk/build/ /sdk/jme3-core-baselibs/release/ /sdk/jme3-core-libraries/release/ /sdk/jme3-project-baselibs/release/ /sdk/jme3-project-libraries/release/ -/sdk/jme3-codepalette/build/ -/sdk/jme3-core-libraries/build/ -/sdk/jme3-code-check/build/ -/sdk/jme3-core-baselibs/build/ -/sdk/jme3-core-baselibs/nbproject/private/ -/sdk/jme3-documentation/build/ -/sdk/jme3-core-updatecenters/build/ -/sdk/jme3-project-testdata/build/ -/sdk/jme3-project-libraries/build/ -/sdk/jme3-project-baselibs/build/ -/sdk/jme3-templates/build/ -/sdk/jme3-texture-editor/build/ -/sdk/jme3-tests-template/build/ -/sdk/jme3-upgrader/build/ -/sdk/jme3-core/build/ -/sdk/jme3-obfuscate/build/ -/sdk/jme3-gui/build/ -/sdk/jme3-cinematics/build/ -/sdk/jme3-terrain-editor/build/ -/sdk/jme3-lwjgl-applet/build/ -/sdk/jme3-blender/build/ -/sdk/jme3-navmesh-gen/build/ -/sdk/jme3-angelfont/build/ -/sdk/jme3-materialeditor/build/ -/sdk/jme3-android/build/ -/sdk/jme3-desktop-executables/build/ -/sdk/jme3-ogrexml/build/ -/sdk/jme3-ogretools/build/ -/sdk/jme3-scenecomposer/build/ -/sdk/jme3-assetpack-support/build/ -/sdk/jme3-model-importer/build/ -/sdk/jme3-wavefront/build/ -/sdk/jme3-vehicle-creator/build/ -/sdk/jme3-welcome-screen/build/ -/sdk/jme3-glsl-support/build/ /netbeans/ /sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/JmeTestsProject.zip /sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/JME3TestsAndroidProject.zip /sdk/jme3-project-testdata/release/ /sdk/JME3TestsTemplateAndroid/src/jme3test/ /sdk/JME3TestsTemplate/src/jme3test/ -/jme3-ios/build/ /jme3-android-native/openal-soft/ /jme3-android-native/OpenALSoft.zip /jme3-android-native/stb_image/ -/jme3-bullet-native-android/build/ \ No newline at end of file From 36314932843cb19227b83df1c5ebb071414e31fb Mon Sep 17 00:00:00 2001 From: David Bernard Date: Tue, 3 Jun 2014 18:14:40 +0200 Subject: [PATCH 2/4] Revert ".gitignore : simplify + ignore private" This reverts commit 0e5e58a1f87dd6f2feea6cc1366c681129b55358. --- .gitignore | 64 +++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 59 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index e567b5de3..782b60710 100644 --- a/.gitignore +++ b/.gitignore @@ -1,20 +1,74 @@ -.gradle/ -build/ -gradle-app.setting -dist/ -private/ +/.gradle/ +/.nb-gradle/private/ +/jme3-core/build/ +/jme3-plugins/build/ +/jme3-desktop/build/ +/jme3-android-native/build/ +/jme3-android/build/ +/jme3-blender/build/ +/jme3-effects/build/ +/jme3-bullet/build/ +/jme3-terrain/build/ +/jme3-bullet-native/build/ +/jme3-jogg/build/ +/jme3-jbullet/build/ +/jme3-lwjgl/build/ +/jme3-networking/build/ +/jme3-niftygui/build/ +/jme3-testdata/build/ +/jme3-examples/build/ +/jme3-jogl/build/ +/dist/ /jme3-bullet-native/bullet.zip /jme3-bullet-native/bullet-2.82-r2704/ +/sdk/build/ /sdk/jme3-core-baselibs/release/ /sdk/jme3-core-libraries/release/ /sdk/jme3-project-baselibs/release/ /sdk/jme3-project-libraries/release/ +/sdk/jme3-codepalette/build/ +/sdk/jme3-core-libraries/build/ +/sdk/jme3-code-check/build/ +/sdk/jme3-core-baselibs/build/ +/sdk/jme3-core-baselibs/nbproject/private/ +/sdk/jme3-documentation/build/ +/sdk/jme3-core-updatecenters/build/ +/sdk/jme3-project-testdata/build/ +/sdk/jme3-project-libraries/build/ +/sdk/jme3-project-baselibs/build/ +/sdk/jme3-templates/build/ +/sdk/jme3-texture-editor/build/ +/sdk/jme3-tests-template/build/ +/sdk/jme3-upgrader/build/ +/sdk/jme3-core/build/ +/sdk/jme3-obfuscate/build/ +/sdk/jme3-gui/build/ +/sdk/jme3-cinematics/build/ +/sdk/jme3-terrain-editor/build/ +/sdk/jme3-lwjgl-applet/build/ +/sdk/jme3-blender/build/ +/sdk/jme3-navmesh-gen/build/ +/sdk/jme3-angelfont/build/ +/sdk/jme3-materialeditor/build/ +/sdk/jme3-android/build/ +/sdk/jme3-desktop-executables/build/ +/sdk/jme3-ogrexml/build/ +/sdk/jme3-ogretools/build/ +/sdk/jme3-scenecomposer/build/ +/sdk/jme3-assetpack-support/build/ +/sdk/jme3-model-importer/build/ +/sdk/jme3-wavefront/build/ +/sdk/jme3-vehicle-creator/build/ +/sdk/jme3-welcome-screen/build/ +/sdk/jme3-glsl-support/build/ /netbeans/ /sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/JmeTestsProject.zip /sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/JME3TestsAndroidProject.zip /sdk/jme3-project-testdata/release/ /sdk/JME3TestsTemplateAndroid/src/jme3test/ /sdk/JME3TestsTemplate/src/jme3test/ +/jme3-ios/build/ /jme3-android-native/openal-soft/ /jme3-android-native/OpenALSoft.zip /jme3-android-native/stb_image/ +/jme3-bullet-native-android/build/ \ No newline at end of file From aa7718f33a2649d61891cfb99a050277ce0d35af Mon Sep 17 00:00:00 2001 From: David Bernard Date: Tue, 3 Jun 2014 18:50:35 +0200 Subject: [PATCH 3/4] gitignore: add explicit list of private files to ignore --- .gitignore | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 782b60710..527b984c4 100644 --- a/.gitignore +++ b/.gitignore @@ -71,4 +71,10 @@ /jme3-android-native/openal-soft/ /jme3-android-native/OpenALSoft.zip /jme3-android-native/stb_image/ -/jme3-bullet-native-android/build/ \ No newline at end of file +/jme3-bullet-native-android/build/ +/sdk/nbproject/private/private.xml +/sdk/nbproject/private/platform-private.properties +/sdk/jme3-scenecomposer/nbproject/private/private.xml +/sdk/jme3-core/nbproject/private/private.xml +/.nb-gradle/profiles/private/aux-config +/build/tmp/mergedJavadoc/javadoc.options From 76088011a7cc30608ff170d487d8aea4422340e6 Mon Sep 17 00:00:00 2001 From: David Bernard Date: Tue, 3 Jun 2014 18:57:56 +0200 Subject: [PATCH 4/4] gitignore: ignore directory instead of files --- .gitignore | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 527b984c4..4ff78eb50 100644 --- a/.gitignore +++ b/.gitignore @@ -72,9 +72,9 @@ /jme3-android-native/OpenALSoft.zip /jme3-android-native/stb_image/ /jme3-bullet-native-android/build/ -/sdk/nbproject/private/private.xml -/sdk/nbproject/private/platform-private.properties -/sdk/jme3-scenecomposer/nbproject/private/private.xml -/sdk/jme3-core/nbproject/private/private.xml -/.nb-gradle/profiles/private/aux-config -/build/tmp/mergedJavadoc/javadoc.options +/sdk/nbproject/private/ +/sdk/nbproject/private/ +/sdk/jme3-scenecomposer/nbproject/private/ +/sdk/jme3-core/nbproject/private/ +/.nb-gradle/profiles/private/ +/build/tmp/mergedJavadoc/