rhodes 2.0.0.beta7 → 2.0.0.beta8

data/platform/android/build/android.rake

@@ -35,10 +35,6 @@ ANDROID_PERMISSIONS = {
   'vibrate' => 'VIBRATE'
 }
 
-def get_sources(name)
-  File.read(File.join($builddir, name + '_build.files')).split("\n")
-end
-
 def set_app_name_android(newname)
   puts "set_app_name"
   $stdout.flush
@@ -446,7 +442,7 @@ namespace "build" do
       objdir = $objdir["sqlite"]
       libname = $libname["sqlite"]
 
-      cc_compile File.join(srcdir, "sqlite3.c"), objdir, ["-I#{srcdir}"] or exit 1
+      cc_build 'libsqlite', objdir, ["-I#{srcdir}"] or exit 1
       cc_ar libname, Dir.glob(objdir + "/**/*.o") or exit 1
     end
 
@@ -468,9 +464,7 @@ namespace "build" do
       args << "-I#{srcdir}/../include"
       args << "-I#{srcdir}"
 
-      get_sources('libcurl').each do |f|
-        cc_compile f, objdir, args or exit 1
-      end
+      cc_build 'libcurl', objdir, args or exit 1
       cc_ar libname, Dir.glob(objdir + "/**/*.o") or exit 1
     end
 
@@ -486,10 +480,7 @@ namespace "build" do
       args << "-I#{srcdir}/.."
       args << "-I#{srcdir}/../sqlite"
 
-      get_sources('libruby').each do |f|
-        cc_compile f, objdir, args or exit 1
-      end
-
+      cc_build 'libruby', objdir, args or exit 1
       cc_ar libname, Dir.glob(objdir + "/**/*.o") or exit 1
     end
 
@@ -503,10 +494,7 @@ namespace "build" do
       args << "-D__NEW__" if USE_STLPORT
       args << "-I#{$stlport_includes}" if USE_STLPORT
 
-      objects = []
-      get_sources('libjson').each do |f|
-        cc_compile f, objdir, args or exit 1
-      end
+      cc_build 'libjson', objdir, args or exit 1
       cc_ar libname, Dir.glob(objdir + "/**/*.o") or exit 1
     end
 
@@ -532,9 +520,7 @@ namespace "build" do
           args << "-fno-rtti"
           args << "-fno-exceptions"
 
-          get_sources('libstlport').each do |f|
-            cc_compile f, objdir, args or exit 1
-          end
+          cc_build 'libstlport', objdir, args or exit 1
           cc_ar libname, Dir.glob(objdir + "/**/*.o") or exit 1
         end
       end
@@ -549,9 +535,7 @@ namespace "build" do
       args << "-D__NEW__" if USE_STLPORT
       args << "-I#{$stlport_includes}" if USE_STLPORT
 
-      get_sources('librholog').each do |f|
-        cc_compile f, objdir, args or exit 1
-      end
+      cc_build 'librholog', objdir, args or exit 1
       cc_ar libname, Dir.glob(objdir + "/**/*.o") or exit 1
     end
 
@@ -564,9 +548,7 @@ namespace "build" do
       args << "-D__NEW__" if USE_STLPORT
       args << "-I#{$stlport_includes}" if USE_STLPORT
 
-      get_sources('librhomain').each do |f|
-        cc_compile f, objdir, args or exit 1
-      end
+      cc_build 'librhomain', objdir, args or exit 1
       cc_ar libname, Dir.glob(objdir + "/**/*.o") or exit 1
     end
 
@@ -579,10 +561,7 @@ namespace "build" do
       args << "-D__NEW__" if USE_STLPORT
       args << "-I#{$stlport_includes}" if USE_STLPORT
 
-      objects = []
-      get_sources('librhocommon').each do |f|
-        cc_compile f, objdir, args or exit 1
-      end
+      cc_build 'librhocommon', objdir, args or exit 1
       cc_ar libname, Dir.glob(objdir + "/**/*.o") or exit 1
     end
 
@@ -597,9 +576,7 @@ namespace "build" do
       args << "-D__NEW__" if USE_STLPORT
       args << "-I#{$stlport_includes}" if USE_STLPORT
 
