@@ -9,6 +9,8 @@ namespace Xamarin.Android.Build.Utilities
99 abstract class MonoDroidSdkBase
1010 {
1111 protected readonly static string DebugRuntime = "Mono.Android.DebugRuntime-debug.apk" ;
12+ protected readonly static string GeneratorExe = "generator.exe" ;
13+ protected readonly static string GeneratorScript = "generator" ;
1214
1315 // I can never remember the difference between SdkPath and anything else...
1416 [ Obsolete ( "Do not use." ) ]
@@ -31,16 +33,18 @@ abstract class MonoDroidSdkBase
3133
3234 public int SharedRuntimeVersion { get ; private set ; }
3335
34- // runtimePath : contains Mono.Android.DebugRuntime-*.apk
36+ // expectedRuntimePath : contains Mono.Android.DebugRuntime-*.apk
3537 // binPath: contains mandroid
3638 // mscorlibDir: contains mscorlib.dll
37- public void Initialize ( string runtimePath = null , string binPath = null , string bclPath = null )
39+ public void Initialize ( string expectedRuntimePath = null , string binPath = null , string bclPath = null )
3840 {
39- runtimePath = GetValidPath ( "MonoAndroidToolsPath" , runtimePath , ValidateRuntime , ( ) => FindRuntime ( ) ) ;
41+ var runtimePath = GetValidPath ( "MonoAndroidToolsPath" , expectedRuntimePath , ValidateRuntime , ( ) => FindRuntime ( ) ) ;
4042 if ( runtimePath != null ) {
4143 binPath = GetValidPath ( "MonoAndroidBinPath" , binPath , ValidateBin , ( ) => FindBin ( runtimePath ) ) ;
4244 bclPath = GetValidPath ( "mscorlib.dll" , bclPath , ValidateFramework , ( ) => FindFramework ( runtimePath ) ) ;
4345 } else {
46+ if ( expectedRuntimePath != null )
47+ AndroidLogger . LogWarning ( null , "Runtime was not found at {0}" , expectedRuntimePath ) ;
4448 binPath = bclPath = null ;
4549 }
4650
@@ -67,14 +71,21 @@ public void Initialize (string runtimePath = null, string binPath = null, string
6771
6872 static string GetValidPath ( string description , string path , Func < string , bool > validator , Func < string > defaultPath )
6973 {
70- if ( ! string . IsNullOrEmpty ( path ) && Directory . Exists ( path ) ) {
71- if ( validator ( path ) )
72- return path ;
73- AndroidLogger . LogWarning ( "{0} path {1} is not valid; skipping." , description , path ) ;
74+ if ( ! string . IsNullOrEmpty ( path ) ) {
75+ if ( Directory . Exists ( path ) ) {
76+ if ( validator ( path ) )
77+ return path ;
78+ AndroidLogger . LogWarning ( null , "{0} path '{1}' is explicitly specified, but it was not valid; skipping." , description , path ) ;
79+ } else
80+ AndroidLogger . LogWarning ( null , "{0} path '{1}' is explicitly specified, but it was not found; skipping." , description , path ) ;
7481 }
7582 path = defaultPath ( ) ;
7683 if ( path != null && validator ( path ) )
7784 return path ;
85+ if ( path != null )
86+ AndroidLogger . LogWarning ( null , "{0} path is defaulted to '{1}', but it was not valid; skipping" , description , path ) ;
87+ else
88+ AndroidLogger . LogWarning ( null , "{0} path is not found and no default location is provided; skipping" , description ) ;
7889 return null ;
7990 }
8091
@@ -96,6 +107,7 @@ protected static bool ValidateRuntime (string loc)
96107 {
97108 return ! string . IsNullOrWhiteSpace ( loc ) &&
98109 ( File . Exists ( Path . Combine ( loc , DebugRuntime ) ) || // Normal/expected
110+ File . Exists ( Path . Combine ( loc , GeneratorExe ) ) || // Normal/expected
99111 File . Exists ( Path . Combine ( loc , "Ionic.Zip.dll" ) ) ) ; // Wrench builds
100112 }
101113
0 commit comments