bin/rhodes-setup in rhodes-2.0.0.beta11 vs bin/rhodes-setup in rhodes-2.0.0.rc1
- old
+ new
@@ -55,11 +55,11 @@
android = ENV['ANDROID_HOME']
end
while true
android = prompt_for("Android SDK path", android, false)
- android = "" if android.nil?
+ break if android.nil?
android = android.gsub(/\\/,"/")
apilevel = -1
android_platform_dir = "/platforms/android-1.5"
Dir.glob(File.join(android, 'platforms', '*')).each do |dir|
@@ -87,12 +87,14 @@
break
end
# try to detect android ndk
-ndks = Dir.glob(File.dirname(android) + "/android-ndk-*").sort
ndk = ""
-ndk = ndks.last if ndks.size > 0
+unless android.nil?
+ ndks = Dir.glob(File.dirname(android) + "/android-ndk-*").sort
+ ndk = ndks.last if ndks.size > 0
+end
androidndk = prompt_for("Android NDK path", ndk, false)
#now cabwiz
cabwiz = ""
cabwiz = "/Program Files/Windows Mobile 6 SDK/Tools/CabWiz" if File.exists? "/Program Files/Windows Mobile 6 SDK/Tools/CabWiz"