rhodes 2.2.4.beta.1 → 2.2.5.beta.1

data/platform/shared/sync/SyncEngine.cpp

@@ -22,6 +22,7 @@ IMPLEMENT_LOGCLASS(CSyncEngine,"Sync");
 using namespace rho::net;
 using namespace rho::common;
 using namespace rho::json;
+CSyncEngine::CSourceOptions CSyncEngine::m_oSourceOptions;
 
 CSyncEngine::CSyncEngine():m_NetRequest(0), m_syncState(esNone), m_oSyncNotify(*this)
 {
@@ -37,6 +38,45 @@ void CSyncEngine::initProtocol()
     m_SyncProtocol = new CSyncProtocol_3();
 }
 
+void CSyncEngine::CSourceOptions::setProperty(int nSrcID, const char* szPropName, const char* szPropValue)
+{
+    synchronized(m_mxSrcOptions)
+    {
+        Hashtable<String,String>* phashOptions = m_hashSrcOptions.get(nSrcID);
+        if ( phashOptions == null )
+        {
+            phashOptions = new Hashtable<String,String>();
+            m_hashSrcOptions.put( nSrcID, phashOptions );
+        }
+
+        Hashtable<String,String>& hashOptions = *phashOptions;
+        hashOptions.put(szPropName,szPropValue!=null?szPropValue:"");
+    }
+}
+
+String CSyncEngine::CSourceOptions::getProperty(int nSrcID, const char* szPropName)
+{
+    String res = "";
+    synchronized(m_mxSrcOptions)
+    {
+        Hashtable<String,String>* phashOptions = m_hashSrcOptions.get(nSrcID);
+        if ( phashOptions != null )
+        {
+            Hashtable<String,String>& hashOptions = *phashOptions;
+            res = hashOptions.get(szPropName);
+        }
+    }
+
+    return res;
+}
+
+boolean CSyncEngine::CSourceOptions::getBoolProperty(int nSrcID, const char* szPropName)
+{
+    String strValue = getProperty(nSrcID, szPropName);
+
+    return strValue.compare("1") == 0 || strValue.compare("true") == 0 ? true : false;
+}
+
 void CSyncEngine::prepareSync(ESyncState eState, const CSourceID* oSrcID)
 {
     setState(eState);
@@ -581,7 +621,7 @@ void CSyncEngine::loadBulkPartition(const String& strPartition )
         {
     	    LOG(ERROR) + "Bulk sync failed: server return an error.";
     	    stopSync();
-    	    getNotify().fireBulkSyncNotification(true, "", strPartition, RhoAppAdapter.ERR_REMOTESERVER);
+    	    getNotify().fireBulkSyncNotification(true, "", strPartition, RhoAppAdapter.getErrorFromResponse(resp));
     	    return;
         }
 
@@ -626,7 +666,7 @@ void CSyncEngine::loadBulkPartition(const String& strPartition )
         {
 	        LOG(ERROR) + "Bulk sync failed: cannot download database file.";
 	        stopSync();
-	        getNotify().fireBulkSyncNotification(true, "", strPartition, RhoAppAdapter.ERR_REMOTESERVER);
+	        getNotify().fireBulkSyncNotification(true, "", strPartition, RhoAppAdapter.getErrorFromResponse(resp1));
 	        return;
         }
     }
@@ -718,7 +758,7 @@ void CSyncEngine::syncAllSources()
         bError = !syncOneSource(i);
     }
 
-    if ( !bError)
+    if ( !bError && !isSchemaChanged() )
     	getNotify().fireSyncNotification(null, true, RhoAppAdapter.ERR_NONE, RhoAppAdapter.getMessageText("sync_completed"));
 }
 

data/platform/shared/sync/SyncEngine.h

@@ -32,6 +32,16 @@ public:
         boolean isEqual(CSyncSource& src)const;
     };
 
