rhodes 2.3.2 → 2.4.0.beta.1

data/platform/shared/sqlite/sqlite3ext.h

@@ -191,6 +191,27 @@ struct sqlite3_api_routines {
   sqlite3_stmt *(*next_stmt)(sqlite3*,sqlite3_stmt*);
   const char *(*sql)(sqlite3_stmt*);
   int (*status)(int,int*,int*,int);
+  int (*backup_finish)(sqlite3_backup*);
+  sqlite3_backup *(*backup_init)(sqlite3*,const char*,sqlite3*,const char*);
+  int (*backup_pagecount)(sqlite3_backup*);
+  int (*backup_remaining)(sqlite3_backup*);
+  int (*backup_step)(sqlite3_backup*,int);
+  const char *(*compileoption_get)(int);
+  int (*compileoption_used)(const char*);
+  int (*create_function_v2)(sqlite3*,const char*,int,int,void*,void (*xFunc)(sqlite3_context*,int,sqlite3_value**),void (*xStep)(sqlite3_context*,int,sqlite3_value**),void (*xFinal)(sqlite3_context*),void(*xDestroy)(void*));
+  int (*db_config)(sqlite3*,int,...);
+  sqlite3_mutex *(*db_mutex)(sqlite3*);
+  int (*db_status)(sqlite3*,int,int*,int*,int);
+  int (*extended_errcode)(sqlite3*);
+  void (*log)(int,const char*,...);
+  sqlite3_int64 (*soft_heap_limit64)(sqlite3_int64);
+  const char *(*sourceid)(void);
+  int (*stmt_status)(sqlite3_stmt*,int,int);
+  int (*strnicmp)(const char*,const char*,int);
+  int (*unlock_notify)(sqlite3*,void(*)(void**,int),void*);
+  int (*wal_autocheckpoint)(sqlite3*,int);
+  int (*wal_checkpoint)(sqlite3*,const char*);
+  void *(*wal_hook)(sqlite3*,int(*)(void*,sqlite3*,const char*,int),void*);
 };
 
 /*
@@ -370,6 +391,27 @@ struct sqlite3_api_routines {
 #define sqlite3_next_stmt              sqlite3_api->next_stmt
 #define sqlite3_sql                    sqlite3_api->sql
 #define sqlite3_status                 sqlite3_api->status
+#define sqlite3_backup_finish          sqlite3_api->backup_finish
+#define sqlite3_backup_init            sqlite3_api->backup_init
+#define sqlite3_backup_pagecount       sqlite3_api->backup_pagecount
+#define sqlite3_backup_remaining       sqlite3_api->backup_remaining
+#define sqlite3_backup_step            sqlite3_api->backup_step
+#define sqlite3_compileoption_get      sqlite3_api->compileoption_get
+#define sqlite3_compileoption_used     sqlite3_api->compileoption_used
+#define sqlite3_create_function_v2     sqlite3_api->create_function_v2
+#define sqlite3_db_config              sqlite3_api->db_config
+#define sqlite3_db_mutex               sqlite3_api->db_mutex
+#define sqlite3_db_status              sqlite3_api->db_status
+#define sqlite3_extended_errcode       sqlite3_api->extended_errcode
+#define sqlite3_log                    sqlite3_api->log
+#define sqlite3_soft_heap_limit64      sqlite3_api->soft_heap_limit64
+#define sqlite3_sourceid               sqlite3_api->sourceid
+#define sqlite3_stmt_status            sqlite3_api->stmt_status
+#define sqlite3_strnicmp               sqlite3_api->strnicmp
+#define sqlite3_unlock_notify          sqlite3_api->unlock_notify
+#define sqlite3_wal_autocheckpoint     sqlite3_api->wal_autocheckpoint
+#define sqlite3_wal_checkpoint         sqlite3_api->wal_checkpoint
+#define sqlite3_wal_hook               sqlite3_api->wal_hook
 #endif /* SQLITE_CORE */
 
 #define SQLITE_EXTENSION_INIT1     const sqlite3_api_routines *sqlite3_api = 0;

data/platform/shared/sync/SyncEngine.cpp

@@ -230,6 +230,7 @@ void CSyncEngine::doSearch(rho::Vector<rho::String>& arSources, String strParams
         else
             szData = resp.getCharData();
 
+        //LOG(INFO) + szData;
         CJSONArrayIterator oJsonArr(szData);
 
         for( ; !oJsonArr.isEnd() && isContinueSync(); oJsonArr.next() )
@@ -296,7 +297,16 @@ void CSyncEngine::doSearch(rho::Vector<rho::String>& arSources, String strParams
         }
 
         if ( nSearchCount == 0 )
+        {
+            for ( int i = 0; i < (int)arSources.size(); i++ )
+            {
+                CSyncSource* pSrc = findSourceByName(arSources.elementAt(i));
+                if ( pSrc != null )
+                    pSrc->processToken(0);
+            }
+
             break;
+        }
     }  
 
     getNotify().fireAllSyncNotifications(true, m_nErrCode, m_strError, m_strServerError);

