Skip to content

Adjust SDK validation to allow tools/bin and not allow usr/bin. #71

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
Mar 5, 2020
Merged

Adjust SDK validation to allow tools/bin and not allow usr/bin. #71

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
42 changes: 25 additions & 17 deletions Xamarin.MacDev/MonoTouchSdk.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public class MonoTouchSdk

DateTime lastMTExeWrite = DateTime.MinValue;
PDictionary versions;
bool hasUsrSubdir;
string mtouchPath;

static MonoTouchSdk ()
{
Expand All @@ -94,13 +94,15 @@ public MonoTouchSdk (string sdkDir)

public string BinDir {
get {
return Path.Combine (SdkDir, hasUsrSubdir ? "usr/bin" : "bin");
// mtouch is in the bin dir
return Path.GetDirectoryName (mtouchPath);
}
}

public string LibDir {
get {
return Path.Combine (SdkDir, hasUsrSubdir ? "usr/lib" : "lib");
// the lib dir is next to the bin dir
return Path.Combine (Path.GetDirectoryName (BinDir), "lib");
}
}

Expand Down Expand Up @@ -179,26 +181,24 @@ static PDictionary CreateDefaultVersionsPlist ()

void Init ()
{
string currentLocation = IsInstalled ? Path.Combine (BinDir, "mtouch") : null;
string currentLocation = IsInstalled ? mtouchPath : null;

IsInstalled = false;
versions = null;

if (string.IsNullOrEmpty (SdkDir)) {
foreach (var loc in DefaultLocations) {
if (IsInstalled = ValidateSdkLocation (loc, out hasUsrSubdir)) {
if (IsInstalled = ValidateSdkLocation (loc, out mtouchPath)) {
SdkDir = loc;
break;
}
}
} else {
IsInstalled = ValidateSdkLocation (SdkDir, out hasUsrSubdir);
IsInstalled = ValidateSdkLocation (SdkDir, out mtouchPath);
}

string mtouch = null;
if (IsInstalled) {
mtouch = Path.Combine (BinDir, "mtouch");
lastMTExeWrite = File.GetLastWriteTimeUtc (mtouch);
lastMTExeWrite = File.GetLastWriteTimeUtc (mtouchPath);
Version = ReadVersion ();

if (Version.CompareTo (requiredXI) >= 0) {
Expand Down Expand Up @@ -235,7 +235,7 @@ void Init ()
AnalyticsService.ReportSdkVersion ("XS.Core.SDK.iOS.Version", string.Empty);
}

if (Changed != null && currentLocation != mtouch)
if (Changed != null && currentLocation != mtouchPath)
Changed (this, EventArgs.Empty);
}

Expand All @@ -256,23 +256,31 @@ IPhoneSdkVersion ReadVersion ()

public static bool ValidateSdkLocation (string sdkDir)
{
bool hasUsrSubdir;

return ValidateSdkLocation (sdkDir, out hasUsrSubdir);
return ValidateSdkLocation (sdkDir, out string _);
}

public static bool ValidateSdkLocation (string sdkDir, out bool hasUsrSubdir)
{
hasUsrSubdir = false;
return ValidateSdkLocation (sdkDir, out string _);
}

public static bool ValidateSdkLocation (string sdkDir, out string mtouchPath)
{
mtouchPath = null;

if (!File.Exists (Path.Combine (sdkDir, "Version")))
return false;

if (File.Exists (Path.Combine (sdkDir, "bin", "mtouch")))
var path = Path.Combine (sdkDir, "bin", "mtouch");
if (File.Exists (path)) {
mtouchPath = path;
return true;
}

if (File.Exists (Path.Combine (sdkDir, "usr", "bin", "mtouch"))) {
hasUsrSubdir = true;
path = Path.Combine (sdkDir, "tools", "bin", "mtouch");
if (File.Exists (path)) {
mtouchPath = path;
return true;
}

Expand Down Expand Up @@ -367,7 +375,7 @@ public void CheckCaches ()
{
if (IsInstalled) {
try {
var lastWrite = File.GetLastWriteTimeUtc (Path.Combine (BinDir, "mtouch"));
var lastWrite = File.GetLastWriteTimeUtc (mtouchPath);
if (lastWrite == lastMTExeWrite)
return;
} catch (IOException) {
Expand Down