+    class CSourceOptions
+    {
+        common::CMutex m_mxSrcOptions;
+        HashtablePtr<int, Hashtable<String,String>* > m_hashSrcOptions;
+    public:
+        void setProperty(int nSrcID, const char* szPropName, const char* szPropValue);
+        String getProperty(int nSrcID, const char* szPropName);
+        boolean getBoolProperty(int nSrcID, const char* szPropName);
+    };
+
 private:
     VectorPtr<CSyncSource*> m_sources;
     Vector<String>          m_arPartitions;
@@ -48,6 +58,7 @@ private:
     int m_nErrCode;
     String m_strError;
     boolean m_bIsSearch, m_bIsSchemaChanged;
+    static CSourceOptions m_oSourceOptions;
 
 public:
     CSyncEngine();
@@ -55,7 +66,9 @@ public:
 
     void setFactory(common::IRhoClassFactory* factory){ 
         m_NetRequest = factory->createNetRequest();
+        m_oSyncNotify.setFactory(factory);
     }
+    static CSourceOptions& getSourceOptions(){ return m_oSourceOptions; }
 
     void doSyncAllSources();
     void doSyncSource(const CSourceID& oSrcID);

data/platform/shared/sync/SyncNotify.cpp

@@ -15,8 +15,6 @@ using namespace rho::db;
 String CSyncNotify::m_strObjectNotifyUrl;
 common::CMutex CSyncNotify::m_mxObjectNotify;
 
-INetRequest& CSyncNotify::getNet(){ return getSync().getNet(); }
-
 void CSyncNotify::addObjectNotify(int nSrcID, const String& strObject)
 {
     synchronized(m_mxObjectNotify)
@@ -215,8 +213,11 @@ void CSyncNotify::onSyncSourceEnd( int nSrc, VectorPtr<CSyncSource*>& sources )
 
     if ( getSync().getState() == CSyncEngine::esStop && src.m_nErrCode != RhoAppAdapter.ERR_NONE )
     {
-        fireSyncNotification(&src, true, src.m_nErrCode, "");
-		fireAllSyncNotifications(true, src.m_nErrCode, src.m_strError );
+		CSyncNotification* pSN = getSyncNotifyBySrc(&src);
+		if ( pSN != null )
+			fireSyncNotification(&src, true, src.m_nErrCode, "");
+		else
+			fireAllSyncNotifications(true, src.m_nErrCode, src.m_strError );
     }
     else
         fireSyncNotification(&src, true, src.m_nErrCode, "");
@@ -278,22 +279,38 @@ void CSyncNotify::setSearchNotification(CSyncNotification* pNotify )
     }
 }
 
