rhodes 3.0.2 → 3.1.0.beta.1

data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PkgInfo

@@ -0,0 +1 @@
+APPL????

data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/Resources/qt.conf

@@ -0,0 +1,2 @@
+[Paths]
+Plugins = PlugIns

data/platform/osx/build/osx.rake

@@ -0,0 +1,88 @@
+#------------------------------------------------------------------------
+# (The MIT License)
+# 
+# Copyright (c) 2008-2011 Rhomobile, Inc.
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+# 
+# http://rhomobile.com
+#------------------------------------------------------------------------
+
+namespace "config" do
+  
+  task :set_osx_platform do
+    $current_platform = "osx" unless $current_platform
+  end
+  
+  task :osx => [:set_osx_platform, "config:common"] do
+    $qmake = "qmake"
+    $make = "make"
+    $macdeployqt = "macdeployqt"
+    $name_tool = "install_name_tool"
+    $move = "mv"
+    $remove = "rm"
+    $qt_project_dir = File.join( $startdir, 'platform/shared/qt/' )
+    $build_dir = File.join( $startdir, 'platform/osx/bin/' )
+  end
+end
+
+namespace "build" do
+  namespace "osx" do
+    task :rhosimulator => ["config:set_osx_platform", "config:osx"] do
+        app_path = File.join( $build_dir, 'RhoSimulator/RhoSimulator.app' )
+        puts Jake.run($remove,['-R', app_path ])
+
+        chdir $qt_project_dir
+        args = ['-o', 'Makefile', '-r', '-spec', 'macx-g++', 'RhoSimulator.pro']
+        puts Jake.run($qmake,args)
+        puts Jake.run($make, ['clean'])
+        puts Jake.run($make, ['all'])
+
+        unless $? == 0
+          puts "Error building"
+          exit 1
+        end
+
+        puts Jake.run($macdeployqt, [app_path])
+
+        exe_path = File.join( app_path, 'Contents/MacOS/RhoSimulator' )
+        frm_path = File.join( app_path, 'Contents/Frameworks/' )
+        fw_path = ['@executable_path/../Frameworks/', '.framework/Versions/Current', '.framework/Versions/4']
+        libs = ['QtCore', 'QtGui', 'QtNetwork', 'QtWebKit']
+        libs.each {|lib|
+          args = [ frm_path + lib + fw_path[1], frm_path + lib + fw_path[2] ]
+          puts Jake.run($move,args)
+          args = [ '-change', fw_path[0] + lib + fw_path[1] + '/' + lib, fw_path[0] + lib + fw_path[2] + '/' + lib, exe_path]
+          puts Jake.run($name_tool,args)
+        }
+
+        puts Jake.run($remove,['-R', File.join(frm_path, 'QtDBus.framework' )])
+        puts Jake.run($remove,['-R', File.join(frm_path, 'QtDeclarative.framework' )])
+        puts Jake.run($remove,['-R', File.join(frm_path, 'QtOpenGL.framework' )])
+        puts Jake.run($remove,['-R', File.join(frm_path, 'QtScript.framework' )])
+        puts Jake.run($remove,['-R', File.join(frm_path, 'QtSql.framework' )])
+        puts Jake.run($remove,['-R', File.join(frm_path, 'QtSvg.framework' )])
+        puts Jake.run($remove,['-R', File.join(frm_path, 'QtXml.framework' )])
+        puts Jake.run($remove,['-R', File.join(frm_path, 'QtXmlPatterns.framework' )])
+
+        chdir $qt_project_dir
+        puts Jake.run($make, ['clean'])
+    end
+  end
+end

data/platform/shared/{SyncClient/SyncClient.cpp → RhoConnectClient/RhoConnectClient.cpp}

@@ -1,4 +1,30 @@
-#include "SyncClient.h"
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
+#include "RhoConnectClient.h"
 
 //#include "stdafx.h"
 
@@ -27,13 +53,13 @@ const char* getSyncTypeName( RHOM_SYNC_TYPE sync_type )
     return "none";
 }
 
