From fb2f74e4c9e342c81e80afc78fc60989cc6f3b64 Mon Sep 17 00:00:00 2001 From: DasBlub Date: Fri, 10 Sep 2010 19:03:33 +0200 Subject: [PATCH] [10463] Clean up the .gitignore files. * Move the settings for VS and CMake files to /.gitignore * Drop now unused .gitignore files Signed-off-by: XTZGZoReX --- .gitignore | 25 +++++++++++++++++++ contrib/extractor/.gitignore | 9 ++----- contrib/git_id/.gitignore | 8 ------ contrib/vmap_assembler/.gitignore | 11 -------- contrib/vmap_assembler/VC100/.gitignore | 3 --- contrib/vmap_assembler/VC80/.gitignore | 14 ----------- contrib/vmap_assembler/VC90/.gitignore | 14 ----------- contrib/vmap_extractor_v3/.gitignore | 7 ------ .../vmap_extractor_v3/vmapextract/.gitignore | 18 ------------- contrib/vmap_extractor_v3/win/.gitignore | 7 ------ .../vmap_extractor_v3/win/VC100/.gitignore | 2 -- contrib/vmap_extractor_v3/win/VC90/.gitignore | 2 -- dep/libmpq/.gitignore | 13 +++++++++- dep/libmpq/win/.gitignore | 5 ---- dep/libmpq/win/VC100/.gitignore | 2 -- dep/libmpq/win/VC90/.gitignore | 2 -- src/shared/revision_nr.h | 2 +- win/.gitignore | 19 -------------- win/VC100/.gitignore | 5 ---- win/VC80/.gitignore | 17 ------------- win/VC90/.gitignore | 17 ------------- 21 files changed, 40 insertions(+), 162 deletions(-) delete mode 100644 contrib/vmap_assembler/VC100/.gitignore delete mode 100644 contrib/vmap_assembler/VC80/.gitignore delete mode 100644 contrib/vmap_assembler/VC90/.gitignore delete mode 100644 contrib/vmap_extractor_v3/vmapextract/.gitignore delete mode 100644 contrib/vmap_extractor_v3/win/.gitignore delete mode 100644 contrib/vmap_extractor_v3/win/VC100/.gitignore delete mode 100644 contrib/vmap_extractor_v3/win/VC90/.gitignore delete mode 100644 dep/libmpq/win/.gitignore delete mode 100644 dep/libmpq/win/VC100/.gitignore delete mode 100644 dep/libmpq/win/VC90/.gitignore delete mode 100644 win/.gitignore delete mode 100644 win/VC80/.gitignore delete mode 100644 win/VC90/.gitignore diff --git a/.gitignore b/.gitignore index 6b5394b19..339bb947e 100644 --- a/.gitignore +++ b/.gitignore @@ -68,7 +68,32 @@ patches-* # bin/* +# +# VS temporary files +# +*.ncb +*.suo +*.sdf +*.opensdf +*.sln.cache +*.vsp +ipch +*__Win32_Debug* +*__x64_Debug* +*__Win32_Release* +*__x64_Release* +*.user + +# +# CMake temporary files +# +CMakeFiles +CMakeCache.txt +cmake_install.cmake + +# # OS specific +# # MacOS .DS_Store diff --git a/contrib/extractor/.gitignore b/contrib/extractor/.gitignore index c0dea6d25..7b922ae1e 100644 --- a/contrib/extractor/.gitignore +++ b/contrib/extractor/.gitignore @@ -7,17 +7,12 @@ # command after changing this file, to see if there are # any tracked files which get ignored after the change. # -# Extractor generated files at Windows build +# MaNGOS generated files at Windows build # *.bsc -*.ncb *.pdb -*.suo -*.sdf debug release -ipch -*.user *.ilk -ad_debug.exe \ No newline at end of file +ad_debug.exe diff --git a/contrib/git_id/.gitignore b/contrib/git_id/.gitignore index cc5f44622..2733a315a 100644 --- a/contrib/git_id/.gitignore +++ b/contrib/git_id/.gitignore @@ -11,14 +11,6 @@ # *.bsc -*.ncb *.pdb -*.suo -*.sdf -*.opensdf -*.sln.cache -*.vsp -ipch Debug Release -*.user diff --git a/contrib/vmap_assembler/.gitignore b/contrib/vmap_assembler/.gitignore index 8aa88368a..ee7b95b83 100644 --- a/contrib/vmap_assembler/.gitignore +++ b/contrib/vmap_assembler/.gitignore @@ -10,15 +10,4 @@ # MaNGOS generated files at Windows build # -*.ncb -*.suo -*.sdf -*.opensdf bin - -# CMake files - -CMakeFiles -CMakeCache.txt -cmake_install.cmake - diff --git a/contrib/vmap_assembler/VC100/.gitignore b/contrib/vmap_assembler/VC100/.gitignore deleted file mode 100644 index 384744b68..000000000 --- a/contrib/vmap_assembler/VC100/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ - -*.user -bin \ No newline at end of file diff --git a/contrib/vmap_assembler/VC80/.gitignore b/contrib/vmap_assembler/VC80/.gitignore deleted file mode 100644 index 494fd0b9d..000000000 --- a/contrib/vmap_assembler/VC80/.gitignore +++ /dev/null @@ -1,14 +0,0 @@ -# -# NOTE! Don't add files that are generated in specific -# subdirectories here. Add them in the ".gitignore" file -# in that subdirectory instead. -# -# NOTE! Please use 'git-ls-files -i --exclude-standard' -# command after changing this file, to see if there are -# any tracked files which get ignored after the change. -# -# MaNGOS generated files at Windows build -# - -*.user -bin \ No newline at end of file diff --git a/contrib/vmap_assembler/VC90/.gitignore b/contrib/vmap_assembler/VC90/.gitignore deleted file mode 100644 index 494fd0b9d..000000000 --- a/contrib/vmap_assembler/VC90/.gitignore +++ /dev/null @@ -1,14 +0,0 @@ -# -# NOTE! Don't add files that are generated in specific -# subdirectories here. Add them in the ".gitignore" file -# in that subdirectory instead. -# -# NOTE! Please use 'git-ls-files -i --exclude-standard' -# command after changing this file, to see if there are -# any tracked files which get ignored after the change. -# -# MaNGOS generated files at Windows build -# - -*.user -bin \ No newline at end of file diff --git a/contrib/vmap_extractor_v3/.gitignore b/contrib/vmap_extractor_v3/.gitignore index 6128066ce..ee7b95b83 100644 --- a/contrib/vmap_extractor_v3/.gitignore +++ b/contrib/vmap_extractor_v3/.gitignore @@ -11,10 +11,3 @@ # bin - -# CMake files - -CMakeFiles -CMakeCache.txt -cmake_install.cmake - diff --git a/contrib/vmap_extractor_v3/vmapextract/.gitignore b/contrib/vmap_extractor_v3/vmapextract/.gitignore deleted file mode 100644 index 79b30acc5..000000000 --- a/contrib/vmap_extractor_v3/vmapextract/.gitignore +++ /dev/null @@ -1,18 +0,0 @@ -# -# NOTE! Don't add files that are generated in specific -# subdirectories here. Add them in the ".gitignore" file -# in that subdirectory instead. -# -# NOTE! Please use 'git-ls-files -i --exclude-standard' -# command after changing this file, to see if there are -# any tracked files which get ignored after the change. -# -# MaNGOS generated files at Windows build -# - -# CMake files - -CMakeFiles -CMakeCache.txt -cmake_install.cmake - diff --git a/contrib/vmap_extractor_v3/win/.gitignore b/contrib/vmap_extractor_v3/win/.gitignore deleted file mode 100644 index 68e3872f1..000000000 --- a/contrib/vmap_extractor_v3/win/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ - -*.opensdf -*.ncb -*.sdf -*.suo -bin -ipch \ No newline at end of file diff --git a/contrib/vmap_extractor_v3/win/VC100/.gitignore b/contrib/vmap_extractor_v3/win/VC100/.gitignore deleted file mode 100644 index 4fb7be5e4..000000000 --- a/contrib/vmap_extractor_v3/win/VC100/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ - -*.user \ No newline at end of file diff --git a/contrib/vmap_extractor_v3/win/VC90/.gitignore b/contrib/vmap_extractor_v3/win/VC90/.gitignore deleted file mode 100644 index 4fb7be5e4..000000000 --- a/contrib/vmap_extractor_v3/win/VC90/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ - -*.user \ No newline at end of file diff --git a/dep/libmpq/.gitignore b/dep/libmpq/.gitignore index 36f30b00f..ee7b95b83 100644 --- a/dep/libmpq/.gitignore +++ b/dep/libmpq/.gitignore @@ -1,2 +1,13 @@ +# +# NOTE! Don't add files that are generated in specific +# subdirectories here. Add them in the ".gitignore" file +# in that subdirectory instead. +# +# NOTE! Please use 'git-ls-files -i --exclude-standard' +# command after changing this file, to see if there are +# any tracked files which get ignored after the change. +# +# MaNGOS generated files at Windows build +# -bin \ No newline at end of file +bin diff --git a/dep/libmpq/win/.gitignore b/dep/libmpq/win/.gitignore deleted file mode 100644 index 6fd3935c7..000000000 --- a/dep/libmpq/win/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ - -*.sdf -*.suo -bin -ipch \ No newline at end of file diff --git a/dep/libmpq/win/VC100/.gitignore b/dep/libmpq/win/VC100/.gitignore deleted file mode 100644 index 4fb7be5e4..000000000 --- a/dep/libmpq/win/VC100/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ - -*.user \ No newline at end of file diff --git a/dep/libmpq/win/VC90/.gitignore b/dep/libmpq/win/VC90/.gitignore deleted file mode 100644 index 4fb7be5e4..000000000 --- a/dep/libmpq/win/VC90/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ - -*.user \ No newline at end of file diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index ac1f7b37b..e3d858752 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "10462" + #define REVISION_NR "10463" #endif // __REVISION_NR_H__ diff --git a/win/.gitignore b/win/.gitignore deleted file mode 100644 index 02b83f963..000000000 --- a/win/.gitignore +++ /dev/null @@ -1,19 +0,0 @@ -# -# NOTE! Don't add files that are generated in specific -# subdirectories here. Add them in the ".gitignore" file -# in that subdirectory instead. -# -# NOTE! Please use 'git-ls-files -i --exclude-standard' -# command after changing this file, to see if there are -# any tracked files which get ignored after the change. -# -# MaNGOS generated files at Windows build -# - -*.ncb -*.suo -*.sdf -*.opensdf -*.sln.cache -*.vsp -ipch diff --git a/win/VC100/.gitignore b/win/VC100/.gitignore index 4997f210c..9fc0a3340 100644 --- a/win/VC100/.gitignore +++ b/win/VC100/.gitignore @@ -10,9 +10,4 @@ # MaNGOS generated files at Windows build # -*__Win32_Debug* -*__x64_Debug* -*__Win32_Release* -*__x64_Release* -*.user *.log diff --git a/win/VC80/.gitignore b/win/VC80/.gitignore deleted file mode 100644 index 5c035e465..000000000 --- a/win/VC80/.gitignore +++ /dev/null @@ -1,17 +0,0 @@ -# -# NOTE! Don't add files that are generated in specific -# subdirectories here. Add them in the ".gitignore" file -# in that subdirectory instead. -# -# NOTE! Please use 'git-ls-files -i --exclude-standard' -# command after changing this file, to see if there are -# any tracked files which get ignored after the change. -# -# MaNGOS generated files at Windows build -# - -*__Win32_Debug* -*__x64_Debug* -*__Win32_Release* -*__x64_Release* -*.user diff --git a/win/VC90/.gitignore b/win/VC90/.gitignore deleted file mode 100644 index 5c035e465..000000000 --- a/win/VC90/.gitignore +++ /dev/null @@ -1,17 +0,0 @@ -# -# NOTE! Don't add files that are generated in specific -# subdirectories here. Add them in the ".gitignore" file -# in that subdirectory instead. -# -# NOTE! Please use 'git-ls-files -i --exclude-standard' -# command after changing this file, to see if there are -# any tracked files which get ignored after the change. -# -# MaNGOS generated files at Windows build -# - -*__Win32_Debug* -*__x64_Debug* -*__Win32_Release* -*__x64_Release* -*.user