-extern "C" void alert_show_popup(const char* message);
-void CSyncNotify::reportSyncStatus(String status, int error, String strDetails) {
-    if ( error == RhoAppAdapter.ERR_SYNCVERSION )
-    {
-        status = RhoAppAdapter.getErrorText(error);
-        alert_show_popup(status.c_str());
-        return;
-    }
-    //TODO: reportStatus
-	//if (m_statusListener != null) {
-	//	if ( strDetails.length() == 0 )
-	//		strDetails = RhoRuby.getErrorText(error);
-    //    status += (strDetails.length() > 0 ? RhoRuby.getMessageText("details") + strDetails: "");
-	//	m_statusListener.reportStatus( status, error);
-	//}
-	//LOG(INFO) + "Status: "+status;
+void CSyncNotify::showStatusPopup(const String& status)
+{
+    LOG(INFO) + "Status: "+status;
+
+    if ( m_strStatusHide.length() == 0 )
+        m_strStatusHide = RhoAppAdapter.getMessageText("hide");
+
+    alert_show_status(status.c_str(), m_strStatusHide.c_str());
+}
+
+void CSyncNotify::reportSyncStatus(String status, int error, String strDetails) 
+{
+	synchronized(m_mxSyncNotifications)
+	{    	
+    	if (/*m_syncStatusListener != null && */(isReportingEnabled() || error == RhoAppAdapter.ERR_SYNCVERSION) ) {
+    		
+    		if ( error == RhoAppAdapter.ERR_SYNCVERSION )
+            {
+    			status = RhoAppAdapter.getErrorText(error);
+                showStatusPopup(status);
+            }
+    		else if ( isReportingEnabled() )
+    		{
+	    		if ( strDetails.length() == 0 && error != RhoAppAdapter.ERR_NONE)
+	    			strDetails = RhoAppAdapter.getErrorText(error);
+	    		status += (strDetails.length() > 0 ? RhoAppAdapter.getMessageText("details") + strDetails: "");
+
+        	    //m_syncStatusListener.reportStatus( status, error);
+                showStatusPopup(status);
+    		}
+    	}
+	}
 }
 
 void CSyncNotify::fireBulkSyncNotification( boolean bFinish, String status, String partition, int nErrCode )
@@ -337,8 +354,8 @@ void CSyncNotify::fireSyncNotification( CSyncSource* src, boolean bFinish, int n
 	{
 		if ( !getSync().isSearch() )
         {
-	//		if ( src != null && strMessage.length() == 0 )
-	//			strMessage = RhoRuby.getMessageText("sync_failed_for") + (*src).getName() + ".";
+			if ( src != null && strMessage.length() == 0 )
+				strMessage = RhoAppAdapter.getMessageText("sync_failed_for") + (*src).getName() + ".";
 			
             reportSyncStatus(strMessage,nErrCode, (src != null ? (*src).m_strError : "") );
         }
@@ -415,6 +432,7 @@ void CSyncNotify::doFireSyncNotification( CSyncSource* src, boolean bFinish, int
 
 	        	    strBody += "error";				        	
 			        strBody += "&error_code=" + convertToStringA(nErrCode);
+                    strBody += "&error_type=" + (src != null ? (*src).m_strErrorType : String());
 		            strBody += "&error_message=";
 
                     if ( strError.length() > 0 )
@@ -442,7 +460,7 @@ void CSyncNotify::doFireSyncNotification( CSyncSource* src, boolean bFinish, int
         clearNotification(src);
 }
 
-boolean CSyncNotify::callNotify(const CSyncNotification& oNotify, const String& strBody )
+boolean CSyncNotify::callNotify(CSyncNotification oNotify, const String& strBody )
 {
     if ( getSync().isNoThreadedMode() )
     {

data/platform/shared/sync/SyncNotify.h

@@ -3,6 +3,7 @@
 #include "common/RhoStd.h"
 #include "logging/RhoLog.h"
 #include "common/AutoPointer.h"
+#include "common/IRhoClassFactory.h"
 
 typedef int (*RHOC_CALLBACK)(const char* szNotify, void* callback_data);
 
@@ -54,6 +55,7 @@ private:
     String m_strSingleObjectSrcName, m_strSingleObjectID;
     Hashtable<int,int> m_hashSrcObjectCount;
     boolean m_bEnableReporting;
+    boolean m_bEnableReportingGlobal;
 
     static common::CMutex m_mxObjectNotify;
 
@@ -63,11 +65,19 @@ private:
     CSyncNotification m_emptyNotify;
     common::CMutex m_mxSyncNotifications;
     String m_strNotifyBody;
+    String m_strStatusHide;
 
-    net::INetRequest& getNet();
+   	common::CAutoPtr<net::INetRequest>     m_NetRequest;
+
+    net::INetRequest& getNet(){ return *m_NetRequest; }
     CSyncEngine& getSync(){ return m_syncEngine; }
 public:
-    CSyncNotify( CSyncEngine& syncEngine ) : m_syncEngine(syncEngine), m_bEnableReporting(false){}
+    CSyncNotify( CSyncEngine& syncEngine ) : m_syncEngine(syncEngine), m_bEnableReporting(false), 
+        m_bEnableReportingGlobal(false){}
+
+    void setFactory(common::IRhoClassFactory* factory){ 
+        m_NetRequest = factory->createNetRequest();
+    }
 
     //Object notifications
     void fireObjectsNotification();
@@ -98,14 +108,16 @@ public:
 
     void callLoginCallback(const CSyncNotification& oNotify, int nErrCode, String strMessage);
 
+    boolean isReportingEnabled(){return m_bEnableReporting&&m_bEnableReportingGlobal;}
     void enableReporting(boolean bEnable){m_bEnableReporting = bEnable;}
+    void enableStatusPopup(boolean bEnable){m_bEnableReportingGlobal = bEnable;}
 
     const String& getNotifyBody(){ return m_strNotifyBody; }
     void cleanNotifyBody(){ m_strNotifyBody = ""; }
 
     void fireAllSyncNotifications( boolean bFinish, int nErrCode, String strError );
     void reportSyncStatus(String status, int error, String strDetails);
-
+    void showStatusPopup(const String& status);
 private:
     CSyncNotification* getSyncNotifyBySrc(CSyncSource* src);
 
@@ -114,7 +126,7 @@ private:
 
     void doFireSyncNotification( CSyncSource* src, boolean bFinish, int nErrCode, String strError, String strParams);
 
-    boolean callNotify(const CSyncNotification& oNotify, const String& strBody );
+    boolean callNotify(CSyncNotification oNotify, const String& strBody );
 
     void clearNotification(CSyncSource* src);
 
@@ -122,3 +134,5 @@ private:
 
 }
 }
+
+extern "C" void alert_show_status(const char* message, const char* szHide);

data/platform/shared/sync/SyncSource.cpp

@@ -116,7 +116,7 @@ void CSyncSource::sync()
     CTimeInterval startTime = CTimeInterval::getCurrentTime();
     //m_bIsSearch = false;
 
-    if ( isTokenFromDB() && !isEmptyToken() )
+    if ( isTokenFromDB() && getToken() > 1 )
         syncServerChanges();  //sync only server changes, which was paused before
     else
     {
@@ -229,7 +229,7 @@ void CSyncSource::doSyncClientChanges()
             if ( !resp.isOK() )
             {
                 getSync().setState(CSyncEngine::esStop);
-                m_nErrCode = RhoAppAdapter.ERR_REMOTESERVER;
+                m_nErrCode = RhoAppAdapter.getErrorFromResponse(resp);
             }
         }else
         {
@@ -237,7 +237,7 @@ void CSyncSource::doSyncClientChanges()
             if ( !resp.isOK() )
             {
                 getSync().setState(CSyncEngine::esStop);
-                m_nErrCode = RhoAppAdapter.ERR_REMOTESERVER;
+                m_nErrCode = RhoAppAdapter.getErrorFromResponse(resp);
             }
         }
     }
@@ -413,7 +413,8 @@ void CSyncSource::syncServerChanges()
         }
 
         const char* szData = resp.getCharData();
-
+        //const char* szData = "[{\"version\":3},{\"token\":\"\"},{\"count\":0},{\"progress_count\":28},{\"total_count\":28},{\"source-error\":{\"login-error\":{\"message\":\"s currently connected from another machine\"}}}]";
+        //const char* szData = "[{\"version\":3},{\"token\":\"\"},{\"count\":0},{\"progress_count\":0},{\"total_count\":0},{\"create-error\":{\"0_broken_object_id\":{\"name\":\"wrongname\",\"an_attribute\":\"error create\"},\"0_broken_object_id-error\":{\"message\":\"error create\"}}}]";
         //const char* szData = "[{\"version\":3},{\"token\":\"35639160294387\"},{\"count\":3},{\"progress_count\":0},{\"total_count\":3},{\"metadata\":\"{\\\"foo\\\":\\\"bar\\\"}\",\"insert\":{\"1\":{\"price\":\"199.99\",\"brand\":\"Apple\",\"name\":\"iPhone\"}}}]";
 
         //LOG(INFO) + szData;
@@ -423,9 +424,15 @@ void CSyncSource::syncServerChanges()
 
         processServerResponse_ver3(oJsonArr);
 
+        if (getSync().getSourceOptions().getBoolProperty(getID(), "pass_through"))
+            processToken(0);
+
         if ( getToken() == 0 )
             break;
     }
+
+    if ( getSync().isSchemaChanged() )
+        getSync().stopSync();
 }
 
 void CSyncSource::processServerResponse_ver3(CJSONArrayIterator& oJsonArr)