-void parseSyncNotify(const char* msg, RHO_SYNC_NOTIFY* pNotify);
+void parseSyncNotify(const char* msg, RHO_CONNECT_NOTIFY* pNotify);
 String rhom_generate_id();
 
 extern "C" 
 {
 
-void rho_syncclient_initmodel(RHOM_MODEL* model)
+void rho_connectclient_initmodel(RHOM_MODEL* model)
 {
     memset( model, 0, sizeof(RHOM_MODEL) );
     model->type = RMT_PROPERTY_BAG;
@@ -42,7 +68,7 @@ void rho_syncclient_initmodel(RHOM_MODEL* model)
     model->partition = "user";
 }
 
-void rho_syncclient_processmodels(RHOM_MODEL* pModels, int nModels)
+void rho_connectclient_processmodels(RHOM_MODEL* pModels, int nModels)
 {
     db::CDBAdapter& oUserDB = db::CDBAdapter::getUserDB();
     int nStartModelID = 1;
@@ -73,9 +99,9 @@ void rho_syncclient_processmodels(RHOM_MODEL* pModels, int nModels)
     }
 }
 
-void rho_syncclient_init(RHOM_MODEL* pModels, int nModels)
+void rho_connectclient_init(RHOM_MODEL* pModels, int nModels)
 {
-    rho_logconf_Init(rho_native_rhopath());
+    rho_logconf_Init(rho_native_rhopath(), "");
     CRhodesAppBase::Create( rho_native_rhopath() );
 
     String strDbPath = rho_native_rhopath();
@@ -97,7 +123,7 @@ void rho_syncclient_init(RHOM_MODEL* pModels, int nModels)
     }
 
     //process models
-    rho_syncclient_processmodels(pModels, nModels);
+    rho_connectclient_processmodels(pModels, nModels);
 
     rho_db_init_attr_manager();
 
@@ -106,19 +132,19 @@ void rho_syncclient_init(RHOM_MODEL* pModels, int nModels)
 
 }
 
-void rho_syncclient_database_full_reset_and_logout()
+void rho_connectclient_database_full_reset_and_logout()
 {
     rho_sync_logout();
-	rho_syncclient_database_full_reset(false);
+	rho_connectclient_database_full_reset(false);
 }
 
-void rho_syncclient_database_fullclient_reset_and_logout()
+void rho_connectclient_database_fullclient_reset_and_logout()
 {
 	rho_sync_logout();
-	rho_syncclient_database_full_reset(true);
+	rho_connectclient_database_full_reset(true);
 }
 	
-void rho_syncclient_database_full_reset(bool bClientReset)
+void rho_connectclient_database_full_reset(bool bClientReset)
 {
     db::CDBAdapter& oUserDB = db::CDBAdapter::getUserDB();
     oUserDB.executeSQL("UPDATE client_info SET reset=1");
@@ -148,7 +174,7 @@ void rho_syncclient_database_full_reset(bool bClientReset)
     //::Rho::RHO.init_schema_sources(hash_migrate) 
 }
 
-void rho_syncclient_destroy()
+void rho_connectclient_destroy()
 {
     CSyncThread::Destroy();
 }
@@ -205,17 +231,17 @@ unsigned long rhom_make_object(IDBResult& res1, int nSrcID, bool isSchemaSrc)
     if ( res1.isEnd() )
         return item;
 
-    item = rho_syncclient_hash_create();
-    rho_syncclient_hash_put(item, "source_id", convertToStringA(nSrcID).c_str() );
+    item = rho_connectclient_hash_create();
+    rho_connectclient_hash_put(item, "source_id", convertToStringA(nSrcID).c_str() );
 
     if (!isSchemaSrc)
     {
         for ( ; !res1.isEnd(); res1.next() )
-            rho_syncclient_hash_put(item, res1.getStringByIdx(0).c_str(), res1.getStringByIdx(1).c_str() );
+            rho_connectclient_hash_put(item, res1.getStringByIdx(0).c_str(), res1.getStringByIdx(1).c_str() );
     }else
     {
         for (int i = 0; i < res1.getColCount(); i++ )
-            rho_syncclient_hash_put(item, res1.getColName(i).c_str(), res1.getStringByIdx(i).c_str() );
+            rho_connectclient_hash_put(item, res1.getColName(i).c_str(), res1.getStringByIdx(i).c_str() );
     }
 
     return item;
