From 448a3cf1d601cdd9345fe9eb4491d8d5a1e4125f Mon Sep 17 00:00:00 2001 From: Sebastien Pouliot Date: Fri, 13 May 2016 16:29:41 -0400 Subject: [PATCH 1/2] [mtouch] Look where XS 6.1+ has installed mlaunch. Fixes part of #41083 The initial location was incorrectly guessed (before XS added it). $ mtouch --launchsim tests//monotouch-test/bin/iPhoneSimulator/Debug/monotouchtest.app --sdkroot /Applications/Xcode73.app/Contents/Developer/ error MT0092: Could not find 'mlaunch'. https://bugzilla.xamarin.com/show_bug.cgi?id=41083 --- tools/mtouch/mtouch.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/mtouch/mtouch.cs b/tools/mtouch/mtouch.cs index 49c8a538f0cc..5986488cbfea 100644 --- a/tools/mtouch/mtouch.cs +++ b/tools/mtouch/mtouch.cs @@ -1519,7 +1519,7 @@ static string MlaunchPath { return path; // check inside XS - path = "/Applications/Xamarin Studio.app/Contents/MacOS/mlaunch"; + path = "/Applications/Xamarin Studio.app/Contents/Resources/lib/monodevelop/AddIns/MonoDevelop.IPhone/mlaunch.app/Contents/MacOS/mlaunch"; if (File.Exists (path)) return path; From 61b3006b84458e6699f448a2bd80fe8071230b77 Mon Sep 17 00:00:00 2001 From: Sebastien Pouliot Date: Sat, 14 May 2016 11:11:40 -0400 Subject: [PATCH 2/2] [mtouch] Fix --sdkroot not to report a default to /Developer/. Fixes part of #41083 Also bump maccore so `mlaunch` behave like `mtouch` wrt --sdkroot https://bugzilla.xamarin.com/show_bug.cgi?id=41083 --- mk/xamarin.mk | 2 +- tools/mtouch/mtouch.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mk/xamarin.mk b/mk/xamarin.mk index 3a381f41a006..6ac3960a17cd 100644 --- a/mk/xamarin.mk +++ b/mk/xamarin.mk @@ -1,5 +1,5 @@ ifdef ENABLE_XAMARIN -NEEDED_MACCORE_VERSION := eb9c34d8752ccbc74eafe267232c4c77ba8f631f +NEEDED_MACCORE_VERSION := 16ebbc5b4401ecdd86c60bb0ddbf3234334f63b5 NEEDED_MACCORE_BRANCH := master MACCORE_DIRECTORY := maccore diff --git a/tools/mtouch/mtouch.cs b/tools/mtouch/mtouch.cs index 5986488cbfea..00477a7ce691 100644 --- a/tools/mtouch/mtouch.cs +++ b/tools/mtouch/mtouch.cs @@ -1283,7 +1283,7 @@ static int Main2 (string [] args) { "unsupported--enable-generics-in-registrar", "[Deprecated]", v => { enable_generic_nsobject = true; classic_only_arguments.Add ("--unsupported--enable-generics-in-registrar"); }, true }, { "stderr=", "Redirect the standard error for the simulated application to the specified file [DEPRECATED]", v => { }, true }, { "stdout=", "Redirect the standard output for the simulated application to the specified file [DEPRECATED]", v => { }, true }, - { "sdkroot=", "Specify the location of Apple SDKs, default to: '/Developer/'", v => sdk_root = v }, + { "sdkroot=", "Specify the location of Apple SDKs, default to 'xcode-select' value.", v => sdk_root = v }, { "crashreporting-api-key=", "Specify the Crashlytics API key to use (which will also enable Crashlytics support). [Deprecated].", v => { throw new MonoTouchException (16, true, "The option '{0}' has been deprecated.", "--crashreporting-api-key");