From 61a59c8eb7b55254b34e1a9bebc6df64bc0bdf48 Mon Sep 17 00:00:00 2001
From: Sebastian Morr <sebastian@morr.cc>
Date: Wed, 9 Sep 2020 17:04:22 +0200
Subject: [PATCH] When exporting for Windows, bundle with PortableGit

---
 .gitignore         |  4 +++-
 Makefile           | 14 ++++++++++----
 export_presets.cfg |  8 ++++----
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3a96203..507c9e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
-.import/
+/.import/
+/cache/
+/dependencies/
diff --git a/Makefile b/Makefile
index 215405d..efcbf10 100644
--- a/Makefile
+++ b/Makefile
@@ -6,20 +6,26 @@ linux:
 	mkdir -p /tmp/$(name)-linux
 	/usr/bin/godot --export "Linux" "/tmp/$(name)-linux/$(name)"
 	zip -r /tmp/$(name)-linux.zip /tmp/$(name)-linux
-	#rm -r /tmp/$(name)-linux
 
 macos:
 	/usr/bin/godot --export "Mac OS" "/tmp/$(name)-macos.app"
 	mv "/tmp/$(name)-macos.app" "/tmp/$(name)-macos.zip"
 
-windows:
+windows: dependencies/windows/git/
 	mkdir -p /tmp/$(name)-windows
 	/usr/bin/godot --export "Windows" "/tmp/$(name)-windows/$(name).exe"
+	cp -r --parents dependencies/windows/git/ /tmp/$(name)-windows/
 	zip -r /tmp/$(name)-windows.zip /tmp/$(name)-windows
-	#rm -r /tmp/$(name)-windows
 
 web:
 	mkdir -p /tmp/$(name)-web
 	/usr/bin/godot --export "HTML5" "/tmp/$(name)-web/index.html"
 	zip -r /tmp/$(name)-web.zip /tmp/$(name)-web
-	#rm -r /tmp/$(name)-web
+
+# Dependencies:
+
+cache/portablegit.7z.exe:
+	wget https://github.com/git-for-windows/git/releases/download/v2.28.0.windows.1/PortableGit-2.28.0-64-bit.7z.exe -O cache/portablegit.7z.exe
+
+dependencies/windows/git/: cache/portablegit.7z.exe
+	wine cache/portablegit.7z.exe -o dependencies/windows/git/ -y
diff --git a/export_presets.cfg b/export_presets.cfg
index 7d17696..9a3d06c 100644
--- a/export_presets.cfg
+++ b/export_presets.cfg
@@ -6,7 +6,7 @@ runnable=true
 custom_features=""
 export_filter="all_resources"
 include_filter="levels/*, scripts/*"
-exclude_filter=""
+exclude_filter="dependencies/*, cache/*"
 export_path=""
 patch_list=PoolStringArray(  )
 script_export_mode=1
@@ -32,7 +32,7 @@ runnable=true
 custom_features=""
 export_filter="all_resources"
 include_filter="levels/*, scripts/*"
-exclude_filter=""
+exclude_filter="dependencies/*, cache/*"
 export_path=""
 patch_list=PoolStringArray(  )
 script_export_mode=1
@@ -65,7 +65,7 @@ runnable=true
 custom_features=""
 export_filter="all_resources"
 include_filter="levels/*, scripts/*"
-exclude_filter=""
+exclude_filter="dependencies/*, cache/*"
 export_path=""
 patch_list=PoolStringArray(  )
 script_export_mode=1
@@ -107,7 +107,7 @@ runnable=true
 custom_features=""
 export_filter="all_resources"
 include_filter="levels/*, scripts/*"
-exclude_filter=""
+exclude_filter="dependencies/*, cache/*"
 export_path=""
 patch_list=PoolStringArray(  )
 script_export_mode=1