data/platform/shared/sync/SyncSource.cpp

@@ -376,7 +376,7 @@ void CSyncSource::applyChangedValues()
     if ( strBody.length() > 0 )
     {
         CJSONEntry oEntry(strBody.c_str());
-        processSyncCommand("insert", oEntry );
+        processSyncCommand("insert", oEntry, false );
     }
 
     strBody = "";
@@ -384,7 +384,7 @@ void CSyncSource::applyChangedValues()
     if ( strBody.length() > 0 )
     {
         CJSONEntry oEntry(strBody.c_str());
-        processSyncCommand("delete", oEntry );
+        processSyncCommand("delete", oEntry, false );
     }
 
     strBody = "";
@@ -392,7 +392,7 @@ void CSyncSource::applyChangedValues()
     if ( strBody.length() > 0 )
     {
         CJSONEntry oEntry(strBody.c_str());
-        processSyncCommand("insert", oEntry );
+        processSyncCommand("insert", oEntry, false );
     }
 }
 
@@ -471,7 +471,12 @@ boolean CSyncSource::processServerErrors(CJSONEntry& oCmds)
             if ( i == 0 || i == 1 )//"source-error", "search-error" 
             {
                 if ( errIter.getCurValue().hasName("message") )
-                    m_strServerError += "server_errors[" + strKey + "][message]=" + URI::urlEncode(errIter.getCurValue().getString("message"));
+                {
+                    if ( m_strServerError.length() > 0 )
+                        m_strServerError += "&";
+
+                    m_strServerError += "server_errors[" + URI::urlEncode(strKey) + "][message]=" + URI::urlEncode(errIter.getCurValue().getString("message"));
+                }
             }
             else
             {
@@ -481,7 +486,22 @@ boolean CSyncSource::processServerErrors(CJSONEntry& oCmds)
                 if ( String_endsWith(strObject, "-error") )
                 {
                     strObject = strObject.substr(0, strKey.length()-6);
-                    m_strServerError += "server_errors[" + String(arErrTypes[i]) + "][" + strObject + "][message]=" + URI::urlEncode(errIter.getCurValue().getString("message"));
+                    if ( m_strServerError.length() > 0 )
+                        m_strServerError += "&";
+                    m_strServerError += "server_errors[" + String(arErrTypes[i]) + "][" + URI::urlEncode(strObject) + "][message]=" + URI::urlEncode(errIter.getCurValue().getString("message"));
+                }else
+                {
+                    CJSONStructIterator attrIter(errIter.getCurValue());
+                    for( ; !attrIter.isEnd(); attrIter.next() )
+                    {
+                        String strAttrName = attrIter.getCurKey();
+                        String strAttrValue = attrIter.getCurString();
+
+                        if ( m_strServerError.length() > 0 )
+                            m_strServerError += "&";
+
+                        m_strServerError += "server_errors[" + String(arErrTypes[i]) + "][" + URI::urlEncode(strObject) + "][attributes][" + URI::urlEncode(strAttrName) + "]=" + URI::urlEncode(strAttrValue);
+                    }
                 }
             }
         }
@@ -595,11 +615,11 @@ void CSyncSource::processServerResponse_ver3(CJSONArrayIterator& oJsonArr)
                 getDB().executeSQL("UPDATE sources SET metadata=? WHERE source_id=?", strMetadata, getID() );
             }
             if ( oCmds.hasName("links") && getSync().isContinueSync() )
-                processSyncCommand("links", oCmds.getEntry("links") );
+                processSyncCommand("links", oCmds.getEntry("links"), true );
             if ( oCmds.hasName("delete") && getSync().isContinueSync() )
-                processSyncCommand("delete", oCmds.getEntry("delete") );
+                processSyncCommand("delete", oCmds.getEntry("delete"), true );
             if ( oCmds.hasName("insert") && getSync().isContinueSync() )
-                processSyncCommand("insert", oCmds.getEntry("insert") );
+                processSyncCommand("insert", oCmds.getEntry("insert"), true );
 
             PROF_STOP("Data");
 
@@ -617,7 +637,7 @@ void CSyncSource::processServerResponse_ver3(CJSONArrayIterator& oJsonArr)
 	PROF_STOP("Data1");
 }
 
