Mono: Add net_4_x_win and net_4_x BCLs to templates

Also accommodate recent change with mono-glue files.

Author: akien-mga

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

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

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

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
 

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

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

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