@@ -231,7 +257,7 @@ unsigned long rhom_load_item_by_object(db::CDBAdapter& db, const String& src_nam
         IDBResult res1 = db.executeSQL(sql.c_str(), szObject, nSrcID);
         item = rhom_make_object(res1, nSrcID, isSchemaSrc);
         if (item)
-            rho_syncclient_hash_put(item, "object", szObject.c_str() );
+            rho_connectclient_hash_put(item, "object", szObject.c_str() );
     }else
     {
         String sql = "SELECT * FROM " + src_name + " WHERE object=? OFFSET 0 LIMIT 1";
@@ -242,7 +268,7 @@ unsigned long rhom_load_item_by_object(db::CDBAdapter& db, const String& src_nam
     return item;
 }
 
-unsigned long rho_syncclient_find(const char* szModel,const char* szObject )
+unsigned long rho_connectclient_find(const char* szModel,const char* szObject )
 {
     String src_name = szModel;
 
@@ -326,10 +352,10 @@ unsigned long rhom_find(const char* szModel, unsigned long hash, int nCount )
                  rhom_load_item_by_object(db, src_name, nSrcID, res1.getStringByIdx(0), isSchemaSrc);
     }
 
-    unsigned long items = rho_syncclient_strhasharray_create();
+    unsigned long items = rho_connectclient_strhasharray_create();
     for ( ; !res1.isEnd(); res1.next() )
     {
-        rho_syncclient_strhasharray_add(items, 
+        rho_connectclient_strhasharray_add(items, 
             isSchemaSrc ? rhom_make_object(res1, nSrcID, isSchemaSrc) :
                 rhom_load_item_by_object(db, src_name, nSrcID, res1.getStringByIdx(0), isSchemaSrc) );
     }
@@ -337,17 +363,17 @@ unsigned long rhom_find(const char* szModel, unsigned long hash, int nCount )
     return items;
 }
 
-unsigned long rho_syncclient_find_all(const char* szModel, unsigned long hash )
+unsigned long rho_connectclient_find_all(const char* szModel, unsigned long hash )
 {
     return rhom_find( szModel, hash, -1 );
 }
 
-unsigned long rho_syncclient_find_first(const char* szModel, unsigned long hash )
+unsigned long rho_connectclient_find_first(const char* szModel, unsigned long hash )
 {
     return rhom_find( szModel, hash, 1 );
 }
 
-void rho_syncclient_start_bulkupdate(const char* szModel)
+void rho_connectclient_start_bulkupdate(const char* szModel)
 {
     String src_name = szModel;
     IDBResult  res = db::CDBAdapter::getUserDB().executeSQL("SELECT partition from sources WHERE name=?", src_name);
@@ -362,7 +388,7 @@ void rho_syncclient_start_bulkupdate(const char* szModel)
     db.startTransaction();
 }
 	
-void rho_syncclient_stop_bulkupdate(const char* szModel)
+void rho_connectclient_stop_bulkupdate(const char* szModel)
 {
     String src_name = szModel;
     IDBResult  res = db::CDBAdapter::getUserDB().executeSQL("SELECT partition from sources WHERE name=?", src_name);
@@ -377,7 +403,7 @@ void rho_syncclient_stop_bulkupdate(const char* szModel)
     db.endTransaction();
 }
 	
-void rho_syncclient_itemdestroy( const char* szModel, unsigned long hash )
+void rho_connectclient_itemdestroy( const char* szModel, unsigned long hash )
 {
     Hashtable<String, String>& hashObject = *((Hashtable<String, String>*)hash);
     String src_name = szModel;
@@ -447,14 +473,14 @@ void rho_syncclient_itemdestroy( const char* szModel, unsigned long hash )
                 db_insert_into_table(db, "changed_values", fields );
             }
 
-            rho_syncclient_hash_delete(item);
+            rho_connectclient_hash_delete(item);
         }
     }
 
     db.endTransaction();
 }
 