@@ -485,15 +492,6 @@ void CSyncSource::processServerResponse_ver3(CJSONArrayIterator& oJsonArr)
         oJsonArr.next();
     }
 
-   /* if ( !oJsonArr.isEnd() && oJsonArr.getCurItem().hasName("source-error") )
-    {
-        CJSONEntry oJsonErr = oJsonArr.getCurItem().getEntry("source-error");
-        m_strError = oJsonErr.getString("message");
-        m_nErrCode = RhoAppAdapter.ERR_CUSTOMSYNCSERVER;
-        getSync().stopSync();
-        return;
-    }*/
-
     //if ( getServerObjectsCount() == 0 )
     //    getNotify().fireSyncNotification(this, false, RhoAppAdapter.ERR_NONE, "");
 
@@ -523,11 +521,51 @@ void CSyncSource::processServerResponse_ver3(CJSONArrayIterator& oJsonArr)
 
         if ( oCmds.hasName("schema-changed") )
         {
-            getSync().stopSync();    
             getSync().setSchemaChanged(true);
+        }else if ( oCmds.hasName("source-error") )
+        {
+            CJSONEntry errSrc = oCmds.getEntry("source-error");
+            CJSONStructIterator errIter(errSrc);
+            for( ; !errIter.isEnd(); errIter.next() )
+            {
+                m_nErrCode = RhoAppAdapter.ERR_CUSTOMSYNCSERVER;
+                m_strError = errIter.getCurValue().getString("message");
+                m_strErrorType = errIter.getCurKey();
+            }
+        }else if ( oCmds.hasName("search-error") )
+        {
+            CJSONEntry errSrc = oCmds.getEntry("search-error");
+            CJSONStructIterator errIter(errSrc);
+            for( ; !errIter.isEnd(); errIter.next() )
+            {
+                m_nErrCode = RhoAppAdapter.ERR_CUSTOMSYNCSERVER;
+                m_strError = errIter.getCurValue().getString("message");
+                m_strErrorType = errIter.getCurKey();
+            }
+        }else if ( oCmds.hasName("create-error") )
+        {
+            m_nErrCode = RhoAppAdapter.ERR_CUSTOMSYNCSERVER;
+            m_strErrorType = "create-error";
+        }else if ( oCmds.hasName("update-error") )
+        {
+            m_nErrCode = RhoAppAdapter.ERR_CUSTOMSYNCSERVER;
+            m_strErrorType = "update-error";
+        }else if ( oCmds.hasName("delete-error") )
+        {
+            m_nErrCode = RhoAppAdapter.ERR_CUSTOMSYNCSERVER;
+            m_strErrorType = "delete-error";
         }else
         {
             getDB().startTransaction();
+
+            if (getSync().getSourceOptions().getBoolProperty(getID(), "pass_through"))
+            {
+                if ( m_bSchemaSource )
+                    getDB().executeSQL( (String("DELETE FROM ") + getName()).c_str() );
+                else
+                    getDB().executeSQL("DELETE FROM object_values WHERE source_id=?", getID() );
+            }
+
             if ( oCmds.hasName("metadata") && getSync().isContinueSync() )
             {
                 String strMetadata = oCmds.getString("metadata");

data/platform/shared/sync/SyncSource.h

@@ -66,6 +66,7 @@ private:
 public:
     int m_nErrCode;
     String m_strError;
+    String m_strErrorType;
 
 public:
     CSyncSource(int id, const String& strName, const String& strSyncType, db::CDBAdapter& db, CSyncEngine& syncEngine );

data/platform/shared/sync/SyncThread.cpp

@@ -7,6 +7,7 @@
 #include "ruby/ext/rho/rhoruby.h"
 #endif //RHO_NO_RUBY
 #include "sync/ClientRegister.h"
+#include "common/RhoAppAdapter.h"
 
 namespace rho {
 namespace sync {
@@ -97,20 +98,19 @@ int CSyncThread::getLastPollInterval()
 	return latestTimeUpdated > 0 ? (int)(nowTime-latestTimeUpdated) : 0;
 }
 
-void CSyncThread::processCommands()//throws Exception
+void CSyncThread::onTimeout()//throws Exception
 {
     if ( isNoCommands() && getPollInterval()>0 )
         addQueueCommandInt(new CSyncCommand(scSyncAll,false));
-
-    CThreadQueue::processCommands();
 }
 
 void CSyncThread::checkShowStatus(CSyncCommand& oSyncCmd)
 {
 	boolean bShowStatus = oSyncCmd.m_bShowStatus;
 	m_oSyncEngine.getNotify().enableReporting(bShowStatus);
-	//if (bShowStatus)
-		//m_statusListener.createStatusPopup(RhoRuby.getMessageText("syncronizing_data"));
+    if (m_oSyncEngine.getNotify().isReportingEnabled())
+        m_oSyncEngine.getNotify().showStatusPopup(RhoAppAdapter.getMessageText("syncronizing_data"));
+    //m_statusListener.createStatusPopup(RhoRuby.getMessageText("syncronizing_data"));
 }	
 
 void CSyncThread::processCommand(IQueueCommand* pCmd)
@@ -149,8 +149,8 @@ void CSyncThread::processCommand(IQueueCommand* pCmd)
 
 void CSyncThread::setPollInterval(int nInterval)
 { 
-    if ( nInterval == 0 )
-        m_oSyncEngine.stopSync();
+//    if ( nInterval == 0 )
+//        m_oSyncEngine.stopSync();
 
     CThreadQueue::setPollInterval(nInterval);
 }
@@ -214,6 +214,8 @@ unsigned long rho_sync_doSyncSource(unsigned long nSrcID,int show_status_popup)
 
 void rho_sync_stop()
 {
+	LOG(INFO)+"STOP sync";
+	
 	if (CSyncThread::getSyncEngine().isSyncing() )
 	{
 		CSyncThread::getSyncEngine().stopSyncByUser();
@@ -262,11 +264,19 @@ unsigned long rho_sync_doSearchByNames(unsigned long ar_sources, const char *fro
     return CSyncThread::getInstance()->getRetValue();
 }	
 
-void rho_sync_set_pollinterval(int nInterval)
+int rho_sync_set_pollinterval(int nInterval)
 {
+    int nOldInterval = CSyncThread::getInstance()->getPollInterval();
     CSyncThread::getInstance()->setPollInterval(nInterval);
+
+    return nOldInterval;
 }
-	
+
+int rho_sync_get_pollinterval()
+{
+    return CSyncThread::getInstance()->getPollInterval();
+}
+
 void rho_sync_set_syncserver(const char* syncserver)
 {
     rho_sync_stop();
@@ -398,4 +408,14 @@ void rho_sync_free_string(char* szStr)
     return free(szStr);
 }
 
+void rho_sync_enable_status_popup(int b)
+{
+    return CSyncThread::getSyncEngine().getNotify().enableStatusPopup(b == 0 ? false : true);
+}
+
+void rho_sync_set_source_property(int nSrcID, const char* szPropName, const char* szPropValue)
+{
+    CSyncEngine::getSourceOptions().setProperty(nSrcID, szPropName, szPropValue);
+}
+
 }

data/platform/shared/sync/SyncThread.h

@@ -119,7 +119,7 @@ private:
     virtual void processCommand(IQueueCommand* pCmd);
     virtual boolean isSkipDuplicateCmd() { return true; }
 
-    virtual void processCommands();
+    virtual void onTimeout();
 
     void checkShowStatus(CSyncCommand& oSyncCmd);
 };
@@ -144,7 +144,7 @@ int rho_sync_logged_in();
 void rho_sync_logout();
 void rho_sync_set_notification(int source_id, const char *url, char* params);
 void rho_sync_clear_notification(int source_id);
-void rho_sync_set_pollinterval(int nInterval);
+int rho_sync_set_pollinterval(int nInterval);
 void rho_sync_set_syncserver(const char* syncserver);
 void rho_sync_setobjectnotify_url(const char* szUrl);
 void rho_sync_addobjectnotify(int nSrcID, const char* szObject);
@@ -164,6 +164,8 @@ unsigned long rho_sync_login_c(const char *name, const char *password, /*RHOC_CA
 unsigned long rho_sync_doSearchByNames(unsigned long ar_sources, const char *from, const char *params, bool sync_changes, int nProgressStep, /*RHOC_CALLBACK*/void* callback, void* callback_data);
 void rho_sync_set_notification_c(int source_id, /*RHOC_CALLBACK*/void* callback, void* callback_data);
 
+void rho_sync_stop();
+
 #ifdef __cplusplus
 };
 #endif //__cplusplus

data/platform/wm/RhoLib/RhoLib.vcproj

@@ -893,6 +893,14 @@
 				RelativePath="..\..\shared\common\Tokenizer.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\shared\common\app_build_configs.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\shared\common\app_build_configs.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="logging"

data/platform/wm/build/build_inf.js

@@ -184,7 +184,7 @@ function fill_extensions_files(exts) {
 	}
 }
 
-function pinf(platform,es,exts,name,vendor) {
+function pinf(platform,es,exts,name,vendor,show_shortcat) {
 
 	p("[Version]");
 	p("Signature=\"$Windows NT$\"");
@@ -204,7 +204,9 @@ function pinf(platform,es,exts,name,vendor) {
 	p("BuildMax=0xE0000000");
 	p("");
 	p("[DefaultInstall]");
-	p("CEShortcuts=Shortcuts");
+	if (show_shortcat){
+	    p("CEShortcuts=Shortcuts");
+	}
 	p("AddReg=RegKeys");
 	p("CopyFiles=CopyToInstallDir"+get_copyfiles_sections(es));
 	p("");
@@ -213,23 +215,27 @@ function pinf(platform,es,exts,name,vendor) {
 	get_source_disks_names(es);
 	p("");
 	p("[SourceDisksFiles]");
-	p("\"rhodes.exe\"=1");
+	p("\"" + name + ".exe\"=1");
 	fill_extensions_source_disk_files(exts);
 	var f = get_source_disks_files(es);
 	p("");
 	p("[DestinationDirs]");
-	p("Shortcuts=0,%CE2%\Start Menu");
+	if (show_shortcat){
+    	p("Shortcuts=0,%CE2%\Start Menu");
+    }
 	p("CopyToInstallDir=0,\"%InstallDir%\"");
 	get_destination_dirs(es);
 	p("");
 	p("[CopyToInstallDir]");
-	p("\"rhodes.exe\",\"rhodes.exe\",,0");
+	p("\"" + name + ".exe\",\"" + name + ".exe\",,0");
 	fill_extensions_files(exts);
 	p("");
 	fill_copyfiles_sections(es,f);
-	p("");
-	p("[Shortcuts]");
-	p("\""+name+"\",0,\"rhodes.exe\",%CE11%");
+	if (show_shortcat){
+	    p("");
+	    p("[Shortcuts]");
+	    p("\""+name+"\",0,\"" + name + ".exe\",%CE11%");
+	}
 	p("");
 	p("[RegKeys]");
 	p("");
@@ -248,7 +254,7 @@ function main() {
 
 	var es = expand_sources(sources);
 	var exts = expand_extensions(args(1));
-	pinf(args(1),es,exts,args(2),args(3));
+	pinf(args(1),es,exts,args(2),args(3), args(5) == "0");
 
 	output_file.Close();
 }

data/platform/wm/build/wm.rake

@@ -178,11 +178,14 @@ namespace "device" do
     desc "Build production for device or emulator"
     task :production => ["config:wm","build:wm:rhobundle","build:wm:rhodes"] do
 	
+	  out_dir = $startdir + "/" + $vcbindir + "/#{$sdk}" + "/rhodes/Release/"
+      cp  out_dir + "rhodes.exe", out_dir + $appname + ".exe" 
+	
       chdir $builddir
       
       cp $app_path + "/icon/icon.ico", "../rhodes/resources" if File.exists? $app_path + "/icon/icon.ico"
 
-      args = ['build_inf.js', $appname + ".inf", 'wm6', '"' + $app_config["name"] +'"', $app_config["vendor"], '"' + $srcdir + '"']
+      args = ['build_inf.js', $appname + ".inf", 'wm6', '"' + $app_config["name"] +'"', $app_config["vendor"], '"' + $srcdir + '"', $hidden_app]
       puts Jake.run('cscript',args)
       unless $? == 0
         puts "Error running build_inf"
@@ -208,8 +211,10 @@ namespace "device" do
       mv $appname + ".inf", $targetdir
       mv $appname + ".cab", $targetdir
 
-	if (not $config["build"]["wmsign"].nil?) and $config["build"]["wmsign"] != ""
-       		sign $targetdir + '/' +  $appname + ".cab";
+      File.open(File.join($targetdir,"app_info.txt"), "w") { |f| f.write( $app_config["vendor"] + " " + $appname + "/" + $appname + ".exe") }
+            
+	  if (not $config["build"]["wmsign"].nil?) and $config["build"]["wmsign"] != ""
+        sign $targetdir + '/' +  $appname + ".cab";
 	  end
 	  
       rm_f "cleanup.js"
@@ -247,7 +252,7 @@ namespace "run" do
     task :dev => ["device:wm:production"] do
    	  cd $startdir + "/res/build-tools"
 	  detool = "detool.exe"    
-	  args   = [ 'dev', $appname, $srcdir, $startdir + "/" + $vcbindir + "/#{$sdk}" + "/rhodes/Release/rhodes.exe" ]
+	  args   = [ 'dev', $appname, $srcdir, $startdir + "/" + $vcbindir + "/#{$sdk}" + "/rhodes/Release/" + $appname + ".exe" ]
 	  puts "\nStarting application on the device"
 	  puts "Please, connect you device via ActiveSync.\n\n"
 	  Jake.run(detool,args)
@@ -257,7 +262,7 @@ namespace "run" do
     task :emu => ["device:wm:production"] do
    	  cd $startdir + "/res/build-tools"
 	  detool = "detool.exe"    
-	  args   = [ 'emu', '"Windows Mobile 6 Professional Emulator"', $appname, $srcdir, $startdir + "/" + $vcbindir + "/#{$sdk}" + "/rhodes/Release/rhodes.exe" ]
+	  args   = [ 'emu', '"Windows Mobile 6 Professional Emulator"', $appname, $srcdir, $startdir + "/" + $vcbindir + "/#{$sdk}" + "/rhodes/Release/" + $appname + ".exe" ]
 	  puts "\nStarting application on the WM6 emulator\n\n"
 	  Jake.run(detool,args)
     end