From 9b1fea031f51cf9e811c02bc8ea3aa5356152d46 Mon Sep 17 00:00:00 2001 From: aquileia Date: Sat, 7 Jun 2014 23:49:17 +0200 Subject: [PATCH 01/14] Restructure .gitignore file --- .gitignore | 127 ++++++++++++++++++++++++++++------------------------- 1 file changed, 68 insertions(+), 59 deletions(-) diff --git a/.gitignore b/.gitignore index ffd3ef371a64..1a9167dc5ad7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,77 +1,86 @@ -.settings -.project -.cproject -.pydevproject -revision.h -*.swp -.DS_Store -make_translation -merge_translations -Makefile -autom4te.cache -stamp-h1 -.libs -config.h -config.log -config.status -configure.lineno -Makefile.in -aclocal.m4 -config.h.in -configure -.scons-option-cache -.sconsign.dblite -.sconf_temp +# project files +.*project +Project.* + +# cmake CMakeFiles -CMakeLists.txt.user -CMakeLists.txt.user.* +CMakeLists.txt.user* cmake_install.cmake -CPackConfig.cmake -CPackSourceConfig.cmake +CPack*Config.cmake uninstall.cmake -translations -6not + +# 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]* + +# build directories +/wesnothd* +/test* +/wesnoth* +/campaignd* +/cutter* +/exploder* +/build/ Debug tags + +# build results ect. wesnoth.exp wesnoth.ilk wesnoth.lib wesnoth.ncb wesnoth.opt wesnoth.plg -userdata -Lib *.exe *.dll + +# library files +.libs +Lib + +# release-only directories +translations +userdata + +# configuration +config.h +config.h.in +config.log +config.status +configure +configure.lineno + +# OS created files +.DS_Store +Thumbs.db + +# uncategorized +.settings *.txt +*.swp +*.gmo +make_translation +merge_translations +Makefile +Makefile.in +autom4te.cache +stamp-h1 +revision.h +aclocal.m4 +6not boost_test_result.xml -/wesnothd* -/test* -/wesnoth* -/campaignd* -/cutter* -/exploder* -/build/ 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* +.kdev* *Neuer Ordner* -Thumbs.db -error.log -errors.log +error*.log do_build_and_tests.sh From f30a332963c2758de05837637b13cddebc21e2ec Mon Sep 17 00:00:00 2001 From: aquileia Date: Sun, 8 Jun 2014 16:14:06 +0200 Subject: [PATCH 02/14] gitignore: Restructure existing rules Organize the rules into groups corresponding to the tools creating these files. Use blank lines and comments for clarity. --- .gitignore | 51 +++++++++++++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 22 deletions(-) diff --git a/.gitignore b/.gitignore index 1a9167dc5ad7..e01ab859b8b8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +# extension txt +*.txt + # project files .*project Project.* @@ -23,9 +26,22 @@ uninstall.vcproj *.vcproj.*.user projectfiles/VC[12]* +# eclipse +.settings + +# autotools +config.h +config.h.in +config.log +config.status +configure +configure.lineno +aclocal.m4 +autom4te.cache +stamp-h1 + # build directories /wesnothd* -/test* /wesnoth* /campaignd* /cutter* @@ -52,35 +68,26 @@ Lib translations userdata -# configuration -config.h -config.h.in -config.log -config.status -configure -configure.lineno +# testing +/test* +error*.log +do_build_and_tests.sh +boost_test_result.xml + +# translations +locales +make_translation +merge_translations # OS created files .DS_Store -Thumbs.db +[Tt]humbs.db +*Neuer Ordner* # uncategorized -.settings -*.txt *.swp -*.gmo -make_translation -merge_translations Makefile Makefile.in -autom4te.cache -stamp-h1 revision.h -aclocal.m4 6not -boost_test_result.xml -locales .kdev* -*Neuer Ordner* -error*.log -do_build_and_tests.sh From 88d3d76c1234f09ccac0ffbd90832336e798908a Mon Sep 17 00:00:00 2001 From: aquileia Date: Sun, 8 Jun 2014 16:19:05 +0200 Subject: [PATCH 03/14] gitignore: Keep README and COPYING files --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index e01ab859b8b8..9a9b1ea0c7a1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,8 @@ # extension txt *.txt +!README.txt +!readme.txt +!COPYING.txt # project files .*project From cdd8b932ee6c602db5220753562a0e080f420f37 Mon Sep 17 00:00:00 2001 From: aquileia Date: Sun, 8 Jun 2014 16:27:14 +0200 Subject: [PATCH 04/14] gitignore: Additional cmake rules --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index 9a9b1ea0c7a1..ad88cd5278b6 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,10 @@ 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 From af9761fa81f2758c7f62368b7c39422ff9c70a3b Mon Sep 17 00:00:00 2001 From: aquileia Date: Sun, 8 Jun 2014 17:00:29 +0200 Subject: [PATCH 05/14] gitignore: Merge rules from po/**/.gitignore files --- .gitignore | 11 +++++++++++ po/.gitignore | 24 ------------------------ po/wesnoth-ai/.gitignore | 10 ---------- po/wesnoth-anl/.gitignore | 10 ---------- po/wesnoth-aoi/.gitignore | 11 ----------- po/wesnoth-did/.gitignore | 10 ---------- po/wesnoth-dw/.gitignore | 10 ---------- po/wesnoth-editor/.gitignore | 10 ---------- po/wesnoth-ei/.gitignore | 10 ---------- po/wesnoth-help/.gitignore | 11 ----------- po/wesnoth-httt/.gitignore | 10 ---------- po/wesnoth-l/.gitignore | 11 ----------- po/wesnoth-lib/.gitignore | 10 ---------- po/wesnoth-low/.gitignore | 10 ---------- po/wesnoth-manpages/.gitignore | 2 -- po/wesnoth-manual/.gitignore | 2 -- po/wesnoth-multiplayer/.gitignore | 10 ---------- po/wesnoth-nr/.gitignore | 10 ---------- po/wesnoth-sof/.gitignore | 11 ----------- po/wesnoth-sotbe/.gitignore | 10 ---------- po/wesnoth-tb/.gitignore | 10 ---------- po/wesnoth-test/.gitignore | 10 ---------- po/wesnoth-thot/.gitignore | 11 ----------- po/wesnoth-trow/.gitignore | 10 ---------- po/wesnoth-tsg/.gitignore | 10 ---------- po/wesnoth-tutorial/.gitignore | 10 ---------- po/wesnoth-units/.gitignore | 10 ---------- po/wesnoth/.gitignore | 10 ---------- 28 files changed, 11 insertions(+), 273 deletions(-) delete mode 100644 po/.gitignore delete mode 100644 po/wesnoth-ai/.gitignore delete mode 100644 po/wesnoth-anl/.gitignore delete mode 100644 po/wesnoth-aoi/.gitignore delete mode 100644 po/wesnoth-did/.gitignore delete mode 100644 po/wesnoth-dw/.gitignore delete mode 100644 po/wesnoth-editor/.gitignore delete mode 100644 po/wesnoth-ei/.gitignore delete mode 100644 po/wesnoth-help/.gitignore delete mode 100644 po/wesnoth-httt/.gitignore delete mode 100644 po/wesnoth-l/.gitignore delete mode 100644 po/wesnoth-lib/.gitignore delete mode 100644 po/wesnoth-low/.gitignore delete mode 100644 po/wesnoth-manpages/.gitignore delete mode 100644 po/wesnoth-manual/.gitignore delete mode 100644 po/wesnoth-multiplayer/.gitignore delete mode 100644 po/wesnoth-nr/.gitignore delete mode 100644 po/wesnoth-sof/.gitignore delete mode 100644 po/wesnoth-sotbe/.gitignore delete mode 100644 po/wesnoth-tb/.gitignore delete mode 100644 po/wesnoth-test/.gitignore delete mode 100644 po/wesnoth-thot/.gitignore delete mode 100644 po/wesnoth-trow/.gitignore delete mode 100644 po/wesnoth-tsg/.gitignore delete mode 100644 po/wesnoth-tutorial/.gitignore delete mode 100644 po/wesnoth-units/.gitignore delete mode 100644 po/wesnoth/.gitignore diff --git a/.gitignore b/.gitignore index ad88cd5278b6..5087581dd46d 100644 --- a/.gitignore +++ b/.gitignore @@ -85,6 +85,17 @@ boost_test_result.xml locales make_translation merge_translations +*.gmo +po/**/.gitignore +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 # OS created files .DS_Store diff --git a/po/.gitignore b/po/.gitignore deleted file mode 100644 index f31ab0d92d49..000000000000 --- a/po/.gitignore +++ /dev/null @@ -1,24 +0,0 @@ -CMakeCache.txt -CMakeFiles -cmake_install.cmake -pot-update.sh -Makefile.in -Makefile -ca -cs -da -de -el_GR -es -eu -fi -fr -hu -it -nl -no -pl -pt_BR -ru -sk -sv diff --git a/po/wesnoth-ai/.gitignore b/po/wesnoth-ai/.gitignore deleted file mode 100644 index 6da8de9ced94..000000000000 --- a/po/wesnoth-ai/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -CMakeCache.txt -CMakeFiles -cmake_install.cmake -Makefile -Makefile.in -Makefile.in.in -POTFILES -stamp-po -remove-potcdate.sed -*.gmo diff --git a/po/wesnoth-anl/.gitignore b/po/wesnoth-anl/.gitignore deleted file mode 100644 index 6da8de9ced94..000000000000 --- a/po/wesnoth-anl/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -CMakeCache.txt -CMakeFiles -cmake_install.cmake -Makefile -Makefile.in -Makefile.in.in -POTFILES -stamp-po -remove-potcdate.sed -*.gmo diff --git a/po/wesnoth-aoi/.gitignore b/po/wesnoth-aoi/.gitignore deleted file mode 100644 index 2c60f24bce7a..000000000000 --- a/po/wesnoth-aoi/.gitignore +++ /dev/null @@ -1,11 +0,0 @@ -CMakeCache.txt -CMakeFiles -cmake_install.cmake -Makefile -Makefile.in -Makefile.in.in -POTFILES -stamp-po -remove-potcdate.sed -*.gmo - diff --git a/po/wesnoth-did/.gitignore b/po/wesnoth-did/.gitignore deleted file mode 100644 index 6da8de9ced94..000000000000 --- a/po/wesnoth-did/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -CMakeCache.txt -CMakeFiles -cmake_install.cmake -Makefile -Makefile.in -Makefile.in.in -POTFILES -stamp-po -remove-potcdate.sed -*.gmo diff --git a/po/wesnoth-dw/.gitignore b/po/wesnoth-dw/.gitignore deleted file mode 100644 index 6da8de9ced94..000000000000 --- a/po/wesnoth-dw/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -CMakeCache.txt -CMakeFiles -cmake_install.cmake -Makefile -Makefile.in -Makefile.in.in -POTFILES -stamp-po -remove-potcdate.sed -*.gmo diff --git a/po/wesnoth-editor/.gitignore b/po/wesnoth-editor/.gitignore deleted file mode 100644 index 6da8de9ced94..000000000000 --- a/po/wesnoth-editor/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -CMakeCache.txt -CMakeFiles -cmake_install.cmake -Makefile -Makefile.in -Makefile.in.in -POTFILES -stamp-po -remove-potcdate.sed -*.gmo diff --git a/po/wesnoth-ei/.gitignore b/po/wesnoth-ei/.gitignore deleted file mode 100644 index 6da8de9ced94..000000000000 --- a/po/wesnoth-ei/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -CMakeCache.txt -CMakeFiles -cmake_install.cmake -Makefile -Makefile.in -Makefile.in.in -POTFILES -stamp-po -remove-potcdate.sed -*.gmo diff --git a/po/wesnoth-help/.gitignore b/po/wesnoth-help/.gitignore deleted file mode 100644 index 2c60f24bce7a..000000000000 --- a/po/wesnoth-help/.gitignore +++ /dev/null @@ -1,11 +0,0 @@ -CMakeCache.txt -CMakeFiles -cmake_install.cmake -Makefile -Makefile.in -Makefile.in.in -POTFILES -stamp-po -remove-potcdate.sed -*.gmo - diff --git a/po/wesnoth-httt/.gitignore b/po/wesnoth-httt/.gitignore deleted file mode 100644 index 6da8de9ced94..000000000000 --- a/po/wesnoth-httt/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -CMakeCache.txt -CMakeFiles -cmake_install.cmake -Makefile -Makefile.in -Makefile.in.in -POTFILES -stamp-po -remove-potcdate.sed -*.gmo diff --git a/po/wesnoth-l/.gitignore b/po/wesnoth-l/.gitignore deleted file mode 100644 index 2c60f24bce7a..000000000000 --- a/po/wesnoth-l/.gitignore +++ /dev/null @@ -1,11 +0,0 @@ -CMakeCache.txt -CMakeFiles -cmake_install.cmake -Makefile -Makefile.in -Makefile.in.in -POTFILES -stamp-po -remove-potcdate.sed -*.gmo - diff --git a/po/wesnoth-lib/.gitignore b/po/wesnoth-lib/.gitignore deleted file mode 100644 index 6da8de9ced94..000000000000 --- a/po/wesnoth-lib/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -CMakeCache.txt -CMakeFiles -cmake_install.cmake -Makefile -Makefile.in -Makefile.in.in -POTFILES -stamp-po -remove-potcdate.sed -*.gmo diff --git a/po/wesnoth-low/.gitignore b/po/wesnoth-low/.gitignore deleted file mode 100644 index 6da8de9ced94..000000000000 --- a/po/wesnoth-low/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -CMakeCache.txt -CMakeFiles -cmake_install.cmake -Makefile -Makefile.in -Makefile.in.in -POTFILES -stamp-po -remove-potcdate.sed -*.gmo diff --git a/po/wesnoth-manpages/.gitignore b/po/wesnoth-manpages/.gitignore deleted file mode 100644 index bc9799188e83..000000000000 --- a/po/wesnoth-manpages/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -CMakeFiles -cmake_install.cmake diff --git a/po/wesnoth-manual/.gitignore b/po/wesnoth-manual/.gitignore deleted file mode 100644 index bc9799188e83..000000000000 --- a/po/wesnoth-manual/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -CMakeFiles -cmake_install.cmake diff --git a/po/wesnoth-multiplayer/.gitignore b/po/wesnoth-multiplayer/.gitignore deleted file mode 100644 index 6da8de9ced94..000000000000 --- a/po/wesnoth-multiplayer/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -CMakeCache.txt -CMakeFiles -cmake_install.cmake -Makefile -Makefile.in -Makefile.in.in -POTFILES -stamp-po -remove-potcdate.sed -*.gmo diff --git a/po/wesnoth-nr/.gitignore b/po/wesnoth-nr/.gitignore deleted file mode 100644 index 6da8de9ced94..000000000000 --- a/po/wesnoth-nr/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -CMakeCache.txt -CMakeFiles -cmake_install.cmake -Makefile -Makefile.in -Makefile.in.in -POTFILES -stamp-po -remove-potcdate.sed -*.gmo diff --git a/po/wesnoth-sof/.gitignore b/po/wesnoth-sof/.gitignore deleted file mode 100644 index 2c60f24bce7a..000000000000 --- a/po/wesnoth-sof/.gitignore +++ /dev/null @@ -1,11 +0,0 @@ -CMakeCache.txt -CMakeFiles -cmake_install.cmake -Makefile -Makefile.in -Makefile.in.in -POTFILES -stamp-po -remove-potcdate.sed -*.gmo - diff --git a/po/wesnoth-sotbe/.gitignore b/po/wesnoth-sotbe/.gitignore deleted file mode 100644 index 6da8de9ced94..000000000000 --- a/po/wesnoth-sotbe/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -CMakeCache.txt -CMakeFiles -cmake_install.cmake -Makefile -Makefile.in -Makefile.in.in -POTFILES -stamp-po -remove-potcdate.sed -*.gmo diff --git a/po/wesnoth-tb/.gitignore b/po/wesnoth-tb/.gitignore deleted file mode 100644 index 6da8de9ced94..000000000000 --- a/po/wesnoth-tb/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -CMakeCache.txt -CMakeFiles -cmake_install.cmake -Makefile -Makefile.in -Makefile.in.in -POTFILES -stamp-po -remove-potcdate.sed -*.gmo diff --git a/po/wesnoth-test/.gitignore b/po/wesnoth-test/.gitignore deleted file mode 100644 index 6da8de9ced94..000000000000 --- a/po/wesnoth-test/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -CMakeCache.txt -CMakeFiles -cmake_install.cmake -Makefile -Makefile.in -Makefile.in.in -POTFILES -stamp-po -remove-potcdate.sed -*.gmo diff --git a/po/wesnoth-thot/.gitignore b/po/wesnoth-thot/.gitignore deleted file mode 100644 index 2c60f24bce7a..000000000000 --- a/po/wesnoth-thot/.gitignore +++ /dev/null @@ -1,11 +0,0 @@ -CMakeCache.txt -CMakeFiles -cmake_install.cmake -Makefile -Makefile.in -Makefile.in.in -POTFILES -stamp-po -remove-potcdate.sed -*.gmo - diff --git a/po/wesnoth-trow/.gitignore b/po/wesnoth-trow/.gitignore deleted file mode 100644 index 6da8de9ced94..000000000000 --- a/po/wesnoth-trow/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -CMakeCache.txt -CMakeFiles -cmake_install.cmake -Makefile -Makefile.in -Makefile.in.in -POTFILES -stamp-po -remove-potcdate.sed -*.gmo diff --git a/po/wesnoth-tsg/.gitignore b/po/wesnoth-tsg/.gitignore deleted file mode 100644 index 6da8de9ced94..000000000000 --- a/po/wesnoth-tsg/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -CMakeCache.txt -CMakeFiles -cmake_install.cmake -Makefile -Makefile.in -Makefile.in.in -POTFILES -stamp-po -remove-potcdate.sed -*.gmo diff --git a/po/wesnoth-tutorial/.gitignore b/po/wesnoth-tutorial/.gitignore deleted file mode 100644 index 6da8de9ced94..000000000000 --- a/po/wesnoth-tutorial/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -CMakeCache.txt -CMakeFiles -cmake_install.cmake -Makefile -Makefile.in -Makefile.in.in -POTFILES -stamp-po -remove-potcdate.sed -*.gmo diff --git a/po/wesnoth-units/.gitignore b/po/wesnoth-units/.gitignore deleted file mode 100644 index 6da8de9ced94..000000000000 --- a/po/wesnoth-units/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -CMakeCache.txt -CMakeFiles -cmake_install.cmake -Makefile -Makefile.in -Makefile.in.in -POTFILES -stamp-po -remove-potcdate.sed -*.gmo diff --git a/po/wesnoth/.gitignore b/po/wesnoth/.gitignore deleted file mode 100644 index 6da8de9ced94..000000000000 --- a/po/wesnoth/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -CMakeCache.txt -CMakeFiles -cmake_install.cmake -Makefile -Makefile.in -Makefile.in.in -POTFILES -stamp-po -remove-potcdate.sed -*.gmo From 665a2974458024aa7994467449c9f872f6ced0d0 Mon Sep 17 00:00:00 2001 From: aquileia Date: Sun, 8 Jun 2014 17:02:00 +0200 Subject: [PATCH 06/14] Remove unnecessary translation scripts The new gitignore rules will automatically ignore these. --- po/wesnoth-ai/remove-potcdate.sin | 19 ------------------- po/wesnoth-anl/remove-potcdate.sin | 19 ------------------- po/wesnoth-aoi/remove-potcdate.sin | 19 ------------------- po/wesnoth-did/remove-potcdate.sin | 19 ------------------- po/wesnoth-dm/remove-potcdate.sin | 19 ------------------- po/wesnoth-dw/remove-potcdate.sin | 19 ------------------- po/wesnoth-editor/remove-potcdate.sin | 19 ------------------- po/wesnoth-ei/remove-potcdate.sin | 19 ------------------- po/wesnoth-httt/remove-potcdate.sin | 19 ------------------- po/wesnoth-l/remove-potcdate.sin | 19 ------------------- po/wesnoth-lib/remove-potcdate.sin | 19 ------------------- po/wesnoth-low/remove-potcdate.sin | 19 ------------------- po/wesnoth-multiplayer/remove-potcdate.sin | 19 ------------------- po/wesnoth-nr/remove-potcdate.sin | 19 ------------------- po/wesnoth-sof/remove-potcdate.sin | 19 ------------------- po/wesnoth-sotbe/remove-potcdate.sin | 19 ------------------- po/wesnoth-tb/remove-potcdate.sin | 19 ------------------- po/wesnoth-test/remove-potcdate.sin | 19 ------------------- po/wesnoth-thot/remove-potcdate.sin | 19 ------------------- po/wesnoth-trow/remove-potcdate.sin | 19 ------------------- po/wesnoth-tsg/remove-potcdate.sin | 19 ------------------- po/wesnoth-tutorial/remove-potcdate.sin | 19 ------------------- po/wesnoth-units/remove-potcdate.sin | 19 ------------------- po/wesnoth-utbs/POTFILES.in | 0 po/wesnoth-utbs/remove-potcdate.sin | 19 ------------------- po/wesnoth/remove-potcdate.sin | 19 ------------------- 26 files changed, 475 deletions(-) delete mode 100644 po/wesnoth-ai/remove-potcdate.sin delete mode 100644 po/wesnoth-anl/remove-potcdate.sin delete mode 100644 po/wesnoth-aoi/remove-potcdate.sin delete mode 100644 po/wesnoth-did/remove-potcdate.sin delete mode 100644 po/wesnoth-dm/remove-potcdate.sin delete mode 100644 po/wesnoth-dw/remove-potcdate.sin delete mode 100644 po/wesnoth-editor/remove-potcdate.sin delete mode 100644 po/wesnoth-ei/remove-potcdate.sin delete mode 100644 po/wesnoth-httt/remove-potcdate.sin delete mode 100644 po/wesnoth-l/remove-potcdate.sin delete mode 100644 po/wesnoth-lib/remove-potcdate.sin delete mode 100644 po/wesnoth-low/remove-potcdate.sin delete mode 100644 po/wesnoth-multiplayer/remove-potcdate.sin delete mode 100644 po/wesnoth-nr/remove-potcdate.sin delete mode 100644 po/wesnoth-sof/remove-potcdate.sin delete mode 100644 po/wesnoth-sotbe/remove-potcdate.sin delete mode 100644 po/wesnoth-tb/remove-potcdate.sin delete mode 100644 po/wesnoth-test/remove-potcdate.sin delete mode 100644 po/wesnoth-thot/remove-potcdate.sin delete mode 100644 po/wesnoth-trow/remove-potcdate.sin delete mode 100644 po/wesnoth-tsg/remove-potcdate.sin delete mode 100644 po/wesnoth-tutorial/remove-potcdate.sin delete mode 100644 po/wesnoth-units/remove-potcdate.sin delete mode 100644 po/wesnoth-utbs/POTFILES.in delete mode 100644 po/wesnoth-utbs/remove-potcdate.sin delete mode 100644 po/wesnoth/remove-potcdate.sin diff --git a/po/wesnoth-ai/remove-potcdate.sin b/po/wesnoth-ai/remove-potcdate.sin deleted file mode 100644 index 2436c49e786d..000000000000 --- a/po/wesnoth-ai/remove-potcdate.sin +++ /dev/null @@ -1,19 +0,0 @@ -# Sed script that remove the POT-Creation-Date line in the header entry -# from a POT file. -# -# The distinction between the first and the following occurrences of the -# pattern is achieved by looking at the hold space. -/^"POT-Creation-Date: .*"$/{ -x -# Test if the hold space is empty. -s/P/P/ -ta -# Yes it was empty. First occurrence. Remove the line. -g -d -bb -:a -# The hold space was nonempty. Following occurrences. Do nothing. -x -:b -} diff --git a/po/wesnoth-anl/remove-potcdate.sin b/po/wesnoth-anl/remove-potcdate.sin deleted file mode 100644 index 2436c49e786d..000000000000 --- a/po/wesnoth-anl/remove-potcdate.sin +++ /dev/null @@ -1,19 +0,0 @@ -# Sed script that remove the POT-Creation-Date line in the header entry -# from a POT file. -# -# The distinction between the first and the following occurrences of the -# pattern is achieved by looking at the hold space. -/^"POT-Creation-Date: .*"$/{ -x -# Test if the hold space is empty. -s/P/P/ -ta -# Yes it was empty. First occurrence. Remove the line. -g -d -bb -:a -# The hold space was nonempty. Following occurrences. Do nothing. -x -:b -} diff --git a/po/wesnoth-aoi/remove-potcdate.sin b/po/wesnoth-aoi/remove-potcdate.sin deleted file mode 100644 index 169767bb7456..000000000000 --- a/po/wesnoth-aoi/remove-potcdate.sin +++ /dev/null @@ -1,19 +0,0 @@ -#Sed script that remove the POT-Creation-Date line in the header entry -# from a POT file. -# -# The distinction between the first and the following occurrences of the -# pattern is achieved by looking at the hold space. -/^"POT-Creation-Date: .*"$/{ -x -# Test if the hold space is empty. -s/P/P/ -ta -# Yes it was empty. First occurrence. Remove the line. -g -d -bb -:a -# The hold space was nonempty. Following occurrences. Do nothing. -x -:b -} diff --git a/po/wesnoth-did/remove-potcdate.sin b/po/wesnoth-did/remove-potcdate.sin deleted file mode 100644 index 169767bb7456..000000000000 --- a/po/wesnoth-did/remove-potcdate.sin +++ /dev/null @@ -1,19 +0,0 @@ -#Sed script that remove the POT-Creation-Date line in the header entry -# from a POT file. -# -# The distinction between the first and the following occurrences of the -# pattern is achieved by looking at the hold space. -/^"POT-Creation-Date: .*"$/{ -x -# Test if the hold space is empty. -s/P/P/ -ta -# Yes it was empty. First occurrence. Remove the line. -g -d -bb -:a -# The hold space was nonempty. Following occurrences. Do nothing. -x -:b -} diff --git a/po/wesnoth-dm/remove-potcdate.sin b/po/wesnoth-dm/remove-potcdate.sin deleted file mode 100644 index 169767bb7456..000000000000 --- a/po/wesnoth-dm/remove-potcdate.sin +++ /dev/null @@ -1,19 +0,0 @@ -#Sed script that remove the POT-Creation-Date line in the header entry -# from a POT file. -# -# The distinction between the first and the following occurrences of the -# pattern is achieved by looking at the hold space. -/^"POT-Creation-Date: .*"$/{ -x -# Test if the hold space is empty. -s/P/P/ -ta -# Yes it was empty. First occurrence. Remove the line. -g -d -bb -:a -# The hold space was nonempty. Following occurrences. Do nothing. -x -:b -} diff --git a/po/wesnoth-dw/remove-potcdate.sin b/po/wesnoth-dw/remove-potcdate.sin deleted file mode 100644 index 169767bb7456..000000000000 --- a/po/wesnoth-dw/remove-potcdate.sin +++ /dev/null @@ -1,19 +0,0 @@ -#Sed script that remove the POT-Creation-Date line in the header entry -# from a POT file. -# -# The distinction between the first and the following occurrences of the -# pattern is achieved by looking at the hold space. -/^"POT-Creation-Date: .*"$/{ -x -# Test if the hold space is empty. -s/P/P/ -ta -# Yes it was empty. First occurrence. Remove the line. -g -d -bb -:a -# The hold space was nonempty. Following occurrences. Do nothing. -x -:b -} diff --git a/po/wesnoth-editor/remove-potcdate.sin b/po/wesnoth-editor/remove-potcdate.sin deleted file mode 100644 index 2436c49e786d..000000000000 --- a/po/wesnoth-editor/remove-potcdate.sin +++ /dev/null @@ -1,19 +0,0 @@ -# Sed script that remove the POT-Creation-Date line in the header entry -# from a POT file. -# -# The distinction between the first and the following occurrences of the -# pattern is achieved by looking at the hold space. -/^"POT-Creation-Date: .*"$/{ -x -# Test if the hold space is empty. -s/P/P/ -ta -# Yes it was empty. First occurrence. Remove the line. -g -d -bb -:a -# The hold space was nonempty. Following occurrences. Do nothing. -x -:b -} diff --git a/po/wesnoth-ei/remove-potcdate.sin b/po/wesnoth-ei/remove-potcdate.sin deleted file mode 100644 index 2436c49e786d..000000000000 --- a/po/wesnoth-ei/remove-potcdate.sin +++ /dev/null @@ -1,19 +0,0 @@ -# Sed script that remove the POT-Creation-Date line in the header entry -# from a POT file. -# -# The distinction between the first and the following occurrences of the -# pattern is achieved by looking at the hold space. -/^"POT-Creation-Date: .*"$/{ -x -# Test if the hold space is empty. -s/P/P/ -ta -# Yes it was empty. First occurrence. Remove the line. -g -d -bb -:a -# The hold space was nonempty. Following occurrences. Do nothing. -x -:b -} diff --git a/po/wesnoth-httt/remove-potcdate.sin b/po/wesnoth-httt/remove-potcdate.sin deleted file mode 100644 index 2436c49e786d..000000000000 --- a/po/wesnoth-httt/remove-potcdate.sin +++ /dev/null @@ -1,19 +0,0 @@ -# Sed script that remove the POT-Creation-Date line in the header entry -# from a POT file. -# -# The distinction between the first and the following occurrences of the -# pattern is achieved by looking at the hold space. -/^"POT-Creation-Date: .*"$/{ -x -# Test if the hold space is empty. -s/P/P/ -ta -# Yes it was empty. First occurrence. Remove the line. -g -d -bb -:a -# The hold space was nonempty. Following occurrences. Do nothing. -x -:b -} diff --git a/po/wesnoth-l/remove-potcdate.sin b/po/wesnoth-l/remove-potcdate.sin deleted file mode 100644 index 169767bb7456..000000000000 --- a/po/wesnoth-l/remove-potcdate.sin +++ /dev/null @@ -1,19 +0,0 @@ -#Sed script that remove the POT-Creation-Date line in the header entry -# from a POT file. -# -# The distinction between the first and the following occurrences of the -# pattern is achieved by looking at the hold space. -/^"POT-Creation-Date: .*"$/{ -x -# Test if the hold space is empty. -s/P/P/ -ta -# Yes it was empty. First occurrence. Remove the line. -g -d -bb -:a -# The hold space was nonempty. Following occurrences. Do nothing. -x -:b -} diff --git a/po/wesnoth-lib/remove-potcdate.sin b/po/wesnoth-lib/remove-potcdate.sin deleted file mode 100644 index 2436c49e786d..000000000000 --- a/po/wesnoth-lib/remove-potcdate.sin +++ /dev/null @@ -1,19 +0,0 @@ -# Sed script that remove the POT-Creation-Date line in the header entry -# from a POT file. -# -# The distinction between the first and the following occurrences of the -# pattern is achieved by looking at the hold space. -/^"POT-Creation-Date: .*"$/{ -x -# Test if the hold space is empty. -s/P/P/ -ta -# Yes it was empty. First occurrence. Remove the line. -g -d -bb -:a -# The hold space was nonempty. Following occurrences. Do nothing. -x -:b -} diff --git a/po/wesnoth-low/remove-potcdate.sin b/po/wesnoth-low/remove-potcdate.sin deleted file mode 100644 index 2436c49e786d..000000000000 --- a/po/wesnoth-low/remove-potcdate.sin +++ /dev/null @@ -1,19 +0,0 @@ -# Sed script that remove the POT-Creation-Date line in the header entry -# from a POT file. -# -# The distinction between the first and the following occurrences of the -# pattern is achieved by looking at the hold space. -/^"POT-Creation-Date: .*"$/{ -x -# Test if the hold space is empty. -s/P/P/ -ta -# Yes it was empty. First occurrence. Remove the line. -g -d -bb -:a -# The hold space was nonempty. Following occurrences. Do nothing. -x -:b -} diff --git a/po/wesnoth-multiplayer/remove-potcdate.sin b/po/wesnoth-multiplayer/remove-potcdate.sin deleted file mode 100644 index 2436c49e786d..000000000000 --- a/po/wesnoth-multiplayer/remove-potcdate.sin +++ /dev/null @@ -1,19 +0,0 @@ -# Sed script that remove the POT-Creation-Date line in the header entry -# from a POT file. -# -# The distinction between the first and the following occurrences of the -# pattern is achieved by looking at the hold space. -/^"POT-Creation-Date: .*"$/{ -x -# Test if the hold space is empty. -s/P/P/ -ta -# Yes it was empty. First occurrence. Remove the line. -g -d -bb -:a -# The hold space was nonempty. Following occurrences. Do nothing. -x -:b -} diff --git a/po/wesnoth-nr/remove-potcdate.sin b/po/wesnoth-nr/remove-potcdate.sin deleted file mode 100644 index 2436c49e786d..000000000000 --- a/po/wesnoth-nr/remove-potcdate.sin +++ /dev/null @@ -1,19 +0,0 @@ -# Sed script that remove the POT-Creation-Date line in the header entry -# from a POT file. -# -# The distinction between the first and the following occurrences of the -# pattern is achieved by looking at the hold space. -/^"POT-Creation-Date: .*"$/{ -x -# Test if the hold space is empty. -s/P/P/ -ta -# Yes it was empty. First occurrence. Remove the line. -g -d -bb -:a -# The hold space was nonempty. Following occurrences. Do nothing. -x -:b -} diff --git a/po/wesnoth-sof/remove-potcdate.sin b/po/wesnoth-sof/remove-potcdate.sin deleted file mode 100644 index 169767bb7456..000000000000 --- a/po/wesnoth-sof/remove-potcdate.sin +++ /dev/null @@ -1,19 +0,0 @@ -#Sed script that remove the POT-Creation-Date line in the header entry -# from a POT file. -# -# The distinction between the first and the following occurrences of the -# pattern is achieved by looking at the hold space. -/^"POT-Creation-Date: .*"$/{ -x -# Test if the hold space is empty. -s/P/P/ -ta -# Yes it was empty. First occurrence. Remove the line. -g -d -bb -:a -# The hold space was nonempty. Following occurrences. Do nothing. -x -:b -} diff --git a/po/wesnoth-sotbe/remove-potcdate.sin b/po/wesnoth-sotbe/remove-potcdate.sin deleted file mode 100644 index 169767bb7456..000000000000 --- a/po/wesnoth-sotbe/remove-potcdate.sin +++ /dev/null @@ -1,19 +0,0 @@ -#Sed script that remove the POT-Creation-Date line in the header entry -# from a POT file. -# -# The distinction between the first and the following occurrences of the -# pattern is achieved by looking at the hold space. -/^"POT-Creation-Date: .*"$/{ -x -# Test if the hold space is empty. -s/P/P/ -ta -# Yes it was empty. First occurrence. Remove the line. -g -d -bb -:a -# The hold space was nonempty. Following occurrences. Do nothing. -x -:b -} diff --git a/po/wesnoth-tb/remove-potcdate.sin b/po/wesnoth-tb/remove-potcdate.sin deleted file mode 100644 index 2436c49e786d..000000000000 --- a/po/wesnoth-tb/remove-potcdate.sin +++ /dev/null @@ -1,19 +0,0 @@ -# Sed script that remove the POT-Creation-Date line in the header entry -# from a POT file. -# -# The distinction between the first and the following occurrences of the -# pattern is achieved by looking at the hold space. -/^"POT-Creation-Date: .*"$/{ -x -# Test if the hold space is empty. -s/P/P/ -ta -# Yes it was empty. First occurrence. Remove the line. -g -d -bb -:a -# The hold space was nonempty. Following occurrences. Do nothing. -x -:b -} diff --git a/po/wesnoth-test/remove-potcdate.sin b/po/wesnoth-test/remove-potcdate.sin deleted file mode 100644 index 2436c49e786d..000000000000 --- a/po/wesnoth-test/remove-potcdate.sin +++ /dev/null @@ -1,19 +0,0 @@ -# Sed script that remove the POT-Creation-Date line in the header entry -# from a POT file. -# -# The distinction between the first and the following occurrences of the -# pattern is achieved by looking at the hold space. -/^"POT-Creation-Date: .*"$/{ -x -# Test if the hold space is empty. -s/P/P/ -ta -# Yes it was empty. First occurrence. Remove the line. -g -d -bb -:a -# The hold space was nonempty. Following occurrences. Do nothing. -x -:b -} diff --git a/po/wesnoth-thot/remove-potcdate.sin b/po/wesnoth-thot/remove-potcdate.sin deleted file mode 100644 index 2436c49e786d..000000000000 --- a/po/wesnoth-thot/remove-potcdate.sin +++ /dev/null @@ -1,19 +0,0 @@ -# Sed script that remove the POT-Creation-Date line in the header entry -# from a POT file. -# -# The distinction between the first and the following occurrences of the -# pattern is achieved by looking at the hold space. -/^"POT-Creation-Date: .*"$/{ -x -# Test if the hold space is empty. -s/P/P/ -ta -# Yes it was empty. First occurrence. Remove the line. -g -d -bb -:a -# The hold space was nonempty. Following occurrences. Do nothing. -x -:b -} diff --git a/po/wesnoth-trow/remove-potcdate.sin b/po/wesnoth-trow/remove-potcdate.sin deleted file mode 100644 index 2436c49e786d..000000000000 --- a/po/wesnoth-trow/remove-potcdate.sin +++ /dev/null @@ -1,19 +0,0 @@ -# Sed script that remove the POT-Creation-Date line in the header entry -# from a POT file. -# -# The distinction between the first and the following occurrences of the -# pattern is achieved by looking at the hold space. -/^"POT-Creation-Date: .*"$/{ -x -# Test if the hold space is empty. -s/P/P/ -ta -# Yes it was empty. First occurrence. Remove the line. -g -d -bb -:a -# The hold space was nonempty. Following occurrences. Do nothing. -x -:b -} diff --git a/po/wesnoth-tsg/remove-potcdate.sin b/po/wesnoth-tsg/remove-potcdate.sin deleted file mode 100644 index 2436c49e786d..000000000000 --- a/po/wesnoth-tsg/remove-potcdate.sin +++ /dev/null @@ -1,19 +0,0 @@ -# Sed script that remove the POT-Creation-Date line in the header entry -# from a POT file. -# -# The distinction between the first and the following occurrences of the -# pattern is achieved by looking at the hold space. -/^"POT-Creation-Date: .*"$/{ -x -# Test if the hold space is empty. -s/P/P/ -ta -# Yes it was empty. First occurrence. Remove the line. -g -d -bb -:a -# The hold space was nonempty. Following occurrences. Do nothing. -x -:b -} diff --git a/po/wesnoth-tutorial/remove-potcdate.sin b/po/wesnoth-tutorial/remove-potcdate.sin deleted file mode 100644 index 2436c49e786d..000000000000 --- a/po/wesnoth-tutorial/remove-potcdate.sin +++ /dev/null @@ -1,19 +0,0 @@ -# Sed script that remove the POT-Creation-Date line in the header entry -# from a POT file. -# -# The distinction between the first and the following occurrences of the -# pattern is achieved by looking at the hold space. -/^"POT-Creation-Date: .*"$/{ -x -# Test if the hold space is empty. -s/P/P/ -ta -# Yes it was empty. First occurrence. Remove the line. -g -d -bb -:a -# The hold space was nonempty. Following occurrences. Do nothing. -x -:b -} diff --git a/po/wesnoth-units/remove-potcdate.sin b/po/wesnoth-units/remove-potcdate.sin deleted file mode 100644 index 2436c49e786d..000000000000 --- a/po/wesnoth-units/remove-potcdate.sin +++ /dev/null @@ -1,19 +0,0 @@ -# Sed script that remove the POT-Creation-Date line in the header entry -# from a POT file. -# -# The distinction between the first and the following occurrences of the -# pattern is achieved by looking at the hold space. -/^"POT-Creation-Date: .*"$/{ -x -# Test if the hold space is empty. -s/P/P/ -ta -# Yes it was empty. First occurrence. Remove the line. -g -d -bb -:a -# The hold space was nonempty. Following occurrences. Do nothing. -x -:b -} diff --git a/po/wesnoth-utbs/POTFILES.in b/po/wesnoth-utbs/POTFILES.in deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/po/wesnoth-utbs/remove-potcdate.sin b/po/wesnoth-utbs/remove-potcdate.sin deleted file mode 100644 index 2436c49e786d..000000000000 --- a/po/wesnoth-utbs/remove-potcdate.sin +++ /dev/null @@ -1,19 +0,0 @@ -# Sed script that remove the POT-Creation-Date line in the header entry -# from a POT file. -# -# The distinction between the first and the following occurrences of the -# pattern is achieved by looking at the hold space. -/^"POT-Creation-Date: .*"$/{ -x -# Test if the hold space is empty. -s/P/P/ -ta -# Yes it was empty. First occurrence. Remove the line. -g -d -bb -:a -# The hold space was nonempty. Following occurrences. Do nothing. -x -:b -} diff --git a/po/wesnoth/remove-potcdate.sin b/po/wesnoth/remove-potcdate.sin deleted file mode 100644 index 2436c49e786d..000000000000 --- a/po/wesnoth/remove-potcdate.sin +++ /dev/null @@ -1,19 +0,0 @@ -# Sed script that remove the POT-Creation-Date line in the header entry -# from a POT file. -# -# The distinction between the first and the following occurrences of the -# pattern is achieved by looking at the hold space. -/^"POT-Creation-Date: .*"$/{ -x -# Test if the hold space is empty. -s/P/P/ -ta -# Yes it was empty. First occurrence. Remove the line. -g -d -bb -:a -# The hold space was nonempty. Following occurrences. Do nothing. -x -:b -} From 05641062c8bd4b48764a45e5ecbf53e8c99179a5 Mon Sep 17 00:00:00 2001 From: aquileia Date: Sun, 8 Jun 2014 17:53:45 +0200 Subject: [PATCH 07/14] gitignore: Merge dozens of "Thumbs.db" rules It suffices to apply the rule once in the root directory. --- .gitignore | 8 +++++++- data/campaigns/An_Orcish_Incursion/images/.gitignore | 1 - .../Descent_Into_Darkness/images/misc/.gitignore | 1 - .../Descent_Into_Darkness/images/portraits/.gitignore | 1 - .../Descent_Into_Darkness/images/units/.gitignore | 1 - .../Eastern_Invasion/images/portraits/.gitignore | 1 - data/campaigns/Eastern_Invasion/images/units/.gitignore | 1 - data/campaigns/Heir_To_The_Throne/images/.gitignore | 1 - .../Heir_To_The_Throne/images/portraits/.gitignore | 1 - data/campaigns/Heir_To_The_Throne/images/story/.gitignore | 1 - data/campaigns/Heir_To_The_Throne/images/units/.gitignore | 1 - data/campaigns/Liberty/images/.gitignore | 1 - data/campaigns/Liberty/images/attacks/.gitignore | 1 - data/campaigns/Liberty/images/halo/.gitignore | 1 - data/campaigns/Liberty/images/maps/.gitignore | 1 - data/campaigns/Liberty/images/portraits/.gitignore | 1 - data/campaigns/Liberty/images/projectiles/.gitignore | 1 - data/campaigns/Liberty/images/story/.gitignore | 1 - data/campaigns/Northern_Rebirth/images/.gitignore | 1 - .../Northern_Rebirth/images/portraits/.gitignore | 1 - data/campaigns/The_South_Guard/images/deoran/.gitignore | 1 - data/campaigns/The_South_Guard/images/flag/.gitignore | 1 - .../campaigns/The_South_Guard/images/portraits/.gitignore | 1 - data/campaigns/The_South_Guard/images/story/.gitignore | 1 - data/campaigns/The_South_Guard/images/units/.gitignore | 1 - data/campaigns/Under_the_Burning_Suns/images/.gitignore | 1 - .../Under_the_Burning_Suns/images/attacks/.gitignore | 1 - .../Under_the_Burning_Suns/images/items/.gitignore | 1 - .../Under_the_Burning_Suns/images/misc/.gitignore | 1 - .../Under_the_Burning_Suns/images/portraits/.gitignore | 1 - .../Under_the_Burning_Suns/images/projectiles/.gitignore | 1 - .../Under_the_Burning_Suns/images/terrain/.gitignore | 1 - data/core/images/.gitignore | 1 - data/core/images/attacks/.gitignore | 1 - data/core/images/halo/.gitignore | 1 - data/core/images/halo/elven/.gitignore | 1 - data/core/images/halo/holy/.gitignore | 1 - data/core/images/halo/undead/.gitignore | 1 - data/core/images/help/.gitignore | 1 - data/core/images/items/.gitignore | 1 - data/core/images/maps/.gitignore | 1 - data/core/images/misc/.gitignore | 1 - data/core/images/projectiles/.gitignore | 1 - data/core/images/scenery/.gitignore | 1 - data/core/images/terrain/castle/.gitignore | 1 - data/core/images/terrain/castle/elven/.gitignore | 1 - data/core/images/terrain/cave/.gitignore | 1 - data/core/images/terrain/flat/.gitignore | 1 - data/core/images/terrain/forest/.gitignore | 1 - data/core/images/terrain/off-map/.gitignore | 1 - data/core/images/terrain/swamp/.gitignore | 1 - data/core/images/terrain/village/.gitignore | 1 - data/core/images/terrain/water/.gitignore | 1 - data/core/images/themes/.gitignore | 1 - data/core/images/units/.gitignore | 1 - data/core/images/units/drakes/.gitignore | 1 - data/core/images/units/dwarves/.gitignore | 1 - data/core/images/units/elves-wood/.gitignore | 1 - data/core/images/units/goblins/.gitignore | 1 - data/core/images/units/human-loyalists/.gitignore | 1 - data/core/images/units/human-magi/.gitignore | 1 - data/core/images/units/human-outlaws/.gitignore | 1 - data/core/images/units/human-peasants/.gitignore | 1 - data/core/images/units/merfolk/.gitignore | 1 - data/core/images/units/monsters/.gitignore | 1 - data/core/images/units/nagas/.gitignore | 1 - data/core/images/units/ogres/.gitignore | 1 - data/core/images/units/orcs/.gitignore | 1 - data/core/images/units/saurians/.gitignore | 1 - data/core/images/units/transport/.gitignore | 1 - data/core/images/units/trolls/.gitignore | 1 - data/core/images/units/undead-necromancers/.gitignore | 1 - data/core/images/units/undead-skeletal/.gitignore | 1 - data/core/images/units/undead/.gitignore | 1 - data/core/images/units/woses/.gitignore | 1 - icons/.gitignore | 3 --- images/cursors-bw/.gitignore | 1 - images/cursors/.gitignore | 1 - images/dialogs/.gitignore | 1 - images/footsteps/.gitignore | 1 - images/icons/.gitignore | 1 - images/tools/.gitignore | 1 - images/tools/exploder/.gitignore | 1 - 83 files changed, 7 insertions(+), 85 deletions(-) delete mode 100644 data/campaigns/An_Orcish_Incursion/images/.gitignore delete mode 100644 data/campaigns/Descent_Into_Darkness/images/misc/.gitignore delete mode 100644 data/campaigns/Descent_Into_Darkness/images/portraits/.gitignore delete mode 100644 data/campaigns/Descent_Into_Darkness/images/units/.gitignore delete mode 100644 data/campaigns/Eastern_Invasion/images/portraits/.gitignore delete mode 100644 data/campaigns/Eastern_Invasion/images/units/.gitignore delete mode 100644 data/campaigns/Heir_To_The_Throne/images/.gitignore delete mode 100644 data/campaigns/Heir_To_The_Throne/images/portraits/.gitignore delete mode 100644 data/campaigns/Heir_To_The_Throne/images/story/.gitignore delete mode 100644 data/campaigns/Heir_To_The_Throne/images/units/.gitignore delete mode 100644 data/campaigns/Liberty/images/.gitignore delete mode 100644 data/campaigns/Liberty/images/attacks/.gitignore delete mode 100644 data/campaigns/Liberty/images/halo/.gitignore delete mode 100644 data/campaigns/Liberty/images/maps/.gitignore delete mode 100644 data/campaigns/Liberty/images/portraits/.gitignore delete mode 100644 data/campaigns/Liberty/images/projectiles/.gitignore delete mode 100644 data/campaigns/Liberty/images/story/.gitignore delete mode 100644 data/campaigns/Northern_Rebirth/images/.gitignore delete mode 100644 data/campaigns/Northern_Rebirth/images/portraits/.gitignore delete mode 100644 data/campaigns/The_South_Guard/images/deoran/.gitignore delete mode 100644 data/campaigns/The_South_Guard/images/flag/.gitignore delete mode 100644 data/campaigns/The_South_Guard/images/portraits/.gitignore delete mode 100644 data/campaigns/The_South_Guard/images/story/.gitignore delete mode 100644 data/campaigns/The_South_Guard/images/units/.gitignore delete mode 100644 data/campaigns/Under_the_Burning_Suns/images/.gitignore delete mode 100644 data/campaigns/Under_the_Burning_Suns/images/attacks/.gitignore delete mode 100644 data/campaigns/Under_the_Burning_Suns/images/items/.gitignore delete mode 100644 data/campaigns/Under_the_Burning_Suns/images/misc/.gitignore delete mode 100644 data/campaigns/Under_the_Burning_Suns/images/portraits/.gitignore delete mode 100644 data/campaigns/Under_the_Burning_Suns/images/projectiles/.gitignore delete mode 100644 data/campaigns/Under_the_Burning_Suns/images/terrain/.gitignore delete mode 100644 data/core/images/.gitignore delete mode 100644 data/core/images/attacks/.gitignore delete mode 100644 data/core/images/halo/.gitignore delete mode 100644 data/core/images/halo/elven/.gitignore delete mode 100644 data/core/images/halo/holy/.gitignore delete mode 100644 data/core/images/halo/undead/.gitignore delete mode 100644 data/core/images/help/.gitignore delete mode 100644 data/core/images/items/.gitignore delete mode 100644 data/core/images/maps/.gitignore delete mode 100644 data/core/images/misc/.gitignore delete mode 100644 data/core/images/projectiles/.gitignore delete mode 100644 data/core/images/scenery/.gitignore delete mode 100644 data/core/images/terrain/castle/.gitignore delete mode 100644 data/core/images/terrain/castle/elven/.gitignore delete mode 100644 data/core/images/terrain/cave/.gitignore delete mode 100644 data/core/images/terrain/flat/.gitignore delete mode 100644 data/core/images/terrain/forest/.gitignore delete mode 100644 data/core/images/terrain/off-map/.gitignore delete mode 100644 data/core/images/terrain/swamp/.gitignore delete mode 100644 data/core/images/terrain/village/.gitignore delete mode 100644 data/core/images/terrain/water/.gitignore delete mode 100644 data/core/images/themes/.gitignore delete mode 100644 data/core/images/units/.gitignore delete mode 100644 data/core/images/units/drakes/.gitignore delete mode 100644 data/core/images/units/dwarves/.gitignore delete mode 100644 data/core/images/units/elves-wood/.gitignore delete mode 100644 data/core/images/units/goblins/.gitignore delete mode 100644 data/core/images/units/human-loyalists/.gitignore delete mode 100644 data/core/images/units/human-magi/.gitignore delete mode 100644 data/core/images/units/human-outlaws/.gitignore delete mode 100644 data/core/images/units/human-peasants/.gitignore delete mode 100644 data/core/images/units/merfolk/.gitignore delete mode 100644 data/core/images/units/monsters/.gitignore delete mode 100644 data/core/images/units/nagas/.gitignore delete mode 100644 data/core/images/units/ogres/.gitignore delete mode 100644 data/core/images/units/orcs/.gitignore delete mode 100644 data/core/images/units/saurians/.gitignore delete mode 100644 data/core/images/units/transport/.gitignore delete mode 100644 data/core/images/units/trolls/.gitignore delete mode 100644 data/core/images/units/undead-necromancers/.gitignore delete mode 100644 data/core/images/units/undead-skeletal/.gitignore delete mode 100644 data/core/images/units/undead/.gitignore delete mode 100644 data/core/images/units/woses/.gitignore delete mode 100644 icons/.gitignore delete mode 100644 images/cursors-bw/.gitignore delete mode 100644 images/cursors/.gitignore delete mode 100644 images/dialogs/.gitignore delete mode 100644 images/footsteps/.gitignore delete mode 100644 images/icons/.gitignore delete mode 100644 images/tools/.gitignore delete mode 100644 images/tools/exploder/.gitignore diff --git a/.gitignore b/.gitignore index 5087581dd46d..5813e31777da 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ !README.txt !readme.txt !COPYING.txt +!imagemagick_command.txt # project files .*project @@ -86,7 +87,6 @@ locales make_translation merge_translations *.gmo -po/**/.gitignore po/**/[a-z][a-z] po/**/[a-z][a-z]_[GB]R po/**/POTFILES @@ -97,6 +97,12 @@ po/**/Makefile* !po/wesnoth-manpages/Makefile !po/wesnoth-manual/Makefile +# previous .gitignore files +po/**/.gitignore +images/**/.gitignore +data/core/images/**/.gitignore +data/campaigns/**/images/**/.gitignore + # OS created files .DS_Store [Tt]humbs.db diff --git a/data/campaigns/An_Orcish_Incursion/images/.gitignore b/data/campaigns/An_Orcish_Incursion/images/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/data/campaigns/An_Orcish_Incursion/images/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/data/campaigns/Descent_Into_Darkness/images/misc/.gitignore b/data/campaigns/Descent_Into_Darkness/images/misc/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/data/campaigns/Descent_Into_Darkness/images/misc/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/data/campaigns/Descent_Into_Darkness/images/portraits/.gitignore b/data/campaigns/Descent_Into_Darkness/images/portraits/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/data/campaigns/Descent_Into_Darkness/images/portraits/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/data/campaigns/Descent_Into_Darkness/images/units/.gitignore b/data/campaigns/Descent_Into_Darkness/images/units/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/data/campaigns/Descent_Into_Darkness/images/units/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/data/campaigns/Eastern_Invasion/images/portraits/.gitignore b/data/campaigns/Eastern_Invasion/images/portraits/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/data/campaigns/Eastern_Invasion/images/portraits/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/data/campaigns/Eastern_Invasion/images/units/.gitignore b/data/campaigns/Eastern_Invasion/images/units/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/data/campaigns/Eastern_Invasion/images/units/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/data/campaigns/Heir_To_The_Throne/images/.gitignore b/data/campaigns/Heir_To_The_Throne/images/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/data/campaigns/Heir_To_The_Throne/images/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/data/campaigns/Heir_To_The_Throne/images/portraits/.gitignore b/data/campaigns/Heir_To_The_Throne/images/portraits/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/data/campaigns/Heir_To_The_Throne/images/portraits/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/data/campaigns/Heir_To_The_Throne/images/story/.gitignore b/data/campaigns/Heir_To_The_Throne/images/story/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/data/campaigns/Heir_To_The_Throne/images/story/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/data/campaigns/Heir_To_The_Throne/images/units/.gitignore b/data/campaigns/Heir_To_The_Throne/images/units/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/data/campaigns/Heir_To_The_Throne/images/units/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/data/campaigns/Liberty/images/.gitignore b/data/campaigns/Liberty/images/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/data/campaigns/Liberty/images/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/data/campaigns/Liberty/images/attacks/.gitignore b/data/campaigns/Liberty/images/attacks/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/data/campaigns/Liberty/images/attacks/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/data/campaigns/Liberty/images/halo/.gitignore b/data/campaigns/Liberty/images/halo/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/data/campaigns/Liberty/images/halo/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/data/campaigns/Liberty/images/maps/.gitignore b/data/campaigns/Liberty/images/maps/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/data/campaigns/Liberty/images/maps/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/data/campaigns/Liberty/images/portraits/.gitignore b/data/campaigns/Liberty/images/portraits/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/data/campaigns/Liberty/images/portraits/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/data/campaigns/Liberty/images/projectiles/.gitignore b/data/campaigns/Liberty/images/projectiles/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/data/campaigns/Liberty/images/projectiles/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/data/campaigns/Liberty/images/story/.gitignore b/data/campaigns/Liberty/images/story/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/data/campaigns/Liberty/images/story/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/data/campaigns/Northern_Rebirth/images/.gitignore b/data/campaigns/Northern_Rebirth/images/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/data/campaigns/Northern_Rebirth/images/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/data/campaigns/Northern_Rebirth/images/portraits/.gitignore b/data/campaigns/Northern_Rebirth/images/portraits/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/data/campaigns/Northern_Rebirth/images/portraits/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/data/campaigns/The_South_Guard/images/deoran/.gitignore b/data/campaigns/The_South_Guard/images/deoran/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/data/campaigns/The_South_Guard/images/deoran/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/data/campaigns/The_South_Guard/images/flag/.gitignore b/data/campaigns/The_South_Guard/images/flag/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/data/campaigns/The_South_Guard/images/flag/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/data/campaigns/The_South_Guard/images/portraits/.gitignore b/data/campaigns/The_South_Guard/images/portraits/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/data/campaigns/The_South_Guard/images/portraits/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/data/campaigns/The_South_Guard/images/story/.gitignore b/data/campaigns/The_South_Guard/images/story/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/data/campaigns/The_South_Guard/images/story/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/data/campaigns/The_South_Guard/images/units/.gitignore b/data/campaigns/The_South_Guard/images/units/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/data/campaigns/The_South_Guard/images/units/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/data/campaigns/Under_the_Burning_Suns/images/.gitignore b/data/campaigns/Under_the_Burning_Suns/images/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/data/campaigns/Under_the_Burning_Suns/images/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/data/campaigns/Under_the_Burning_Suns/images/attacks/.gitignore b/data/campaigns/Under_the_Burning_Suns/images/attacks/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/data/campaigns/Under_the_Burning_Suns/images/attacks/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/data/campaigns/Under_the_Burning_Suns/images/items/.gitignore b/data/campaigns/Under_the_Burning_Suns/images/items/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/data/campaigns/Under_the_Burning_Suns/images/items/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/data/campaigns/Under_the_Burning_Suns/images/misc/.gitignore b/data/campaigns/Under_the_Burning_Suns/images/misc/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/data/campaigns/Under_the_Burning_Suns/images/misc/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/data/campaigns/Under_the_Burning_Suns/images/portraits/.gitignore b/data/campaigns/Under_the_Burning_Suns/images/portraits/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/data/campaigns/Under_the_Burning_Suns/images/portraits/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/data/campaigns/Under_the_Burning_Suns/images/projectiles/.gitignore b/data/campaigns/Under_the_Burning_Suns/images/projectiles/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/data/campaigns/Under_the_Burning_Suns/images/projectiles/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/data/campaigns/Under_the_Burning_Suns/images/terrain/.gitignore b/data/campaigns/Under_the_Burning_Suns/images/terrain/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/data/campaigns/Under_the_Burning_Suns/images/terrain/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/data/core/images/.gitignore b/data/core/images/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/data/core/images/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/data/core/images/attacks/.gitignore b/data/core/images/attacks/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/data/core/images/attacks/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/data/core/images/halo/.gitignore b/data/core/images/halo/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/data/core/images/halo/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/data/core/images/halo/elven/.gitignore b/data/core/images/halo/elven/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/data/core/images/halo/elven/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/data/core/images/halo/holy/.gitignore b/data/core/images/halo/holy/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/data/core/images/halo/holy/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/data/core/images/halo/undead/.gitignore b/data/core/images/halo/undead/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/data/core/images/halo/undead/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/data/core/images/help/.gitignore b/data/core/images/help/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/data/core/images/help/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/data/core/images/items/.gitignore b/data/core/images/items/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/data/core/images/items/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/data/core/images/maps/.gitignore b/data/core/images/maps/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/data/core/images/maps/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/data/core/images/misc/.gitignore b/data/core/images/misc/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/data/core/images/misc/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/data/core/images/projectiles/.gitignore b/data/core/images/projectiles/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/data/core/images/projectiles/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/data/core/images/scenery/.gitignore b/data/core/images/scenery/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/data/core/images/scenery/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/data/core/images/terrain/castle/.gitignore b/data/core/images/terrain/castle/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/data/core/images/terrain/castle/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/data/core/images/terrain/castle/elven/.gitignore b/data/core/images/terrain/castle/elven/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/data/core/images/terrain/castle/elven/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/data/core/images/terrain/cave/.gitignore b/data/core/images/terrain/cave/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/data/core/images/terrain/cave/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/data/core/images/terrain/flat/.gitignore b/data/core/images/terrain/flat/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/data/core/images/terrain/flat/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/data/core/images/terrain/forest/.gitignore b/data/core/images/terrain/forest/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/data/core/images/terrain/forest/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/data/core/images/terrain/off-map/.gitignore b/data/core/images/terrain/off-map/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/data/core/images/terrain/off-map/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/data/core/images/terrain/swamp/.gitignore b/data/core/images/terrain/swamp/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/data/core/images/terrain/swamp/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/data/core/images/terrain/village/.gitignore b/data/core/images/terrain/village/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/data/core/images/terrain/village/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/data/core/images/terrain/water/.gitignore b/data/core/images/terrain/water/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/data/core/images/terrain/water/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/data/core/images/themes/.gitignore b/data/core/images/themes/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/data/core/images/themes/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/data/core/images/units/.gitignore b/data/core/images/units/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/data/core/images/units/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/data/core/images/units/drakes/.gitignore b/data/core/images/units/drakes/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/data/core/images/units/drakes/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/data/core/images/units/dwarves/.gitignore b/data/core/images/units/dwarves/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/data/core/images/units/dwarves/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/data/core/images/units/elves-wood/.gitignore b/data/core/images/units/elves-wood/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/data/core/images/units/elves-wood/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/data/core/images/units/goblins/.gitignore b/data/core/images/units/goblins/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/data/core/images/units/goblins/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/data/core/images/units/human-loyalists/.gitignore b/data/core/images/units/human-loyalists/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/data/core/images/units/human-loyalists/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/data/core/images/units/human-magi/.gitignore b/data/core/images/units/human-magi/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/data/core/images/units/human-magi/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/data/core/images/units/human-outlaws/.gitignore b/data/core/images/units/human-outlaws/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/data/core/images/units/human-outlaws/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/data/core/images/units/human-peasants/.gitignore b/data/core/images/units/human-peasants/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/data/core/images/units/human-peasants/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/data/core/images/units/merfolk/.gitignore b/data/core/images/units/merfolk/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/data/core/images/units/merfolk/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/data/core/images/units/monsters/.gitignore b/data/core/images/units/monsters/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/data/core/images/units/monsters/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/data/core/images/units/nagas/.gitignore b/data/core/images/units/nagas/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/data/core/images/units/nagas/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/data/core/images/units/ogres/.gitignore b/data/core/images/units/ogres/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/data/core/images/units/ogres/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/data/core/images/units/orcs/.gitignore b/data/core/images/units/orcs/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/data/core/images/units/orcs/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/data/core/images/units/saurians/.gitignore b/data/core/images/units/saurians/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/data/core/images/units/saurians/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/data/core/images/units/transport/.gitignore b/data/core/images/units/transport/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/data/core/images/units/transport/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/data/core/images/units/trolls/.gitignore b/data/core/images/units/trolls/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/data/core/images/units/trolls/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/data/core/images/units/undead-necromancers/.gitignore b/data/core/images/units/undead-necromancers/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/data/core/images/units/undead-necromancers/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/data/core/images/units/undead-skeletal/.gitignore b/data/core/images/units/undead-skeletal/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/data/core/images/units/undead-skeletal/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/data/core/images/units/undead/.gitignore b/data/core/images/units/undead/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/data/core/images/units/undead/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/data/core/images/units/woses/.gitignore b/data/core/images/units/woses/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/data/core/images/units/woses/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/icons/.gitignore b/icons/.gitignore deleted file mode 100644 index d1909264f9ea..000000000000 --- a/icons/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -Makefile -Makefile.in -Thumbs.db diff --git a/images/cursors-bw/.gitignore b/images/cursors-bw/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/images/cursors-bw/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/images/cursors/.gitignore b/images/cursors/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/images/cursors/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/images/dialogs/.gitignore b/images/dialogs/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/images/dialogs/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/images/footsteps/.gitignore b/images/footsteps/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/images/footsteps/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/images/icons/.gitignore b/images/icons/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/images/icons/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/images/tools/.gitignore b/images/tools/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/images/tools/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db diff --git a/images/tools/exploder/.gitignore b/images/tools/exploder/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/images/tools/exploder/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db From 0abdaf7a96a9c92c95a446b08ee88a8679130578 Mon Sep 17 00:00:00 2001 From: aquileia Date: Sun, 8 Jun 2014 18:00:31 +0200 Subject: [PATCH 08/14] gitignore: Reduce number of false positives Especially in utils/umc_dev/ a massive number of files matched ignore rules. As tracked files can't be ignored, this had no real consequences. --- .gitignore | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitignore b/.gitignore index 5813e31777da..057a681d296b 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ !readme.txt !COPYING.txt !imagemagick_command.txt +!utils/umc_dev/org.wesnoth/templates/**/*.txt # project files .*project @@ -36,6 +37,8 @@ projectfiles/VC[12]* # eclipse .settings +!utils/umc_dev/org.wesnoth*/.settings/ +!utils/umc_dev/org.wesnoth*/.project # autotools config.h @@ -71,6 +74,8 @@ wesnoth.plg # library files .libs Lib +!data/ai/formula/lib/ +!src/gui/lib/ # release-only directories translations From 15503ff27e46b02622ebfc2cca7ffa1f6f0030b5 Mon Sep 17 00:00:00 2001 From: aquileia Date: Sun, 8 Jun 2014 18:05:53 +0200 Subject: [PATCH 09/14] gitignore: Fix order of rules for Makefiles The exceptions were applied before the generic rule, thus they had no effect. --- .gitignore | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 057a681d296b..7f438f225972 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,10 @@ .*project Project.* +# Makefiles +Makefile +Makefile.in + # cmake CMakeFiles CMakeLists.txt.user* @@ -115,8 +119,6 @@ data/campaigns/**/images/**/.gitignore # uncategorized *.swp -Makefile -Makefile.in revision.h 6not .kdev* From 5db587182d5714eb5ce47aca002f6647823d70f2 Mon Sep 17 00:00:00 2001 From: aquileia Date: Sun, 8 Jun 2014 18:10:50 +0200 Subject: [PATCH 10/14] gitignore: Block some extensions --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 7f438f225972..0902e911b298 100644 --- a/.gitignore +++ b/.gitignore @@ -119,6 +119,9 @@ data/campaigns/**/images/**/.gitignore # uncategorized *.swp +*.pbl +*.xhtml +*.[ao] revision.h 6not .kdev* From 1e9a50879552aff8f77fddb4f89b852404788928 Mon Sep 17 00:00:00 2001 From: aquileia Date: Sun, 8 Jun 2014 19:51:50 +0200 Subject: [PATCH 11/14] gitignore: Merge rules from projectfiles/ --- .gitignore | 24 ++++++++++++++++++- projectfiles/CodeBlocks-SCons/.gitignore | 4 ---- projectfiles/CodeBlocks/.gitignore | 6 ----- projectfiles/CodeLite/.gitignore | 3 --- projectfiles/VC9/.gitignore | 7 ------ projectfiles/Xcode/.gitignore | 4 ---- .../Xcode/Wesnoth.xcodeproj/.gitignore | 4 ---- 7 files changed, 23 insertions(+), 29 deletions(-) delete mode 100644 projectfiles/CodeBlocks-SCons/.gitignore delete mode 100644 projectfiles/CodeBlocks/.gitignore delete mode 100644 projectfiles/CodeLite/.gitignore delete mode 100644 projectfiles/VC9/.gitignore delete mode 100644 projectfiles/Xcode/.gitignore delete mode 100644 projectfiles/Xcode/Wesnoth.xcodeproj/.gitignore diff --git a/.gitignore b/.gitignore index 0902e911b298..a28139c496e2 100644 --- a/.gitignore +++ b/.gitignore @@ -39,6 +39,24 @@ 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/ @@ -62,7 +80,10 @@ stamp-h1 /cutter* /exploder* /build/ +Release Debug +ReleaseDEBUG +Debug (fast) tags # build results ect. @@ -70,6 +91,7 @@ wesnoth.exp wesnoth.ilk wesnoth.lib wesnoth.ncb +wesnoth.suo wesnoth.opt wesnoth.plg *.exe @@ -77,7 +99,7 @@ wesnoth.plg # library files .libs -Lib +[Ll]ib !data/ai/formula/lib/ !src/gui/lib/ diff --git a/projectfiles/CodeBlocks-SCons/.gitignore b/projectfiles/CodeBlocks-SCons/.gitignore deleted file mode 100644 index c68b19247d08..000000000000 --- a/projectfiles/CodeBlocks-SCons/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -.objs* -*.depend -*.layout -*_build_log.html diff --git a/projectfiles/CodeBlocks/.gitignore b/projectfiles/CodeBlocks/.gitignore deleted file mode 100644 index 887d656145d8..000000000000 --- a/projectfiles/CodeBlocks/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -.objs* -objs* -*.depend -*.layout -*_build_log.html -liblua.a diff --git a/projectfiles/CodeLite/.gitignore b/projectfiles/CodeLite/.gitignore deleted file mode 100644 index cbdb732289ba..000000000000 --- a/projectfiles/CodeLite/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -.clang -wesnoth.tags -wesnoth.workspace.* diff --git a/projectfiles/VC9/.gitignore b/projectfiles/VC9/.gitignore deleted file mode 100644 index 6bf741c74d82..000000000000 --- a/projectfiles/VC9/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -Release -Debug -ReleaseDEBUG -wesnoth.ncb -wesnoth.suo -Debug (fast) -*.vcproj.*.user diff --git a/projectfiles/Xcode/.gitignore b/projectfiles/Xcode/.gitignore deleted file mode 100644 index 67ddad43df6d..000000000000 --- a/projectfiles/Xcode/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -build -lib -Headers -Wesnoth.dmgCanvas diff --git a/projectfiles/Xcode/Wesnoth.xcodeproj/.gitignore b/projectfiles/Xcode/Wesnoth.xcodeproj/.gitignore deleted file mode 100644 index fd3977d700d5..000000000000 --- a/projectfiles/Xcode/Wesnoth.xcodeproj/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -*.mode1v3 -*.pbxuser -xcuserdata -project.xcworkspace From 1715ab314591a7c0206d4f8afbb019eef80584c9 Mon Sep 17 00:00:00 2001 From: aquileia Date: Sun, 8 Jun 2014 20:31:57 +0200 Subject: [PATCH 12/14] gitignore: Include more rules from subdirectories That is: data/lua/, scons/, and utils/ --- .gitignore | 7 ++++++- data/lua/.gitignore | 2 -- scons/.gitignore | 1 - utils/.gitignore | 1 - 4 files changed, 6 insertions(+), 5 deletions(-) delete mode 100644 data/lua/.gitignore delete mode 100644 scons/.gitignore delete mode 100644 utils/.gitignore diff --git a/.gitignore b/.gitignore index a28139c496e2..1077137389a2 100644 --- a/.gitignore +++ b/.gitignore @@ -27,7 +27,7 @@ CMakeLists.txt # scons .scons-option-cache -.sconsign.dblite +*sconsign.dblite .sconf_temp # win32/MSVC: @@ -109,6 +109,7 @@ userdata # testing /test* +!/test_wrapper.sh error*.log do_build_and_tests.sh boost_test_result.xml @@ -128,6 +129,9 @@ po/**/Makefile* !po/wesnoth-manpages/Makefile !po/wesnoth-manual/Makefile +# file for loading lua from within test scenario on-the-fly +data/lua/**/code.lua + # previous .gitignore files po/**/.gitignore images/**/.gitignore @@ -140,6 +144,7 @@ data/campaigns/**/images/**/.gitignore *Neuer Ordner* # uncategorized +*.pyc *.swp *.pbl *.xhtml diff --git a/data/lua/.gitignore b/data/lua/.gitignore deleted file mode 100644 index dda10c23b15f..000000000000 --- a/data/lua/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -#file for loading lua from within test scenario on-the-fly -code.lua diff --git a/scons/.gitignore b/scons/.gitignore deleted file mode 100644 index 0d20b6487c61..000000000000 --- a/scons/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.pyc diff --git a/utils/.gitignore b/utils/.gitignore deleted file mode 100644 index 1d760b48140a..000000000000 --- a/utils/.gitignore +++ /dev/null @@ -1 +0,0 @@ -sconsign.dblite From c19e729c6b5904f3385f9e6b9bef137bfc265dfa Mon Sep 17 00:00:00 2001 From: aquileia Date: Sun, 8 Jun 2014 20:34:00 +0200 Subject: [PATCH 13/14] gitignore: Merge rules from doc/ and data/tools --- .gitignore | 9 +++++++++ data/tools/.gitignore | 2 -- data/tools/unit_tree/.gitignore | 3 --- data/tools/wesnoth/.gitignore | 1 - doc/.gitignore | 4 ---- doc/design/.gitignore | 3 --- doc/doxygen/.gitignore | 1 - doc/man/.gitignore | 4 ---- doc/manual/.gitignore | 5 ----- doc/manual/images/.gitignore | 1 - 10 files changed, 9 insertions(+), 24 deletions(-) delete mode 100644 data/tools/.gitignore delete mode 100644 data/tools/unit_tree/.gitignore delete mode 100644 data/tools/wesnoth/.gitignore delete mode 100644 doc/.gitignore delete mode 100644 doc/design/.gitignore delete mode 100644 doc/doxygen/.gitignore delete mode 100644 doc/man/.gitignore delete mode 100644 doc/manual/.gitignore delete mode 100644 doc/manual/images/.gitignore diff --git a/.gitignore b/.gitignore index 1077137389a2..bd62d1c171f9 100644 --- a/.gitignore +++ b/.gitignore @@ -129,6 +129,15 @@ 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 diff --git a/data/tools/.gitignore b/data/tools/.gitignore deleted file mode 100644 index 99baed764997..000000000000 --- a/data/tools/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -*.pyc -macro-reference.xhtml diff --git a/data/tools/unit_tree/.gitignore b/data/tools/unit_tree/.gitignore deleted file mode 100644 index 724846da435d..000000000000 --- a/data/tools/unit_tree/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -files -reports -Locale diff --git a/data/tools/wesnoth/.gitignore b/data/tools/wesnoth/.gitignore deleted file mode 100644 index 0d20b6487c61..000000000000 --- a/data/tools/wesnoth/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.pyc diff --git a/doc/.gitignore b/doc/.gitignore deleted file mode 100644 index 826f9622298a..000000000000 --- a/doc/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -CMakeFiles -cmake_install.cmake diff --git a/doc/design/.gitignore b/doc/design/.gitignore deleted file mode 100644 index e55a12241622..000000000000 --- a/doc/design/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -CMakeFiles -cmake_install.cmake -Makefile diff --git a/doc/doxygen/.gitignore b/doc/doxygen/.gitignore deleted file mode 100644 index 1936cc1d441e..000000000000 --- a/doc/doxygen/.gitignore +++ /dev/null @@ -1 +0,0 @@ -html diff --git a/doc/man/.gitignore b/doc/man/.gitignore deleted file mode 100644 index 6dc324bc1205..000000000000 --- a/doc/man/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -cmake_install.cmake -CMakeFiles diff --git a/doc/manual/.gitignore b/doc/manual/.gitignore deleted file mode 100644 index 5a16b3a49b49..000000000000 --- a/doc/manual/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -Makefile -Makefile.in -*.xml -cmake_install.cmake -CMakeFiles diff --git a/doc/manual/images/.gitignore b/doc/manual/images/.gitignore deleted file mode 100644 index 085e8baf0c85..000000000000 --- a/doc/manual/images/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Thumbs.db From ca1e632b627c55519889756f5e417b4919f03f3f Mon Sep 17 00:00:00 2001 From: aquileia Date: Tue, 10 Jun 2014 20:32:10 +0200 Subject: [PATCH 14/14] Remove remove-potcdate.sin from wescamp-import If we delete the remove-potcdate.sin scripts, we may as well remove the paragraph importing them. --- utils/wescamp_import | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/utils/wescamp_import b/utils/wescamp_import index 032e4d0a0044..e377ce68da4b 100755 --- a/utils/wescamp_import +++ b/utils/wescamp_import @@ -53,29 +53,6 @@ find data/campaigns/%(campaign)s -name '*.cfg' -print find data/campaigns/%(campaign)s -name '*.lua' -print EOF - -cat > po/%(textdomain)s/remove-potcdate.sin <<'EOF' -#Sed script that remove the POT-Creation-Date line in the header entry -# from a POT file. -# -# The distinction between the first and the following occurrences of the -# pattern is achieved by looking at the hold space. -/^"POT-Creation-Date: .*"$/{ -x -# Test if the hold space is empty. -s/P/P/ -ta -# Yes it was empty. First occurrence. Remove the line. -g -d -bb -:a -# The hold space was nonempty. Following occurrences. Do nothing. -x -:b -} -EOF - cat > po/%(textdomain)s/Makevars <<'EOF' # Makefile variables for PO directory in any package using GNU gettext.