From a9c49ccb39b910dba29b209a6e564dcbfcccd8ed Mon Sep 17 00:00:00 2001
From: Dean Ellis <dellis1972@googlemail.com>
Date: Wed, 22 Feb 2017 11:43:04 +0000
Subject: [PATCH] Bump Pipeline tool on MacOS to use v4.6.1. (#5457)

* Bump Pipeline tool on MacOS to use v4.6.1.

* Fixed up the dylib "id" to NOT include a mono path.

* More fixes.. hopefully

* Added missing files to Pipeline package

* Fixed a weird issue with mono

* fixed previous commit
---
 Build/Projects/Pipeline.definition            |  4 ++++
 Installers/MacOS/Scripts/Pipeline/postinstall |  3 +++
 Installers/default.build                      | 15 ++++++++++++++-
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/Build/Projects/Pipeline.definition b/Build/Projects/Pipeline.definition
index 40b91e6b6ad..a41eea1c6a7 100644
--- a/Build/Projects/Pipeline.definition
+++ b/Build/Projects/Pipeline.definition
@@ -28,6 +28,10 @@
       <Platform Name="MacOS">TRACE;MONOMAC;GTK2</Platform>
       <Platform Name="Linux">TRACE;LINUX;GTK3</Platform>
     </CustomDefinitions>
+    <FrameworkVersions>
+      <Platform Name="MacOS"><Version>v4.6.1</Version></Platform>
+    </FrameworkVersions>
+    <IncludeMonoRuntimeOnMac>True</IncludeMonoRuntimeOnMac>
   </Properties>
 
   <Files>
diff --git a/Installers/MacOS/Scripts/Pipeline/postinstall b/Installers/MacOS/Scripts/Pipeline/postinstall
index 27cfeeaa056..c89b179a820 100755
--- a/Installers/MacOS/Scripts/Pipeline/postinstall
+++ b/Installers/MacOS/Scripts/Pipeline/postinstall
@@ -37,6 +37,9 @@ if [ -d '/Applications/Xamarin Studio.app' ]
 then
   /Applications/Xamarin\ Studio.app/Contents/MacOS/mdtool setup uninstall MonoDevelop.MonoGame -y
 fi
+if [ ! -d '/Library/Frameworks/Mono.framework/Versions/4.6.2' ]
+	ln -s /Library/Frameworks/Mono.framework/Versions/Current /Library/Frameworks/Mono.framework/Versions/4.6.2
+fi
 sudo rm /usr/local/bin/mgcb
 sudo rm /usr/local/bin/monogame-uninstall
 " >> /usr/local/bin/monogame-uninstall
diff --git a/Installers/default.build b/Installers/default.build
index cdb250d9aee..d83bbc522eb 100644
--- a/Installers/default.build
+++ b/Installers/default.build
@@ -54,8 +54,21 @@
       <copy todir="../Tools/Pipeline/bin/MacOS/AnyCPU/Release/Pipeline.app/Contents/MonoBundle">
          <fileset basedir="../Tools/Pipeline/bin/MacOS/AnyCPU/Release">
              <include name="ff*"/>
-         </fileset>
+             <include name="*.dylib"/> 
+        </fileset>
       </copy>
+      <!-- Correct the id of the dylibs -->
+      <foreach item="File" property="dylibname">
+          <in>
+             <items basedir="../Tools/Pipeline/bin/MacOS/AnyCPU/Release/Pipeline.app/Contents/MonoBundle/">
+             <include name="*.dylib" />
+             </items>
+          </in>
+          <do>
+             <echo message="${path::get-file-name(dylibname)}" />
+             <exec program="install_name_tool" workingdir="../Tools/Pipeline/bin/MacOS/AnyCPU/Release/Pipeline.app/Contents/MonoBundle" commandline=' -id "@executable_path/../MonoBundle/${path::get-file-name(dylibname)}" ${path::get-file-name(dylibname)}' />
+          </do>
+      </foreach>
       <exec program="pkgbuild" workingdir="../Tools/Pipeline/bin/MacOS/AnyCPU/Release" commandline=" --component ./Pipeline.app --identifier com.monogame.pipeline --version ${buildNumber} --scripts ${project::get-base-directory()}/MacOS/Scripts/Pipeline --install-location /Applications ${project::get-base-directory()}/Pipeline.MacOS.pkg" />
       <exec program="pkgbuild" workingdir="." commandline=" --root ./root --identifier com.monogame.xsaddin --version ${buildNumber} --scripts ${project::get-base-directory()}/MacOS/Scripts/Addin ${project::get-base-directory()}/MonoGame.XamarinStudio.Addin.pkg" />
       <!-- Build Framework .pkg -->