-void CSyncSource::processSyncCommand(const String& strCmd, CJSONEntry oCmdEntry)
+void CSyncSource::processSyncCommand(const String& strCmd, CJSONEntry oCmdEntry, boolean bCheckUIRequest)
 {
     CJSONStructIterator objIter(oCmdEntry);
 
@@ -641,18 +661,20 @@ void CSyncSource::processSyncCommand(const String& strCmd, CJSONEntry oCmdEntry)
         if ( getSyncType().compare("none") == 0 )
             continue;
 
-        int nSyncObjectCount  = getNotify().incLastSyncObjectCount(getID());
-        if ( getProgressStep() > 0 && (nSyncObjectCount%getProgressStep() == 0) )
-            getNotify().fireSyncNotification(this, false, RhoAppAdapter.ERR_NONE, "");
-
-        if ( getDB().isUIWaitDB() )
+        if ( bCheckUIRequest )
         {
-	        LOG(INFO) + "Commit transaction because of UI request.";
-            getDB().endTransaction();
-            CSyncThread::getInstance()->sleep(1000);
-            getDB().startTransaction();
-        }
+            int nSyncObjectCount  = getNotify().incLastSyncObjectCount(getID());
+            if ( getProgressStep() > 0 && (nSyncObjectCount%getProgressStep() == 0) )
+                getNotify().fireSyncNotification(this, false, RhoAppAdapter.ERR_NONE, "");
 
+            if ( getDB().isUIWaitDB() )
+            {
+	            LOG(INFO) + "Commit transaction because of UI request.";
+                getDB().endTransaction();
+                CSyncThread::getInstance()->sleep(1000);
+                getDB().startTransaction();
+            }
+        }
     }
 }
 

data/platform/shared/sync/SyncSource.h

@@ -125,7 +125,7 @@ public:
 
     db::CDBAdapter& getDB(){ return m_dbAdapter; }
 
-    void processSyncCommand(const String& strCmd, json::CJSONEntry oCmdEntry);
+    void processSyncCommand(const String& strCmd, json::CJSONEntry oCmdEntry, boolean bCheckUIRequest );
 
     void processServerCmd_Ver3_Schema(const String& strCmd, const String& strObject, json::CJSONStructIterator& attrIter);//throws Exception
 

data/platform/shared/tcmalloc/rhomem.h

@@ -1,8 +1,12 @@
 #ifndef RHO_MEMORY__
 #define RHO_MEMORY__
 
+#ifndef _CRT_SECURE_NO_DEPRECATE
+#define _CRT_SECURE_NO_DEPRECATE 1
+#endif //_CRT_SECURE_NO_DEPRECATE
+
 //#ifndef __APPLE__
-#if defined( _WIN32_WCE ) || defined(__SYMBIAN32__)
+#if defined( __WIN32_WCE ) || defined(__SYMBIAN32__)
 #include <stdlib.h>
 
 #ifndef _RHO_NO_MEMDEFINES
@@ -118,7 +122,8 @@ inline void* operator new(size_t size, const std::nothrow_t&) __THROW {
 #endif
 
 #endif //_RHO_NO_MEMDEFINES
-
+#else
+#define sys_free free
 //#endif// _WIN32_WCE
 #endif
 

data/platform/shared/tcmalloc/windows/port.h

@@ -40,6 +40,8 @@
 #ifndef GOOGLE_BASE_WINDOWS_H_
 #define GOOGLE_BASE_WINDOWS_H_
 
+#define _CRT_SECURE_NO_DEPRECATE 1
+
 // You should never include this file directly, but always include it
 // from either config.h (MSVC) or mingw.h (MinGW/msys).
 #if !defined(GOOGLE_PERFTOOLS_WINDOWS_CONFIG_H_) && \

data/platform/shared/unzip/unzip.cpp

@@ -4,6 +4,7 @@
 #endif
 
 #if defined(WIN32) || defined(_WIN32_WCE)
+#define _CRT_SECURE_NO_DEPRECATE 1
 #else
 #define ZIP_STD
 #endif

data/platform/shared/xruby/src/com/xruby/compiler/parser/RubyParser.java

@@ -42,7 +42,17 @@ public class RubyParser extends RubyParserBase {
 
 	public Program parse(String filename) throws RecognitionException, TokenStreamException {
 		RubyTreeParser treeparser = new RubyTreeParser();
-		return treeparser.parse(createAST(), filename);
+		
+		try
+		{
+			return treeparser.parse(createAST(), filename);
+		}catch(RecognitionException exc)
+		{
+			if ( exc.line == -1 )
+				exc.line = treeparser.currentLineNumber;
+			
+			throw exc;
+		}
 	}
 
 	protected void setIsInNestedMultipleAssign(boolean v) {

data/platform/wm/RhoLib/RhoLib.vcproj

@@ -14,6 +14,9 @@
 		<Platform
 			Name="Win32"
 		/>
+		<Platform
+			Name="RhodesCE6 (ARMV4I)"
+		/>
 		<Platform
 			Name="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 		/>
@@ -169,7 +172,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+			Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 			OutputDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			IntermediateDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="4"
@@ -193,11 +196,10 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				ExecutionBucket="7"
-				Optimization="0"
+				Optimization="2"
 				AdditionalIncludeDirectories="../../shared/ruby;../../shared"
-				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;DEBUG;_LIB;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
-				MinimalRebuild="true"
-				RuntimeLibrary="1"
+				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;_LIB;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
@@ -207,7 +209,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES)"
+				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES)"
 				Culture="1033"
 				AdditionalIncludeDirectories="$(IntDir)"
 			/>
@@ -216,7 +218,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				AdditionalOptions=" /subsystem:windowsce,5.01"
+				AdditionalOptions=" /subsystem:windowsce,5.02"
 				OutputFile="$(OutDir)/RhoLib.lib"
 			/>
 			<Tool
@@ -244,7 +246,72 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
+			Name="Release|Win32"
+			OutputDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
+			IntermediateDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				AdditionalIncludeDirectories="../../shared/ruby;../../shared"
+				PreprocessorDefinitions="_NDEBUG;NDEBUG;WIN32;_WINDOWS"
+				RuntimeLibrary="0"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES)"
+				Culture="1033"
+				AdditionalIncludeDirectories="$(IntDir)"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				AdditionalOptions=" /subsystem:windowsce,5.02"
+				OutputFile="$(OutDir)/RhoLib.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|RhodesCE6 (ARMV4I)"
 			OutputDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			IntermediateDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="4"
