From 6d624396ff2768f667b5638313df467ece1e4c2d Mon Sep 17 00:00:00 2001 From: Gabriel Ravier Date: Fri, 3 May 2019 13:54:43 +0200 Subject: [PATCH 1/5] Added *.out files to executable formats that are filtered out Signed-off-by: Gabriel Ravier --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 47b5d011..cdbda534 100644 --- a/.gitignore +++ b/.gitignore @@ -13,9 +13,10 @@ build.zip msvc2003/devilution/orig.asm msvc2003/devilution/compare.asm -# Exclude build output on Linux (exclude normally produced executable files) +# Exclude build output on Linux (exclude normally produced executable files and out files) build_en/CSE2 build_en/DoConfig +*.out # The Makefile outputs "release" and "debug" for the english build build_en/release From c4fec6596c02a6cdb6cec416f3d5bde42cd69c4b Mon Sep 17 00:00:00 2001 From: Gabriel Ravier Date: Mon, 6 May 2019 13:06:16 +0200 Subject: [PATCH 2/5] Merge master into addSomeMoreStuffToGitIgnore Signed-off-by: Gabriel Ravier --- .gitignore | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index d7b7b2cd..26c1a783 100644 --- a/.gitignore +++ b/.gitignore @@ -14,17 +14,26 @@ build_jp/*.rec msvc2003/devilution/orig.asm msvc2003/devilution/compare.asm -# Exclude build output on Linux (exclude normally produced executable files) +# Exclude build output on Linux (exclude normally produced executable files and out files) build_en/CSE2 build_en/CSE2d build_en/DoConfig build_en/DoConfigd +*.out + +# The Makefile outputs "release" and "debug" for the english build +build_en/release +build_en/debug build_jp/CSE2 build_jp/CSE2d build_jp/DoConfig build_jp/DoConfigd +# The Makefile outputs "releasejp" and "debugjp" for the japanese build +build_jp/releasejp +build_jp/debugjp + # Exclude executables in the build folder (and .exe.manifest files) build_en/*.exe From 0e4319a3338363aa3590da7e6ba492f4e685b676 Mon Sep 17 00:00:00 2001 From: Gabriel Ravier Date: Tue, 7 May 2019 14:09:41 +0200 Subject: [PATCH 3/5] Fixed bad .gitignore ignores (It ignored outdated executables) Signed-off-by: Gabriel Ravier --- .gitignore | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.gitignore b/.gitignore index 08a55b23..e092319d 100644 --- a/.gitignore +++ b/.gitignore @@ -19,19 +19,11 @@ build_en/CSE2 build_en/DoConfig *.out -# The Makefile outputs "release" and "debug" for the english build -build_en/release -build_en/debug - build_jp/CSE2 build_jp/CSE2d build_jp/DoConfig build_jp/DoConfigd -# The Makefile outputs "releasejp" and "debugjp" for the japanese build -build_jp/releasejp -build_jp/debugjp - # Exclude executables in the build folder (and .exe.manifest files) build_en/*.exe From 1ed1597c0791cacccbdbf9c01824bd05ba54f3e8 Mon Sep 17 00:00:00 2001 From: Gabriel Ravier Date: Tue, 7 May 2019 14:14:06 +0200 Subject: [PATCH 4/5] Properly made .out files be filtered (and some other stuff) Changed a few notes (such as for exes or for converted res files Removed VS Code stuff because this is the kind of stuff that should go into people's global .gitignore and not in local ones Signed-off-by: Gabriel Ravier --- .gitignore | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index e092319d..63beba99 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ # Exclude obj directory (object files for Makefile build) /obj -# Exclude the converted resource files +# Exclude converted resource files src/Resource # Exclude .dat and .rec files in build directories (avoid Config.dat, 290.rec and others) @@ -16,16 +16,16 @@ msvc2003/devilution/compare.asm # Exclude build output on Linux (exclude normally produced executable files and out files) build_en/CSE2 +build_en/CSE2d build_en/DoConfig -*.out - +build_en/DoConfigd build_jp/CSE2 build_jp/CSE2d build_jp/DoConfig build_jp/DoConfigd +*.out - -# Exclude executables in the build folder (and .exe.manifest files) +# Exclude PE executables in the build folder (and .exe.manifest files) build_en/*.exe build_en/*.exe.manifest build_jp/*.exe @@ -45,12 +45,3 @@ msvc2003/Debug msvc2003/Release msvc2003/Debug (Japanese) msvc2003/Release (Japanese) - -# Exclude VS Code folder -.vscode/* - -# Include generically useful files for VS Code users -!.vscode/settings.json -!.vscode/tasks.json -!.vscode/launch.json -!.vscode/extensions.json From 3b1c3d997aed99608d769c520260327affa485f2 Mon Sep 17 00:00:00 2001 From: Gabriel Ravier Date: Wed, 8 May 2019 10:23:49 +0200 Subject: [PATCH 5/5] Put *.out only for build_en/jp instead of globally Signed-off-by: Gabriel Ravier --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 63beba99..440e8458 100644 --- a/.gitignore +++ b/.gitignore @@ -23,7 +23,8 @@ build_jp/CSE2 build_jp/CSE2d build_jp/DoConfig build_jp/DoConfigd -*.out +build_en/*.out +build_jp/*.out # Exclude PE executables in the build folder (and .exe.manifest files) build_en/*.exe