-void rho_syncclient_save( const char* szModel, unsigned long hash )
+void rho_connectclient_save( const char* szModel, unsigned long hash )
 {
     Hashtable<String, String>& hashObject = *((Hashtable<String, String>*)hash);
     String src_name = szModel;
@@ -507,7 +533,7 @@ void rho_syncclient_save( const char* szModel, unsigned long hash )
     }
     else
     {
-        rho_syncclient_create_object(szModel, hash);
+        rho_connectclient_create_object(szModel, hash);
     }
 
     if (!res.isEnd())
@@ -577,7 +603,7 @@ void rho_syncclient_save( const char* szModel, unsigned long hash )
     db.endTransaction();
 }
 
-void rho_syncclient_create_object(const char* szModel, unsigned long hash)
+void rho_connectclient_create_object(const char* szModel, unsigned long hash)
 {
     Hashtable<String, String>& hashObject = *((Hashtable<String, String>*)hash);
     String src_name = szModel;
@@ -641,7 +667,7 @@ void rho_syncclient_create_object(const char* szModel, unsigned long hash)
     db.endTransaction();
 }
 
-void rho_syncclient_parsenotify(const char* msg, RHO_SYNC_NOTIFY* pNotify)
+void rho_connectclient_parsenotify(const char* msg, RHO_CONNECT_NOTIFY* pNotify)
 {
     CTokenizer oTokenizer( msg, "&" );
     int nLastPos = 0;
@@ -685,7 +711,7 @@ void rho_syncclient_parsenotify(const char* msg, RHO_SYNC_NOTIFY* pNotify)
         pNotify->callback_params = strdup(msg+nLastPos);
 }
 
-void rho_syncclient_free_syncnotify(RHO_SYNC_NOTIFY* pNotify)
+void rho_connectclient_free_syncnotify(RHO_CONNECT_NOTIFY* pNotify)
 {
     if (!pNotify)
         return;
@@ -702,10 +728,10 @@ void rho_syncclient_free_syncnotify(RHO_SYNC_NOTIFY* pNotify)
     if ( pNotify->callback_params != null )
         free(pNotify->callback_params);
     
-    memset( pNotify, 0, sizeof(RHO_SYNC_NOTIFY) );
+    memset( pNotify, 0, sizeof(RHO_CONNECT_NOTIFY) );
 }
     
-void rho_syncclient_parse_objectnotify(const char* msg, RHO_SYNC_OBJECT_NOTIFY* pNotify)
+void rho_connectclient_parse_objectnotify(const char* msg, RHO_CONNECT_OBJECT_NOTIFY* pNotify)
 {
     {
         CTokenizer oTokenizer( msg, "&" );
@@ -780,7 +806,7 @@ void rho_syncclient_parse_objectnotify(const char* msg, RHO_SYNC_OBJECT_NOTIFY*
     }
 }
     
-void rho_syncclient_free_sync_objectnotify(RHO_SYNC_OBJECT_NOTIFY* pNotify)
+void rho_connectclient_free_sync_objectnotify(RHO_CONNECT_OBJECT_NOTIFY* pNotify)
 {
     if (!pNotify)
         return;
@@ -818,73 +844,73 @@ void rho_syncclient_free_sync_objectnotify(RHO_SYNC_OBJECT_NOTIFY* pNotify)
         free(pNotify->created_objects);
     }
     
-    memset( pNotify, 0, sizeof(RHO_SYNC_NOTIFY) );        
+    memset( pNotify, 0, sizeof(RHO_CONNECT_NOTIFY) );        
 }
     
-unsigned long rho_syncclient_strarray_create()
+unsigned long rho_connectclient_strarray_create()
 {
     return (unsigned long)(new rho::Vector<rho::String>());
 }
 
-void rho_syncclient_strarray_add(unsigned long ar, const char* szStr)
+void rho_connectclient_strarray_add(unsigned long ar, const char* szStr)
 {
     rho::Vector<rho::String>& arThis = *((rho::Vector<rho::String>*)ar);
     arThis.addElement(szStr);
 }
 
-void rho_syncclient_strarray_delete(unsigned long ar)
+void rho_connectclient_strarray_delete(unsigned long ar)
 {
     if (ar)
         delete ((rho::Vector<rho::String>*)ar);
 }
 
-unsigned long rho_syncclient_strhasharray_create()
+unsigned long rho_connectclient_strhasharray_create()
 {
     return (unsigned long)(new VectorPtr<Hashtable<String, String>* >());
 }
 
