rhodes 3.3.2.beta.4 → 3.3.2.beta.5

data/platform/shared/common/RhodesApp.cpp

@@ -920,10 +920,10 @@ void CRhodesApp::initAppUrls()
 #elif defined( OS_WINCE ) && !defined(OS_PLATFORM_MOTCE)
     TCHAR oem[257];
     SystemParametersInfo(SPI_GETPLATFORMNAME, sizeof(oem), oem, 0);
-    // LOG(INFO) + oem;
-    if ((_tcscmp(oem, _T("MC75"))==0) || (_tcscmp(oem, _T("MC75A"))==0))
-       m_strHomeUrl = "http://localhost:";
-    else
+    LOG(INFO) + "Device name: " + oem;
+    //if ((_tcscmp(oem, _T("MC75"))==0) || (_tcscmp(oem, _T("MC75A"))==0))
+    //   m_strHomeUrl = "http://localhost:";
+    //else
        m_strHomeUrl = "http://127.0.0.1:";
 #else
     m_strHomeUrl = "http://127.0.0.1:";

data/platform/wm/build/wm.rake

@@ -482,7 +482,8 @@ namespace "run" do
       puts "Please, connect you device via ActiveSync.\n\n"
       log_file = gelLogPath
 
-      Jake.run2( detool, ['log', log_file, $port], {:nowait => true})
+      # temporary disable log from device (caused enormous delays)
+      # Jake.run2( detool, ['log', log_file, $port], {:nowait => true})
 
       if $webkit_capability
         wk_args   = [ 'wk-dev', '"'+ $wk_data_dir.gsub(/"/,'\\"') + '"', '"'+ $appname + '"']
@@ -584,7 +585,8 @@ namespace "run" do
         puts "Please, connect you device via ActiveSync.\n\n"
         log_file = gelLogPath
 
-        Jake.run2( detool, ['log', log_file, $port], {:nowait => true})
+        # temporary disable log from device (caused enormous delays)
+        # Jake.run2( detool, ['log', log_file, $port], {:nowait => true})
         Jake.run(detool,args)
       end
     end

data/platform/wm/tools/detool/detool.cpp

@@ -1046,6 +1046,8 @@ int _tmain(int argc, _TCHAR* argv[])
 		}
 		_tprintf( TEXT("DONE\n"));
 
+		startWMDC();
+
 		hFind = CeFindFirstFile(app_dir, &findData);
 		if (INVALID_HANDLE_VALUE == hFind) {
 			_tprintf( TEXT("Application directory on device was no found\n"));
@@ -1096,6 +1098,9 @@ int _tmain(int argc, _TCHAR* argv[])
 			goto stop_emu_deploy;
 		}
 
+		// establish network connectivity of the device from Windows Mobile Device Center (if applicable)
+		connectWMDC();
+
 		Sleep(2 * 1000);
 
 		_tprintf( TEXT("Starting application..."));
@@ -1107,8 +1112,10 @@ int _tmain(int argc, _TCHAR* argv[])
 		_tprintf( TEXT("%s\n"), params_buf);
 
 		TCHAR params[128];
-		_tcscpy(params, _T("-log="));
-		_tcscat(params, log_port);
+		// temporary disable log from device (caused enormous delays)
+		params[0] = 0;
+		//_tcscpy(params, _T("-log="));
+		//_tcscat(params, log_port);
 
 		if(!wceRunProcess(T2A(params_buf), T2A(params))) {
 			_tprintf( TEXT("FAILED\n"));
@@ -1130,6 +1137,8 @@ int _tmain(int argc, _TCHAR* argv[])
 			}
 			_tprintf( TEXT("DONE\n"));
 
+			startWMDC();
+
 			_tprintf( TEXT("Loading cab file to device..."));
 			USES_CONVERSION;
 			if (!wcePutFile (T2A(cab_file), "")) {
@@ -1172,6 +1181,9 @@ int _tmain(int argc, _TCHAR* argv[])
 			}
 			_tprintf( TEXT("DONE\n"));
 
+			// establish network connectivity of the device from Windows Mobile Device Center (if applicable)
+			connectWMDC();
+
 			_tprintf( TEXT("Starting application..."));
 			_tcscpy(params_buf, TEXT("\\Program Files\\"));
 			_tcscat(params_buf, app_name);
@@ -1180,8 +1192,10 @@ int _tmain(int argc, _TCHAR* argv[])
 			_tcscat(params_buf, _T(".exe"));
 
             TCHAR params[128];
-            _tcscpy(params, _T("-log="));
-			_tcscat(params, log_port);
+			// temporary disable log from device (caused enormous delays)
+			params[0] = 0;
+            //_tcscpy(params, _T("-log="));
+			//_tcscat(params, log_port);
 
 			if(!wceRunProcess (T2A(params_buf), T2A(params))) {
 				_tprintf( TEXT("FAILED\n"));

data/platform/wm/tools/detool/detool.vcproj

@@ -119,7 +119,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories=""C:\Program Files (x86)\Windows Mobile 6 SDK\Activesync\inc""
+				AdditionalIncludeDirectories=""C:\Program Files\Windows Mobile 6 SDK\Activesync\inc""
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -140,7 +140,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="rapi.lib Ws2_32.lib"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="C:\Program Files (x86)\Windows Mobile 6 SDK\Activesync\Lib"
+				AdditionalLibraryDirectories="C:\Program Files\Windows Mobile 6 SDK\Activesync\Lib"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"

data/platform/wp7/build/wp.rake

@@ -421,6 +421,7 @@ namespace "run" do
             task :spec do
 				Rake::Task["run:wp"].invoke
 				Jake.before_run_spec
+				start = Time.now
 				log_file = getLogPath
 
 				puts "waiting for log: " + log_file

data/version

@@ -1 +1 @@
-3.3.2.beta.4
+3.3.2.beta.5

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rhodes
 version: !ruby/object:Gem::Version 
-  hash: 62196459
+  hash: 62196457
   prerelease: true
   segments: 
   - 3
   - 3
   - 2
   - beta
-  - 4
-  version: 3.3.2.beta.4
+  - 5
+  version: 3.3.2.beta.5
 platform: ruby
 authors: 
 - Rhomobile