Skip to content

Use what's returned by 'xcode-select -p' as the configured Xcode if none is specified in Visual Studio's settings. #84

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rolfbjarne merged 1 commit into from
Oct 29, 2020
Merged

Use what's returned by 'xcode-select -p' as the configured Xcode if none is specified in Visual Studio's settings. #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
85 changes: 46 additions & 39 deletions Xamarin.MacDev/AppleSdkSettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ public static class AppleSdkSettings
// Put newer SDKs at the top as we scan from 0 -> List.Count
public static readonly string[] DefaultRoots = new string[] {
"/Applications/Xcode.app",
"/Developer"
};
static DateTime lastWritten;

Expand Down Expand Up @@ -107,23 +106,25 @@ public static void SetConfiguredSdkLocation (string location)

public static string GetConfiguredSdkLocation ()
{
PDictionary plist;
PDictionary plist = null;
PString value;
bool binary;

try {
if (File.Exists (SettingsPath))
plist = PDictionary.FromFile (SettingsPath, out binary);
else
plist = new PDictionary ();
plist = PDictionary.FromFile (SettingsPath, out var _);
} catch (FileNotFoundException) {
plist = new PDictionary ();
}

if (!plist.TryGetValue ("AppleSdkRoot", out value))
return DefaultRoots[0];
// First try the configured location in Visual Studio
if (plist != null && plist.TryGetValue ("AppleSdkRoot", out value) && !string.IsNullOrEmpty (value?.Value))
return value.Value;

return value.Value;
// Then check the system's default Xcode
if (TryGetSystemXcode (out var path))
return path;

// Finally return the hardcoded default
return DefaultRoots [0];
}

static void SetInvalid ()
Expand Down Expand Up @@ -152,6 +153,40 @@ static AppleSdkSettings ()
Init ();
}

static bool TryGetSystemXcode (out string path)
{
path = null;
if (!File.Exists ("/usr/bin/xcode-select"))
return false;

try {
using var process = new Process ();
process.StartInfo.FileName = "/usr/bin/xcode-select";
process.StartInfo.Arguments = "--print-path";
process.StartInfo.RedirectStandardOutput = true;
process.StartInfo.UseShellExecute = false;
process.Start ();
var stdout = process.StandardOutput.ReadToEnd ();
process.WaitForExit ();

stdout = stdout.Trim ();
if (Directory.Exists (stdout)) {
if (stdout.EndsWith ("/Contents/Developer", StringComparison.Ordinal))
stdout = stdout.Substring (0, stdout.Length - "/Contents/Developer".Length);

path = stdout;
return true;
}

LoggingService.LogInfo ("The system's Xcode location {0} does not exist", stdout);

return false;
} catch (Exception e) {
LoggingService.LogInfo ("Could not get the system's Xcode location: {0}", e);
return false;
}
}

public static void Init ()
{
string devroot = null, vplist = null, xcode = null;
Expand All @@ -160,37 +195,9 @@ public static void Init ()
SetInvalid ();

DeveloperRoot = Environment.GetEnvironmentVariable ("MD_APPLE_SDK_ROOT");
if (string.IsNullOrEmpty (DeveloperRoot)) {
if (string.IsNullOrEmpty (DeveloperRoot))
DeveloperRoot = GetConfiguredSdkLocation ();

if (string.IsNullOrEmpty (DeveloperRoot) && File.Exists ("/usr/bin/xcode-select")) {
var startInfo = new ProcessStartInfo ("/usr/bin/xcode-select", "--print-path");
startInfo.RedirectStandardOutput = true;
startInfo.UseShellExecute = false;

var process = new Process ();
var stdout = string.Empty;

try {
process.StartInfo = startInfo;
process.OutputDataReceived += (sender, e) => stdout += e.Data;
process.Start ();
process.WaitForExit ();
} catch (Win32Exception) {
stdout = string.Empty;
}

stdout = stdout.Trim ();

if (!string.IsNullOrEmpty (stdout) && Directory.Exists (stdout)) {
if (stdout.EndsWith ("/Contents/Developer", StringComparison.Ordinal))
stdout = stdout.Substring (0, stdout.Length - "/Contents/Developer".Length);

DeveloperRoot = stdout;
}
}
}

if (string.IsNullOrEmpty (DeveloperRoot)) {
foreach (var v in DefaultRoots) {
if (ValidateSdkLocation (v, out xcode, out vplist, out devroot)) {
Expand Down
1 change: 1 addition & 0 deletions Xamarin.MacDev/Xamarin.MacDev.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<TargetFrameworks>net451;net461;netstandard2.0</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<LangVersion>latest</LangVersion>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MicroBuild.Core" Version="0.3.0">
Expand Down