-      get_sources('librhodb').each do |f|
-        cc_compile f, objdir, args or exit 1
-      end
+      cc_build 'librhodb', objdir, args or exit 1
       cc_ar libname, Dir.glob(objdir + "/**/*.o") or exit 1
     end
 
@@ -614,9 +591,7 @@ namespace "build" do
       args << "-D__NEW__" if USE_STLPORT
       args << "-I#{$stlport_includes}" if USE_STLPORT
 
-      get_sources('librhosync').each do |f|
-        cc_compile f, objdir, args or exit 1
-      end
+      cc_build 'librhosync', objdir, args or exit 1
       cc_ar libname, Dir.glob(objdir + "/**/*.o") or exit 1
     end
 
@@ -739,9 +714,7 @@ namespace "build" do
       args << "-D__NEW__" if USE_STLPORT
       args << "-I#{$stlport_includes}" if USE_STLPORT
 
-      get_sources('librhodes').each do |f|
-        cc_compile f, objdir, args or exit 1
-      end
+      cc_build 'librhodes', objdir, args or exit 1
 
       deps = []
       $libname.each do |k,v|

data/platform/android/build/androidcommon.rb

@@ -15,6 +15,24 @@ else
   $ndkhost = `uname -s`.downcase!.chomp! + "-x86"
 end
 
+def num_cpus
+  if RUBY_PLATFORM =~ /linux/
+    num = `cat /proc/cpuinfo | grep processor | wc -l`
+  elsif RUBY_PLATFORM =~ /darwin/
+    num = `sysctl -n hw.ncpu`
+  elsif RUBY_PLATFORM =~ /w(in)?32/
+    num = ENV['NUMBER_OF_PROCESSORS']
+  else
+    num '1'
+  end
+  num.gsub!("\n", '')
+  num.to_i
+end
+
+def get_sources(name)
+    File.read(File.join($builddir, name + '_build.files')).split("\n")
+end
+
 def setup_ndk(ndkpath,apilevel)
   $ndkgccver = "unknown"
   ["4.4.0", "4.2.1"].each do |ver|
@@ -163,6 +181,36 @@ def cc_compile(filename, objdir, additional = nil)
   cc_run(ccbin, args)
 end
 
+def cc_build(name, objdir, additional = nil)
+  jobs = num_cpus
+  jobs += 1 if jobs > 1
+
+  srcs = []
+  jobs.times.each { |x| srcs << [] }
+  sources = get_sources(name)
+  sources.each do |src|
+    idx = sources.index(src)%jobs
+    srcs[idx] << src
+  end
+
+  ths = []
+  jobs.times.each do |x|
+    ths << Thread.new do
+      srcs[x].each do |src|
+        cc_compile src, objdir, additional or return 1
+      end
+      0
+    end
+  end
+
+  ret = 0
+  ths.each do |th|
+    v = th.value
+    ret = v unless v == 0
+  end
+  ret
+end
+
 def cc_ar(libname, objects)
   return true if FileUtils.uptodate? libname, objects
   cc_run($arbin, ["crs", libname] + objects)
@@ -197,10 +245,10 @@ def cc_link(outname, objects, additional = nil, deps = nil)
   end
   args += $cxxlibs
   $libgcc = `#{$gccbin} -mthumb-interwork -print-file-name=libgcc.a`.gsub("\n", "") if $libgcc.nil?
-  args << $libgcc
+  args << $libgcc if $ndkgccver != "4.2.1"
   args << "#{$ndksysroot}/usr/lib/libc.so"
   args << "#{$ndksysroot}/usr/lib/libm.so"
-  args << $libgcc
+  args << $libgcc if $ndkgccver == "4.2.1"
   cc_run($gccbin, args)
 end
 

data/platform/android/build/librhocommon_build.files

@@ -3,6 +3,7 @@ platform/shared/common/PosixThreadImpl.cpp
 platform/shared/common/RhoConf.cpp
 platform/shared/common/RhoFile.cpp
 platform/shared/common/RhoThread.cpp
+platform/shared/common/ThreadQueue.cpp
 platform/shared/common/SplashScreen.cpp
 platform/shared/common/Tokenizer.cpp
 platform/shared/common/AppMenu.cpp

data/platform/android/build/libsqlite_build.files

@@ -0,0 +1 @@
+platform/shared/sqlite/sqlite3.c