-void rho_syncclient_strhasharray_add(unsigned long ar, unsigned long hash)
+void rho_connectclient_strhasharray_add(unsigned long ar, unsigned long hash)
 {
     VectorPtr<Hashtable<String, String>* >& arThis = *((VectorPtr<Hashtable<String, String>* >*)ar);
     arThis.addElement( (Hashtable<String, String>*)hash );
 }
 
-void rho_syncclient_strhasharray_delete(unsigned long ar)
+void rho_connectclient_strhasharray_delete(unsigned long ar)
 {
     if (ar)
         delete ((VectorPtr<Hashtable<String, String>* >*)ar);
 }
 
-int rho_syncclient_strhasharray_size(unsigned long ar)
+int rho_connectclient_strhasharray_size(unsigned long ar)
 {
     VectorPtr<Hashtable<String, String>* >& arThis = *((VectorPtr<Hashtable<String, String>* >*)ar);
     return arThis.size();
 }
 
-unsigned long rho_syncclient_strhasharray_get(unsigned long ar, int nIndex)
+unsigned long rho_connectclient_strhasharray_get(unsigned long ar, int nIndex)
 {
     VectorPtr<Hashtable<String, String>* >& arThis = *((VectorPtr<Hashtable<String, String>* >*)ar);
     return (unsigned long) arThis.elementAt(nIndex);
 }
 
-unsigned long rho_syncclient_hash_create()
+unsigned long rho_connectclient_hash_create()
 {
     return (unsigned long)(new rho::Hashtable<rho::String, rho::String>());
 }
 
-void rho_syncclient_hash_put(unsigned long hash, const char* szKey, const char* szValue)
+void rho_connectclient_hash_put(unsigned long hash, const char* szKey, const char* szValue)
 {
     Hashtable<String, String>& hashThis = *((Hashtable<String, String>*)hash);
     hashThis.put(szKey, szValue);
 }
 
-void rho_syncclient_hash_delete(unsigned long hash)
+void rho_connectclient_hash_delete(unsigned long hash)
 {
     if (hash)
         delete ((rho::Hashtable<rho::String, rho::String>*)hash);
 }
 
-const char* rho_syncclient_hash_get(unsigned long hash, const char* szKey)
+const char* rho_connectclient_hash_get(unsigned long hash, const char* szKey)
 {
     Hashtable<String, String>& hashThis = *((Hashtable<String, String>*)hash);
 
@@ -894,7 +920,7 @@ const char* rho_syncclient_hash_get(unsigned long hash, const char* szKey)
     return null;
 }
 
-int rho_syncclient_hash_equal(unsigned long hash1, unsigned long hash2)
+int rho_connectclient_hash_equal(unsigned long hash1, unsigned long hash2)
 {
     Hashtable<String, String>& hashThis1 = *((Hashtable<String, String>*)hash1);    
     Hashtable<String, String>& hashThis2 = *((Hashtable<String, String>*)hash2);    
@@ -902,14 +928,14 @@ int rho_syncclient_hash_equal(unsigned long hash1, unsigned long hash2)
     return hashThis1 == hashThis2 ? 1 : 0;
 }
 
-int rho_syncclient_hash_size(unsigned long hash)
+int rho_connectclient_hash_size(unsigned long hash)
 {
     Hashtable<String, String>& hashThis = *((Hashtable<String, String>*)hash);
 	
 	return hashThis.size();
 }
 	
-void rho_syncclient_hash_enumerate(unsigned long hash, int (*enum_func)(const char* szKey, const char* szValue, void* pThis), void* pThis )
+void rho_connectclient_hash_enumerate(unsigned long hash, int (*enum_func)(const char* szKey, const char* szValue, void* pThis), void* pThis )
 {
     Hashtable<String, String>& hashThis = *((Hashtable<String, String>*)hash);
 	
@@ -977,7 +1003,7 @@ namespace rho {
 	
 	/*static*/ void _CRhoAppAdapter::resetDBOnSyncUserChanged()
 	{
-		rho_syncclient_database_full_reset(false);
+		rho_connectclient_database_full_reset(false);
 	}	
 }