Merge pull request #199 from aquileia/ignore

Restructure and merge .gitignore files

.gitignore

@@ -1,77 +1,163 @@
-.settings
-.project
-.cproject
-.pydevproject
-revision.h
-*.swp
-.DS_Store
-make_translation
-merge_translations
+# extension txt
+*.txt
+!README.txt
+!readme.txt
+!COPYING.txt
+!imagemagick_command.txt
+!utils/umc_dev/org.wesnoth/templates/**/*.txt
+
+# project files
+.*project
+Project.*
+
+# Makefiles
 Makefile
-autom4te.cache
-stamp-h1
-.libs
+Makefile.in
+
+# cmake
+CMakeFiles
+CMakeLists.txt.user*
+cmake_install.cmake
+CPack*Config.cmake
+uninstall.cmake
+CMakeCache.txt
+CMakeLists.txt
+!doc/**/CMakeLists.txt
+!src/ana/**/CMakeLists.txt
+
+# scons
+.scons-option-cache
+*sconsign.dblite
+.sconf_temp
+
+# win32/MSVC:
+ALL_BUILD.vcproj
+INSTALL.vcproj
+PACKAGE.vcproj
+ZERO_CHECK.vcproj
+uninstall.vcproj
+*.vcproj.*.user
+projectfiles/VC[12]*
+
+# XCode
+projectfiles/Xcode/**/build
+projectfiles/Xcode/**/Headers
+projectfiles/Xcode/**/Wesnoth.dmgCanvas
+projectfiles/Xcode/**/*.mode1v3
+projectfiles/Xcode/**/*.pbxuser
+projectfiles/Xcode/**/xcuserdata
+projectfiles/Xcode/**/project.xcworkspace
+
+# CodeBlocks
+projectfiles/**/.clang
+projectfiles/**/wesnoth.tags
+projectfiles/**/wesnoth.workspace.*
+projectfiles/**/*.depend
+projectfiles/**/*.layout
+projectfiles/**/*_build_log.html
+projectfiles/**/*objs*
+
+# eclipse
+.settings
+!utils/umc_dev/org.wesnoth*/.settings/
+!utils/umc_dev/org.wesnoth*/.project
+
+# autotools
 config.h
+config.h.in
 config.log
 config.status
+configure
 configure.lineno
-Makefile.in
 aclocal.m4
-config.h.in
-configure
-.scons-option-cache
-.sconsign.dblite
-.sconf_temp
-CMakeFiles
-CMakeLists.txt.user
-CMakeLists.txt.user.*
-cmake_install.cmake
-CPackConfig.cmake
-CPackSourceConfig.cmake
-uninstall.cmake
-translations
-6not
+autom4te.cache
+stamp-h1
+
+# build directories
+/wesnothd*
+/wesnoth*
+/campaignd*
+/cutter*
+/exploder*
+/build/
+Release
 Debug
+ReleaseDEBUG
+Debug (fast)
 tags
+
+# build results ect.
 wesnoth.exp
 wesnoth.ilk
 wesnoth.lib
 wesnoth.ncb
+wesnoth.suo
 wesnoth.opt
 wesnoth.plg
-userdata
-Lib
 *.exe
 *.dll
-*.txt
-boost_test_result.xml
-/wesnothd*
+
+# library files
+.libs
+[Ll]ib
+!data/ai/formula/lib/
+!src/gui/lib/
+
+# release-only directories
+translations
+userdata
+
+# testing
 /test*
-/wesnoth*
-/campaignd*
-/cutter*
-/exploder*
-/build/
+!/test_wrapper.sh
+error*.log
+do_build_and_tests.sh
+boost_test_result.xml
+
+# translations
 locales
-.kdev_include_paths
-.kdev4
-cmake/Linux/CodeBlocks:
-Project.cbp
-Project.layout
-#cmake/win32/MSVC:
-ALL_BUILD.vcproj
-INSTALL.vcproj
-PACKAGE.vcproj
-Project.sln
-ZERO_CHECK.vcproj
-uninstall.vcproj
-Project.ncb
-Project.suo
-*.vcproj.*.user
-projectfiles/VC1*
-projectfiles/VC201*
+make_translation
+merge_translations
+*.gmo
+po/**/[a-z][a-z]
+po/**/[a-z][a-z]_[GB]R
+po/**/POTFILES
+po/**/pot-update.sh
+po/**/stamp-po
+po/**/remove-potcdate.s*
+po/**/Makefile*
+!po/wesnoth-manpages/Makefile
+!po/wesnoth-manual/Makefile
+
+# tools
+data/tools/unit_tree/**/files
+data/tools/unit_tree/**/reports
+data/tools/unit_tree/**/Locale
+
+# doc
+doc/doxygen/**/html
+doc/manual/**/*.xml
+
+# file for loading lua from within test scenario on-the-fly
+data/lua/**/code.lua
+
+# previous .gitignore files
+po/**/.gitignore
+images/**/.gitignore
+data/core/images/**/.gitignore
+data/campaigns/**/images/**/.gitignore
+
+# OS created files
+.DS_Store
+[Tt]humbs.db
 *Neuer Ordner*
-Thumbs.db
-error.log
-errors.log
-do_build_and_tests.sh
+
+# uncategorized
+*.pyc
+*.swp
+*.pbl
+*.xhtml
+*.[ao]
+revision.h
+6not
+.kdev*