From 209bbfe13c184f31e5335b357dfabae9ad55ae9b Mon Sep 17 00:00:00 2001 From: Gabriel Ravier Date: Thu, 2 May 2019 14:22:31 +0200 Subject: [PATCH 1/5] Edited .gitignore to filter out build directories and added some general documentation Signed-off-by: Gabriel Ravier --- .gitignore | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 4dd1e798..7f6771b5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,24 +1,43 @@ -# Misc +# Exclude obj direcory (object files for Makefile build) /obj + +# Exclude .dat and .rec files in build directories (avoid Config.dat, 290.rec and others) build_en/*.dat build_en/*.rec build_jp/*.dat build_jp/*.rec + +# Exclude some other stuff (some of this should probably be removed at some point) build.7z build.zip msvc2003/devilution/orig.asm msvc2003/devilution/compare.asm -# Build output +# Exclude build output on Linux (exclude all files without an extension (executables)) +build_en/* +!build_en/**/ +!build_en/*.* +build_jp/* +!build_jp/**/ +!build_jp/*.* + +# Exclude executables in the build folder (and .exe.manifest files) build_en/*.exe build_en/*.exe.manifest build_jp/*.exe build_jp/*.exe.manifest -# MSVC trash +# Exclude the (recommanded) CMake build directory +build/* + +# Exclude MSVC IntelliSense database msvc2003/CSE2.ncb + +# Exclude MSVC Solution User Options file msvc2003/CSE2.suo + +# Exclude MSVC build folders msvc2003/Debug msvc2003/Release msvc2003/Debug (Japanese) -msvc2003/Release (Japanese) +msvc2003/Release (Japanese) \ No newline at end of file From a3022e701ad9ccdddafea4fa99cc8a86bc51bc45 Mon Sep 17 00:00:00 2001 From: Clownacy Date: Thu, 2 May 2019 16:27:09 +0200 Subject: [PATCH 2/5] Fix stupid grammar error in .gitignore Co-Authored-By: GabrielRavier <31440290+GabrielRavier@users.noreply.github.com> --- .gitignore | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 7f6771b5..d5f427d4 100644 --- a/.gitignore +++ b/.gitignore @@ -27,7 +27,7 @@ build_en/*.exe.manifest build_jp/*.exe build_jp/*.exe.manifest -# Exclude the (recommanded) CMake build directory +# Exclude the (recommended) CMake build directory build/* # Exclude MSVC IntelliSense database @@ -40,4 +40,4 @@ msvc2003/CSE2.suo msvc2003/Debug msvc2003/Release msvc2003/Debug (Japanese) -msvc2003/Release (Japanese) \ No newline at end of file +msvc2003/Release (Japanese) From 92dedc64c51c4954f209f0871feb5619d7fe223b Mon Sep 17 00:00:00 2001 From: Gabriel Ravier Date: Thu, 2 May 2019 16:33:33 +0200 Subject: [PATCH 3/5] Made .gitignore ignore only specific executable files instead of filtering out all files without extensions --- .gitignore | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index d5f427d4..dfc63e39 100644 --- a/.gitignore +++ b/.gitignore @@ -13,13 +13,11 @@ build.zip msvc2003/devilution/orig.asm msvc2003/devilution/compare.asm -# Exclude build output on Linux (exclude all files without an extension (executables)) -build_en/* -!build_en/**/ -!build_en/*.* -build_jp/* -!build_jp/**/ -!build_jp/*.* +# Exclude build output on Linux (exclude normally produced executable files) +build_en/CSE2 +build_en/DoConfig +build_jp/CSE2 +build_jp/DoConfig # Exclude executables in the build folder (and .exe.manifest files) build_en/*.exe From 1b15898c6a8584f06b37baceda6a228124644c9d Mon Sep 17 00:00:00 2001 From: Gabriel Ravier Date: Thu, 2 May 2019 17:00:43 +0200 Subject: [PATCH 4/5] Added "release", "debug", "releasejp" and "debugjp" to list of filtered-out executables --- .gitignore | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.gitignore b/.gitignore index dfc63e39..568c6748 100644 --- a/.gitignore +++ b/.gitignore @@ -16,8 +16,16 @@ msvc2003/devilution/compare.asm # Exclude build output on Linux (exclude normally produced executable files) build_en/CSE2 build_en/DoConfig +build_en/release +build_en/debug +build_en/releasejp +build_en/debugjp build_jp/CSE2 build_jp/DoConfig +build_jp/release +build_jp/debug +build_jp/releasejp +build_jp/debugjp # Exclude executables in the build folder (and .exe.manifest files) build_en/*.exe From ef4a4ef43b986cb5e4dd60ef753c79d7f79acb22 Mon Sep 17 00:00:00 2001 From: Gabriel Ravier Date: Thu, 2 May 2019 18:08:49 +0200 Subject: [PATCH 5/5] Removed redundantly excluded files in .gitignore Signed-off-by: Gabriel Ravier --- .gitignore | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 568c6748..bf0695a9 100644 --- a/.gitignore +++ b/.gitignore @@ -16,17 +16,19 @@ msvc2003/devilution/compare.asm # Exclude build output on Linux (exclude normally produced executable files) build_en/CSE2 build_en/DoConfig + +# The Makefile outputs "release" and "debug" for the english build build_en/release build_en/debug -build_en/releasejp -build_en/debugjp + build_jp/CSE2 build_jp/DoConfig -build_jp/release -build_jp/debug + +# 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 build_en/*.exe.manifest