@@ -264,13 +331,14 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="1"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				ExecutionBucket="7"
 				Optimization="0"
 				AdditionalIncludeDirectories="../../shared/ruby;../../shared"
-				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;DEBUG;_LIB;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				PreprocessorDefinitions="OS_PLATFORM_CE;_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;DEBUG;_LIB;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
 				MinimalRebuild="true"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
@@ -291,7 +359,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				AdditionalOptions=" /subsystem:windowsce,5.01"
+				AdditionalOptions=" /subsystem:windowsce,5.02"
 				OutputFile="$(OutDir)/RhoLib.lib"
 			/>
 			<Tool
@@ -319,7 +387,82 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)"
+			Name="Release|RhodesCE6 (ARMV4I)"
+			OutputDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
+			IntermediateDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				Optimization="2"
+				AdditionalIncludeDirectories="../../shared/ruby;../../shared"
+				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;_LIB;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				RuntimeLibrary="0"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES)"
+				Culture="1033"
+				AdditionalIncludeDirectories="$(IntDir)"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				AdditionalOptions=" /subsystem:windowsce,5.02"
+				OutputFile="$(OutDir)/RhoLib.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
 			OutputDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			IntermediateDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="4"
@@ -366,7 +509,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				AdditionalOptions=" /subsystem:windowsce,5.02"
+				AdditionalOptions=" /subsystem:windowsce,5.01"
 				OutputFile="$(OutDir)/RhoLib.lib"
 			/>
 			<Tool
@@ -394,7 +537,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+			Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
 			OutputDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			IntermediateDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="4"
@@ -418,10 +561,11 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				ExecutionBucket="7"
-				Optimization="2"
+				Optimization="0"
 				AdditionalIncludeDirectories="../../shared/ruby;../../shared"
-				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;_LIB;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
-				RuntimeLibrary="0"
+				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;DEBUG;_LIB;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
@@ -431,7 +575,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES)"
+				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES)"
 				Culture="1033"
 				AdditionalIncludeDirectories="$(IntDir)"
 			/>
@@ -440,7 +584,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				AdditionalOptions=" /subsystem:windowsce,5.02"
+				AdditionalOptions=" /subsystem:windowsce,5.01"
 				OutputFile="$(OutDir)/RhoLib.lib"
 			/>
 			<Tool
@@ -468,7 +612,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|Win32"
+			Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)"
 			OutputDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			IntermediateDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="4"
@@ -491,10 +635,12 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="2"
+				ExecutionBucket="7"
+				Optimization="0"
 				AdditionalIncludeDirectories="../../shared/ruby;../../shared"
-				PreprocessorDefinitions="_NDEBUG;NDEBUG;WIN32;_WINDOWS"
-				RuntimeLibrary="0"
+				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;DEBUG;_LIB;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
+				MinimalRebuild="true"
+				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
@@ -504,7 +650,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES)"
+				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES)"
 				Culture="1033"
 				AdditionalIncludeDirectories="$(IntDir)"
 			/>
@@ -526,11 +672,19 @@
 				Name="VCBscMakeTool"
 			/>
 			<Tool
-				Name="VCFxCopTool"
+				Name="VCCodeSignTool"
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
 		</Configuration>
 		<Configuration
 			Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
@@ -877,6 +1031,10 @@
 				RelativePath="..\..\shared\common\RhoThread.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\shared\common\RhoTime.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\shared\common\RhoTime.h"
 				>