data/platform/bb/rhodes/platform/5.0/com/rho/BrowserAdapter5.java

@@ -7,6 +7,7 @@ import net.rim.device.api.system.Application;
 import javax.microedition.io.HttpConnection;
 import javax.microedition.io.InputConnection;
 
+import com.rho.RhodesApp;
 import com.rho.net.URI;
 
 import rhomobile.Utilities;
@@ -54,7 +55,7 @@ public class BrowserAdapter5 implements IBrowserAdapter
 				throws Exception 
 		{
 			String url = request.getURL();
-    		if ( URI.isLocalHost(url) || URI.isLocalData(url))
+    		if ( RhodesApp.getInstance().isRhodesAppUrl(url) || URI.isLocalData(url))
     		{
                 HttpConnection connection = Utilities.makeConnection(url, request.getHeaders(), null, null);
                 

data/platform/bb/rhodes/src/com/rho/BrowserAdapter.java

@@ -76,8 +76,6 @@ public class BrowserAdapter implements RenderingApplication, IBrowserAdapter
 
                 UrlRequestedEvent urlRequestedEvent = (UrlRequestedEvent) event;
                 String absoluteUrl = urlRequestedEvent.getURL();
-                //if ( !absoluteUrl.startsWith(_httpRoot) )
-                //	absoluteUrl = _httpRoot + absoluteUrl.substring(_httpRoot.length()-5);
 
                 if ( urlRequestedEvent.getPostData() == null ||
                 	 urlRequestedEvent.getPostData().length == 0 )
@@ -138,8 +136,6 @@ public class BrowserAdapter implements RenderingApplication, IBrowserAdapter
                             // MSIE, Mozilla, and Opera all send the original
                             // request's Referer as the Referer for the new
                             // request.
-                            //if ( !absoluteUrl.startsWith(_httpRoot) )
-                            //	absoluteUrl = _httpRoot + absoluteUrl.substring(_httpRoot.length()-5);
 
                         	m_app.addToHistory(absoluteUrl,referrer);
                             Object eventSource = e.getSource();
@@ -257,7 +253,7 @@ public class BrowserAdapter implements RenderingApplication, IBrowserAdapter
         {
         	if (referrer == null || URI.isLocalData(url) || !m_bLoadImageAsync) 
         	{
-	        	boolean bLocalHost = URI.isLocalHost(url);
+	        	boolean bLocalHost = RhodesApp.getInstance().isRhodesAppUrl(url);
 	        	if ( bLocalHost && m_connResource!= null)
 	        	{
 	        		com.rho.net.RhoConnection rhoConn = (com.rho.net.RhoConnection)((com.rho.net.bb.NativeBBHttpConnection)m_connResource).getNativeConnection(); 

data/platform/bb/rhodes/src/com/rho/net/NetworkAccess.java

@@ -13,6 +13,7 @@ import com.rho.BBVersionSpecific;
 import com.rho.RhoEmptyLogger;
 import com.rho.RhoLogger;
 import com.rho.RhoConf;
+import com.rho.RhodesApp;
 import com.rho.net.bb.BBHttpConnection;
 import net.rim.device.api.servicebook.ServiceRecord;
 import net.rim.device.api.servicebook.ServiceBook;
@@ -28,12 +29,8 @@ public class NetworkAccess implements INetworkAccess {
 	private static boolean bes = true;
 	private static long  m_nMaxPacketSize = 0;
 	
-	public String getHomeUrl()
+	public void configure() 
 	{
-		return "http://localhost:8080/";
-	}
-	
-	public void configure() {
 		networkConfigured = false;
 		bes = false;
 		URLsuffix = null;
@@ -156,7 +153,7 @@ public class NetworkAccess implements INetworkAccess {
 	
 	public IHttpConnection connect(String url, boolean ignoreSuffixOnSim) throws IOException 
 	{
-		if ( URI.isLocalHost(url) )
+		if ( RhodesApp.getInstance().isRhodesAppUrl(url) )
 		{
 			URI uri = new URI(url);
 			return new RhoConnection(uri);

data/platform/bb/rhodes/src/com/rho/rubyext/System.java

@@ -109,8 +109,10 @@ public class System {
 		});
 		klass.getSingletonClass().defineMethod("exit", new RubyNoArgMethod() {
 			protected RubyValue run(RubyValue receiver, RubyBlock block) {
-				RhodesApplication.getInstance().close();
-				return RubyConstant.QNIL;
+				synchronized(RhodesApplication.getInstance().getEventLock()) {
+					RhodesApplication.getInstance().close();
+					return RubyConstant.QNIL;
+				}
 			}
 		});
 	}

data/platform/bb/rhodes/src/rhomobile/RhodesApplication.java

@@ -112,34 +112,15 @@ final public class RhodesApplication extends UiApplication implements SystemList
 		public boolean trackwheelUnclick(int status, int time) {return false;}
     }
 
-    boolean isExternalUrl(String strUrl)
-    {
-    	return strUrl.startsWith("http://") || strUrl.startsWith("https://") ||
-    		strUrl.startsWith("javascript:") || strUrl.startsWith("mailto:")
-    		 || strUrl.startsWith("tel:")|| strUrl.startsWith("wtai:");    
-    }
-    
-    String canonicalizeURL( String url ){
-		if ( url == null || url.length() == 0 )
-			return "";
-
-		url.replace('\\', '/');
-		if ( !url.startsWith(_httpRoot) && !isExternalUrl(url) )
-			url = FilePath.join(_httpRoot,url);
-
-		return url;
-    }
-
     public void navigateUrl(String url){
     	PrimaryResourceFetchThread thread = new PrimaryResourceFetchThread(
-        		canonicalizeURL(url), null, null, null);
+        		RHODESAPP().canonicalizeRhoUrl(url), null, null, null);
         thread.start();                       
     }
     
-	public String getPathForMenuItem(String url) {
-		url = _httpRoot +
-			url.substring(url.charAt(0) == '\\' || url.charAt(0) == '/' ? 1 : 0 );
-		return url;
+	public String getPathForMenuItem(String url) 
+	{
+		return RHODESAPP().canonicalizeRhoUrl(url);
 	}
     
     public void addMenuItem(String label, String value){
@@ -160,7 +141,7 @@ final public class RhodesApplication extends UiApplication implements SystemList
     
     public void postUrl(String url, String body, HttpHeaders headers, Runnable callback){
         PrimaryResourceFetchThread thread = new PrimaryResourceFetchThread(
-        		canonicalizeURL(url), headers, body.getBytes(), null, callback);
+        		RHODESAPP().canonicalizeRhoUrl(url), headers, body.getBytes(), null, callback);
         thread.setInternalRequest(true);
         thread.start();                       
     }
@@ -188,7 +169,7 @@ final public class RhodesApplication extends UiApplication implements SystemList
 	}
     public void postUrlWithCallback(String url, String body, HttpHeaders headers, NetCallback netCallback){
         PrimaryResourceFetchThread thread = new PrimaryResourceFetchThread(
-        		canonicalizeURL(url), headers, body.getBytes(), null);
+        		RHODESAPP().canonicalizeRhoUrl(url), headers, body.getBytes(), null);
         thread.setNetCallback(netCallback);
         thread.start();                       
     }
@@ -263,8 +244,9 @@ final public class RhodesApplication extends UiApplication implements SystemList
     	strUrl = removeSemicolon(strUrl);
     	refferer = removeSemicolon(refferer);
     	
-        if ( !strUrl.startsWith(_httpRoot) && !isExternalUrl(strUrl) )
-        	strUrl = _httpRoot + (strUrl.startsWith("/") ? strUrl.substring(1) : strUrl);
+    	strUrl = RHODESAPP().canonicalizeRhoUrl(strUrl);
+//        if ( !strUrl.startsWith(_httpRoot) && !isExternalUrl(strUrl) )
+//        	strUrl = _httpRoot + (strUrl.startsWith("/") ? strUrl.substring(1) : strUrl);
         
     	int nPos = -1;
     	for( int i = 0; i < _history.size(); i++ ){
@@ -356,8 +338,6 @@ final public class RhodesApplication extends UiApplication implements SystemList
 
     private Vector _history;
 
-    private final String _httpRoot = "http://localhost:8080/";
-
     private static boolean m_isFullBrowser = false;
     
     private static PushListeningThread _pushListeningThread = null;
@@ -1109,13 +1089,10 @@ final public class RhodesApplication extends UiApplication implements SystemList
 		navigateUrl((String)_history.lastElement());
     }
 
-    void navigateHome(){
+    void navigateHome()
+    {
     	String strHomePage = RhoRuby.getStartPage();
-    	String strStartPage = _httpRoot;
-    	if ( strHomePage != null && strHomePage.length() > 0 )
-    	{
-    		strStartPage = _httpRoot.substring(0, _httpRoot.length()-1) + strHomePage;
-    	}
+    	String strStartPage = RhodesApp.getInstance().canonicalizeRhoUrl(strHomePage);
     	
         _history.removeAllElements();
 	    _history.addElement(strStartPage);

data/platform/bb/rhodes/src/rhomobile/Utilities.java

@@ -11,6 +11,7 @@ import net.rim.device.api.io.http.HttpProtocolConstants;
 import net.rim.device.api.util.StringUtilities;
 
 import com.rho.RhoClassFactory;
+import com.rho.RhodesApp;
 import com.rho.net.URI;
 import com.rho.net.IHttpConnection;
 import com.rho.net.bb.NativeBBHttpConnection;
@@ -30,7 +31,7 @@ public class Utilities {
 			
 			if ( conn == null )
 			{
-				if ( URI.isLocalHost(url) )
+				if ( RhodesApp.getInstance().isRhodesAppUrl(url) )
 				{
 					URI uri = new URI(url);
 					conn = new NativeBBHttpConnection( new RhoConnection(uri) );

data/platform/iphone/Classes/DateTimePickerDelegate.m

@@ -71,7 +71,10 @@
     
     // Create the picker
     if (self.pickerView == nil) {
-        self.pickerView = [[UIDatePicker alloc] initWithFrame:CGRectZero];
+        CGRect frame = parentFrame;
+        frame.size.height = 220;
+        frame.origin.y = parentFrame.origin.y + parentFrame.size.height - frame.size.height;
+        self.pickerView = [[UIDatePicker alloc] initWithFrame:frame];
     }
     
     if (self.pickerView.superview == nil) {
@@ -97,9 +100,6 @@
 
         //CGSize pickerSize = CGSizeMake(parentFrame.size.width, parentFrame.size.height/2);
         CGSize pickerSize = [pickerView sizeThatFits:pickerView.frame.size];
-        pickerSize.width = parentFrame.size.width;
-        if (pickerSize.height > parentFrame.size.height)
-            pickerSize.height = parentFrame.size.height;
         CGRect pickerFrame = CGRectMake(parentFrame.origin.x,
                                         parentFrame.origin.y + parentFrame.size.height - pickerSize.height,
                                         pickerSize.width,

data/platform/iphone/Classes/NativeBar.m

@@ -27,26 +27,32 @@
     [value getValue:&type];
     
     id view = nil;
+   
+    Rhodes *r = [Rhodes sharedInstance];
+    //UIWindow *window = [[Rhodes sharedInstance] rootWindow];
+    //CGRect frame = [Rhodes applicationFrame];
     
-    UIWindow *window = [[Rhodes sharedInstance] rootWindow];
-    CGRect frame = [Rhodes applicationFrame];
+    id mainView = [r mainView];
     
     switch (type) {
     case NOBAR_TYPE:
-        view = [[SimpleMainView alloc] initWithParentView:window frame:frame];
+        //view = [[SimpleMainView alloc] initWithParentView:window frame:frame];
+        view = [[SimpleMainView alloc] initWithMainView:mainView];
         break;
     case TOOLBAR_TYPE:
-        view = [[SimpleMainView alloc] initWithParentView:window frame:frame toolbar:items];
+        //view = [[SimpleMainView alloc] initWithParentView:window frame:frame toolbar:items];
+        view = [[SimpleMainView alloc] initWithMainView:mainView toolbar:items];
         break;
     case TABBAR_TYPE:
-        view = [[TabbedMainView alloc] initWithParentView:window frame:frame items:items];
+        //view = [[TabbedMainView alloc] initWithParentView:window frame:frame items:items];
+        view = [[TabbedMainView alloc] initWithMainView:mainView tabs:items];
         break;
     default:
         RAWLOG_ERROR1("Unknown bar type passed: %d", type);
         return;
     }
     
-    [Rhodes sharedInstance].mainView = view;
+    [r setMainView:view];
     [view release];
 }
 @end