From 930cdb67c702c37ed8fa7327ce9f399f1acc9f31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <remi@godotengine.org>
Date: Tue, 7 Jan 2020 14:48:11 +0100
Subject: [PATCH] Mono: Add net_4_x_win and net_4_x BCLs to templates

Also accommodate recent change with mono-glue files.
---
 build-android/build.sh    | 3 ++-
 build-javascript/build.sh | 3 ++-
 build-linux/build.sh      | 3 ++-
 build-macosx/build.sh     | 3 ++-
 build-release.sh          | 6 ++++++
 build-server/build.sh     | 3 ++-
 build-windows/build.sh    | 3 ++-
 7 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/build-android/build.sh b/build-android/build.sh
index aa6e424..d6a83b0 100755
--- a/build-android/build.sh
+++ b/build-android/build.sh
@@ -48,7 +48,8 @@ if [ "${MONO}" == "1" ]; then
   echo "Starting Mono build for Android..."
 
   cp /root/mono-glue/*.cpp modules/mono/glue/
-  cp -r /root/mono-glue/Managed/Generated modules/mono/glue/Managed/
+  cp -r /root/mono-glue/GodotSharp/GodotSharp/Generated modules/mono/glue/GodotSharp/GodotSharp/
+  cp -r /root/mono-glue/GodotSharp/GodotSharpEditor/Generated modules/mono/glue/GodotSharp/GodotSharpEditor/
 
   $SCONS platform=android android_arch=armv7 $OPTIONS $OPTIONS_MONO mono_prefix=/root/mono-installs/android-armeabi-v7a-release tools=no target=release_debug
   $SCONS platform=android android_arch=armv7 $OPTIONS $OPTIONS_MONO mono_prefix=/root/mono-installs/android-armeabi-v7a-release tools=no target=release
diff --git a/build-javascript/build.sh b/build-javascript/build.sh
index 93dd195..a9ea0b1 100755
--- a/build-javascript/build.sh
+++ b/build-javascript/build.sh
@@ -34,7 +34,8 @@ if [ "${MONO}" == "1" ]; then
   echo "Starting Mono build for JavaScript..."
 
   cp /root/mono-glue/*.cpp modules/mono/glue/
-  cp -r /root/mono-glue/Managed/Generated modules/mono/glue/Managed/
+  cp -r /root/mono-glue/GodotSharp/GodotSharp/Generated modules/mono/glue/GodotSharp/GodotSharp/
+  cp -r /root/mono-glue/GodotSharp/GodotSharpEditor/Generated modules/mono/glue/GodotSharp/GodotSharpEditor/
 
   $SCONS platform=javascript ${OPTIONS} ${OPTIONS_MONO} target=release_debug tools=no
   $SCONS platform=javascript ${OPTIONS} ${OPTIONS_MONO} target=release tools=no
diff --git a/build-linux/build.sh b/build-linux/build.sh
index 20e02ec..5a56a5d 100755
--- a/build-linux/build.sh
+++ b/build-linux/build.sh
@@ -40,7 +40,8 @@ if [ "${MONO}" == "1" ]; then
   echo "Starting Mono build for Linux..."
 
   cp /root/mono-glue/*.cpp modules/mono/glue/
-  cp -r /root/mono-glue/Managed/Generated modules/mono/glue/Managed/
+  cp -r /root/mono-glue/GodotSharp/GodotSharp/Generated modules/mono/glue/GodotSharp/GodotSharp/
+  cp -r /root/mono-glue/GodotSharp/GodotSharpEditor/Generated modules/mono/glue/GodotSharp/GodotSharpEditor/
   export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/lib/pkgconfig/
 
   $SCONS platform=x11 CC=$CC CXX=$CXX $OPTIONS $OPTIONS_MONO tools=yes target=release_debug copy_mono_root=yes
diff --git a/build-macosx/build.sh b/build-macosx/build.sh
index 71fdfe9..3476a7f 100755
--- a/build-macosx/build.sh
+++ b/build-macosx/build.sh
@@ -40,7 +40,8 @@ if [ "${MONO}" == "1" ]; then
   echo "Starting Mono build for macOS..."
 
   cp /root/mono-glue/*.cpp modules/mono/glue/
-  cp -r /root/mono-glue/Managed/Generated modules/mono/glue/Managed/
+  cp -r /root/mono-glue/GodotSharp/GodotSharp/Generated modules/mono/glue/GodotSharp/GodotSharp/
+  cp -r /root/mono-glue/GodotSharp/GodotSharpEditor/Generated modules/mono/glue/GodotSharp/GodotSharpEditor/
 
   $SCONS platform=osx $OPTIONS $OPTIONS_MONO tools=yes target=release_debug copy_mono_root=yes
 
diff --git a/build-release.sh b/build-release.sh
index 1f77285..7e7deb9 100755
--- a/build-release.sh
+++ b/build-release.sh
@@ -263,6 +263,9 @@ if [ "${build_mono}" == "1" ]; then
   cp out/linux/x86/templates-mono/godot.x11.opt.debug.32.mono ${templatesdir_mono}/linux_x11_32_debug
   cp out/linux/x86/templates-mono/godot.x11.opt.32.mono ${templatesdir_mono}/linux_x11_32_release
 
+  mkdir -p ${templatesdir_mono}/bcl
+  cp -r out/linux/x64/tools-mono/GodotSharp/Mono/lib/mono/4.5/ ${templatesdir_mono}/bcl/net_4_x
+
   ## Windows (Mono) ##
 
   # Editor
@@ -299,6 +302,9 @@ if [ "${build_mono}" == "1" ]; then
   sign ${templatesdir_mono}/windows_32_debug.exe
   sign ${templatesdir_mono}/windows_32_release.exe
 
+  mkdir -p ${templatesdir_mono}/bcl
+  cp -r out/windows/x64/tools-mono/GodotSharp/Mono/lib/mono/4.5/ ${templatesdir_mono}/bcl/net_4_x_win
+
   ## OSX (Mono) ##
 
   # Editor
diff --git a/build-server/build.sh b/build-server/build.sh
index 47bfaca..69b4380 100755
--- a/build-server/build.sh
+++ b/build-server/build.sh
@@ -40,7 +40,8 @@ if [ "${MONO}" == "1" ]; then
   echo "Starting Mono build for Server..."
 
   cp /root/mono-glue/*.cpp modules/mono/glue/
-  cp -r /root/mono-glue/Managed/Generated modules/mono/glue/Managed/
+  cp -r /root/mono-glue/GodotSharp/GodotSharp/Generated modules/mono/glue/GodotSharp/GodotSharp/
+  cp -r /root/mono-glue/GodotSharp/GodotSharpEditor/Generated modules/mono/glue/GodotSharp/GodotSharpEditor/
 
   $SCONS platform=server CC=$CC CXX=$CXX $OPTIONS $OPTIONS_MONO tools=yes target=release_debug copy_mono_root=yes
   mkdir -p /root/out/tools-mono
diff --git a/build-windows/build.sh b/build-windows/build.sh
index f6ad2c7..c801bd6 100755
--- a/build-windows/build.sh
+++ b/build-windows/build.sh
@@ -51,7 +51,8 @@ if [ "${MONO}" == "1" ]; then
   echo "Starting Mono build for Windows..."
 
   cp /root/mono-glue/*.cpp modules/mono/glue/
-  cp -r /root/mono-glue/Managed/Generated modules/mono/glue/Managed/
+  cp -r /root/mono-glue/GodotSharp/GodotSharp/Generated modules/mono/glue/GodotSharp/GodotSharp/
+  cp -r /root/mono-glue/GodotSharp/GodotSharpEditor/Generated modules/mono/glue/GodotSharp/GodotSharpEditor/
 
   $SCONS platform=windows bits=64 $OPTIONS $OPTIONS_MONO mono_prefix=$MONO64_PREFIX tools=yes target=release_debug copy_mono_root=yes
   mkdir -p /root/out/x64/tools-mono