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

data/platform/iphone/rbuild/iphone.rake

@@ -1,26 +1,137 @@
 #
 
+
+def extract_value_from_strings(line)
+   pre_str = '<string>'
+   post_str = '</string>'
+   pre_index = line.index(pre_str)
+   post_index = line.index(post_str)
+   return line.slice( pre_index + pre_str.length, post_index - (pre_index + pre_str.length))
+end
+
 def set_app_name(newname)
+  ret_value = ''
   fname = $config["build"]["iphonepath"] + "/Info.plist"
   nextline = false
   replaced = false
   buf = ""
   File.new(fname,"r").read.each_line do |line|
     if nextline and not replaced
-      return if line =~ /#{newname}/
+      ret_value = extract_value_from_strings(line)
+      return ret_value if line =~ /#{newname}/
       buf << line.gsub(/<string>.*<\/string>/,"<string>#{newname}</string>")
       puts "set name"
       replaced = true
     else
       buf << line
     end
-
     nextline = true if line =~ /CFBundleDisplayName/
-    
   end
-  
   File.open(fname,"w") { |f| f.write(buf) }
+  return ret_value
+end
 
+def set_app_version(newversion)
+  ret_value = ''
+  fname = $config["build"]["iphonepath"] + "/Info.plist"
+  nextline = false
+  replaced = false
+  buf = ""
+  File.new(fname,"r").read.each_line do |line|
+    if nextline and not replaced
+      ret_value = extract_value_from_strings(line)
+      return if line =~ /#{newversion}/
+      buf << line.gsub(/<string>.*<\/string>/,"<string>#{newversion}</string>")
+      puts "set name"
+      replaced = true
+    else
+      buf << line
+    end
+    nextline = true if line =~ /CFBundleVersion/
+  end
+  File.open(fname,"w") { |f| f.write(buf) }
+  return ret_value
+end
+
+
+def set_app_bundle_identifier(newname)
+  ret_value = ''
+  fname = $config["build"]["iphonepath"] + "/Info.plist"
+  nextline = false
+  replaced = false
+  buf = ""
+  File.new(fname,"r").read.each_line do |line|
+    if nextline and not replaced
+      ret_value = extract_value_from_strings(line)
+      return ret_value if line =~ /#{newname}/
+      buf << line.gsub(/<string>.*<\/string>/,"<string>#{newname}</string>")
+      puts "set bundle identifier"
+      replaced = true
+    else
+      buf << line
+    end
+    nextline = true if line =~ /CFBundleIdentifier/
+  end
+  File.open(fname,"w") { |f| f.write(buf) }
+  return ret_value
+end
+
+def set_app_url_scheme(newname)
+  ret_value = ''
+  fname = $config["build"]["iphonepath"] + "/Info.plist"
+  nextline = false
+  nextnextline = false
+  replaced = false
+  buf = ""
+  File.new(fname,"r").read.each_line do |line|
+    if nextline and not replaced
+      ret_value = extract_value_from_strings(line)
+      return ret_value if line =~ /#{newname}/
+      buf << line.gsub(/<string>.*<\/string>/,"<string>#{newname}</string>")
+      puts "set URL Scheme"
+      replaced = true
+    else
+      if nextnextline
+          nextline = true
+      end
+      buf << line
+    end
+    nextnextline = true if line =~ /CFBundleURLSchemes/
+  end
+  File.open(fname,"w") { |f| f.write(buf) }
+  return ret_value
+end
+
+def set_app_url_name(newname)
+  ret_value = ''
+  fname = $config["build"]["iphonepath"] + "/Info.plist"
+  nextline = false
+  replaced = false
+  buf = ""
+  File.new(fname,"r").read.each_line do |line|
+    if nextline and not replaced
+      ret_value = extract_value_from_strings(line)
+      return ret_value if line =~ /#{newname}/
+      buf << line.gsub(/<string>.*<\/string>/,"<string>#{newname}</string>")
+      puts "set URL name"
+      replaced = true
+    else
+      buf << line
+    end
+    nextline = true if line =~ /CFBundleURLName/
+  end
+  File.open(fname,"w") { |f| f.write(buf) }
+  return ret_value
+end
+
+def make_app_info
+  fname = File.join($app_path, 'bin', 'target', 'iOS', $sdk, $configuration, 'app_info.txt')
+  buf = ""
+  urlscheme = 'rhodes'
+  urlscheme = $app_config["name"] unless $app_config["name"].nil?
+  urlscheme = $app_config["iphone"]["BundleURLScheme"] unless $app_config["iphone"]["BundleURLScheme"].nil?
+  buf << urlscheme
+  File.open(fname,"w") { |f| f.write(buf) }
 end
 
 ICONS = ['icon', 'icon57', 'icon72', 'icon114']
@@ -80,12 +191,17 @@ def set_default_images
       ibak = File.join(ipath, defname + '.bak')
       imag = File.join(ipath, defname + '.png')
       appimage = File.join($app_path, 'app', name + '.png')
+      appsimage = File.join($app_path, 'app', name + '.iphone.png')
       if File.exists? imag
         cp imag, ibak unless File.exists? ibak
       end
       #bundlei = File.join($srcdir, defname + '.png')
       #cp appimage, bundlei unless !File.exist? appimage
-      cp appimage, imag unless !File.exists? appimage
+      if File.exists? appsimage
+          cp appsimage, imag
+      else
+          cp appimage, imag unless !File.exists? appimage
+      end
     end
   rescue => e
     puts "WARNING!!! Can not change default image: #{e.to_s}"
@@ -149,27 +265,31 @@ namespace "config" do
     $guid = `uuidgen`.strip
     $applog = File.join($homedir,$app_config["applog"]) if $app_config["applog"] 
 
-
     if $app_config["iphone"].nil?
       $signidentity = $config["env"]["iphone"]["codesignidentity"]
       $provisionprofile = $config["env"]["iphone"]["provisionprofile"]
       $entitlements = $config["env"]["iphone"]["entitlements"]
       $configuration = $config["env"]["iphone"]["configuration"]
       $sdk = $config["env"]["iphone"]["sdk"]
+      $emulatortarget = 'iphone'
     else
       $signidentity = $app_config["iphone"]["codesignidentity"]
       $provisionprofile = $app_config["iphone"]["provisionprofile"]
       $entitlements = $app_config["iphone"]["entitlements"]
       $configuration = $app_config["iphone"]["configuration"]
       $sdk = $app_config["iphone"]["sdk"]
+      $emulatortarget = $app_config["iphone"]["emulatortarget"]
+      if $emulatortarget == nil
+         $emulatortarget = 'iphone'
+      end
     end
 
     if $sdk =~ /iphonesimulator/
-      sdkver = $sdk.gsub(/iphonesimulator/,"")
-      $sdkroot = $devroot + "/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator" + sdkver + ".sdk"
+      $sdkver = $sdk.gsub(/iphonesimulator/,"")
+      $sdkroot = $devroot + "/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator" + $sdkver + ".sdk"
     else
-      sdkver = $sdk.gsub(/iphoneos/,"")
-      $sdkroot = $devroot + "/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS" + sdkver + ".sdk"
+      $sdkver = $sdk.gsub(/iphoneos/,"")
+      $sdkroot = $devroot + "/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS" + $sdkver + ".sdk"
     end
 
     $emulator_version = nil
@@ -177,7 +297,7 @@ namespace "config" do
     if File.exists? plist
       File.open(plist, 'r') do |f|
         while line = f.gets
-          next unless line =~ /<string>(#{sdkver.gsub('.', '\.')}[^<]*)<\/string>/
+          next unless line =~ /<string>(#{$sdkver.gsub('.', '\.')}[^<]*)<\/string>/
           $emulator_version = $1
           break unless $emulator_version.nil?
         end
@@ -267,10 +387,29 @@ namespace "build" do
 #    desc "Build rhodes"
     task :rhodes => ["config:iphone", "build:iphone:rhobundle"] do
   
-      set_app_name($app_config["name"]) unless $app_config["name"].nil?
+      saved_name = ''
+      saved_version = ''
+      saved_identifier = ''
+      saved_url_scheme = ''
+      saved_url_name = ''
+
+      saved_name = set_app_name($app_config["name"]) unless $app_config["name"].nil?
+      saved_version = set_app_version($app_config["version"]) unless $app_config["version"].nil?
+      saved_identifier = set_app_bundle_identifier($app_config["iphone"]["BundleIdentifier"]) unless $app_config["iphone"]["BundleIdentifier"].nil?
+      saved_url_scheme = set_app_url_scheme($app_config["iphone"]["BundleURLScheme"]) unless $app_config["iphone"]["BundleURLScheme"].nil?
+      saved_url_name = set_app_url_name($app_config["iphone"]["BundleIdentifier"]) unless $app_config["iphone"]["BundleIdentifier"].nil?
+ 
+            
+
       set_app_icon
       set_default_images
 
+      if $entitlements == ""
+          if $configuration == "Distribution"
+              $entitlements = "Entitlements.plist"
+          end
+      end
+
       set_signing_identity($signidentity,$provisionprofile,$entitlements.to_s) if $signidentity.to_s != ""
 
       chdir $config["build"]["iphonepath"]
@@ -281,7 +420,12 @@ namespace "build" do
 
       chdir $startdir
       
-      set_app_name("Rhodes") unless $app_config["name"].nil?
+      set_app_name(saved_name) unless $app_config["name"].nil?
+      set_app_version(saved_version) unless $app_config["version"].nil?
+      set_app_bundle_identifier(saved_identifier) unless $app_config["iphone"]["BundleIdentifier"].nil?
+      set_app_url_scheme(saved_url_scheme) unless $app_config["iphone"]["BundleURLScheme"].nil?
+      set_app_url_name(saved_url_name) unless $app_config["iphone"]["BundleIdentifier"].nil?
+      
       restore_default_images
       restore_app_icon
 
@@ -393,10 +537,10 @@ namespace "run" do
      end
      `killall "iPhone Simulator"`
 
-     sdkver = $sdk.gsub(/^iphonesimulator/, '')
+     $sdkver = $sdk.gsub(/^iphonesimulator/, '')
      # Workaround: sometimes sdkver could differ from emulator version.
      # Example: iPhone SDK 4.0.1. In this case sdk is still iphonesimulator4.0 but version of simulator is 4.0.1
-     sdkver = $emulator_version.to_s unless $emulator_version.nil?
+     $sdkver = $emulator_version.to_s unless $emulator_version.nil?
 
      elements = []
      binplist = File.join(ENV['HOME'], 'Library', 'Preferences', 'com.apple.iphonesimulator.plist')
@@ -427,7 +571,7 @@ namespace "run" do
      e.text = 'SimulateDevice'
      elements << e
      e = REXML::Element.new 'string'
-     e.text = sdkver == '3.2' ? 'iPad' : 'iPhone'
+     e.text = $sdkver == '3.2' ? 'iPad' : 'iPhone'
      elements << e
      e = REXML::Element.new 'key'
      e.text = 'currentSDKRoot'
@@ -456,7 +600,7 @@ namespace "run" do
      puts "our app name: #{$app_config['name']}"
      puts "simdir: #{$simdir}"
 
-     Dir.glob(File.join($simdir, sdkver, "Applications", "*")).each do |simapppath|
+     Dir.glob(File.join($simdir, $sdkver, "Applications", "*")).each do |simapppath|
        need_rm = true if File.directory? simapppath
        if File.exists?(File.join(simapppath, 'rhorunner.app', 'name'))
          name = File.read(File.join(simapppath, 'rhorunner.app', 'name'))
@@ -474,10 +618,10 @@ namespace "run" do
 
      puts "app guid: #{$guid}"
 
-     mkdir_p File.join($simdir, sdkver)
+     mkdir_p File.join($simdir, $sdkver)
 
-     simapp = File.join($simdir, sdkver, "Applications")
-     simlink = File.join($simdir, sdkver, "Library", "Preferences")
+     simapp = File.join($simdir, $sdkver, "Applications")
+     simlink = File.join($simdir, $sdkver, "Library", "Preferences")
 
      $simrhodes = File.join(simapp, $guid)
 
@@ -495,9 +639,9 @@ namespace "run" do
 
 
      simpublic = simapp + "/" + $guid + "/Documents/apps/public"
-     apppublic = $app_path + "/sim-public-#{sdkver}"
+     apppublic = $app_path + "/sim-public-#{$sdkver}"
 
-     apprholog = $app_path + "/rholog-#{sdkver}.txt"
+     apprholog = $app_path + "/rholog-#{$sdkver}.txt"
      rm_f apprholog
      rm_f apppublic
      `ln -f -s "#{simpublic}" "#{apppublic}"`
@@ -513,7 +657,18 @@ namespace "run" do
   # testing we will not launch emulator directly
   desc "Builds everything, launches iphone simulator"
   task :iphone => :buildsim do
-     system("open \"#{$sim}/iPhone Simulator.app\"")
+
+    iphonesim = File.join($startdir, 'res/build-tools/iphonesim/build/Release/iphonesim')
+
+    commandis = iphonesim + ' launch "' + File.join($simrhodes, 'rhorunner.app') + '" ' + $sdkver.gsub(/([0-9]\.[0-9]).*/,'\1') + ' ' + $emulatortarget
+
+    if ($emulatortarget != 'iphone') && ($emulatortarget != 'ipad')
+        puts  'use old execution way - just open iPhone Simulator'
+        system("open \"#{$sim}/iPhone Simulator.app\"")
+    else
+        puts 'use iphonesim tool - open iPhone Simulator and execute our application, also support device family (iphone/ipad)'
+        system(commandis)  	
+    end
 
   end
   
@@ -605,7 +760,7 @@ namespace "device" do
     
     #copy build results to app folder
     
-    app_path = File.join($app_path, 'bin', 'target', 'iOS', $sdk)
+    app_path = File.join($app_path, 'bin', 'target', 'iOS', $sdk, $configuration)
     
     iphone_path = $config["build"]["iphonepath"]    
     if $sdk =~ /iphonesimulator/
@@ -626,7 +781,8 @@ namespace "device" do
     mkdir_p app_path
 
     puts 'copy result build package to application target folder ...'    
-    cp_r src_file, dst_file 
+    cp_r src_file, dst_file
+    make_app_info 
 
     end
   end

data/platform/iphone/rhorunner.xcodeproj/project.pbxproj

@@ -955,8 +955,8 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CODE_SIGN_ENTITLEMENTS = "";
-				CODE_SIGN_IDENTITY = "Don't Code Sign";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Don't Code Sign";
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -975,7 +975,7 @@
 				PRODUCT_NAME = rhorunner;
 				PROVISIONING_PROFILE = "";
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
-				SDKROOT = iphoneos4.1;
+				SDKROOT = iphoneos;
 				STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				USER_HEADER_SEARCH_PATHS = "../shared/ruby/iphone ../shared/ruby/include ../shared/curl/include ../shared/ ../shared/syncengine ../shared/logging ../shared/common rhoextlib";
@@ -1007,7 +1007,7 @@
 				PRODUCT_NAME = rhorunner;
 				PROVISIONING_PROFILE = "";
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
-				SDKROOT = iphoneos4.1;
+				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				USER_HEADER_SEARCH_PATHS = "../shared/ruby/iphone ../shared/ruby/include ../shared/curl/include ../shared/ ../shared/syncengine ../shared/logging ../shared/common rhoextlib";
 			};
@@ -1066,7 +1066,7 @@
 				OTHER_CFLAGS = "";
 				OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
 				PRODUCT_NAME = rhorunner;
-				SDKROOT = iphoneos4.1;
+				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				USER_HEADER_SEARCH_PATHS = "../shared/ruby/iphone ../shared/ruby/include ../shared/curl/include ../shared/ ../shared/syncengine ../shared/logging ../shared/common rhoextlib";
 			};

data/platform/shared/common/IRhoThreadImpl.h

@@ -16,7 +16,7 @@ struct IRhoThreadImpl
 
     virtual void start(IRhoRunnable* pRunnable, IRhoRunnable::EPriority ePriority) = 0;
     virtual void stop(unsigned int nTimeoutToKill) = 0;
-    virtual void wait(unsigned int nTimeout) = 0;
+    virtual int wait(unsigned int nTimeout) = 0;
     virtual void stopWait() = 0;
     virtual void sleep(unsigned int nTimeout) = 0;
 };

data/platform/shared/common/PosixThreadImpl.cpp

@@ -71,7 +71,7 @@ void CPosixThreadImpl::stop(unsigned int nTimeoutToKill)
     pthread_join(m_thread,&status);
 }
 
-void CPosixThreadImpl::wait(unsigned int nTimeout)
+int CPosixThreadImpl::wait(unsigned int nTimeout)
 {
     struct timeval    tp;
     struct timespec   ts;
@@ -89,7 +89,7 @@ void CPosixThreadImpl::wait(unsigned int nTimeout)
     }
 
     common::CMutexLock oLock(m_mxSync);
-
+    int nRet = 0;
     while (!m_stop_wait)
     {
         if (timed_wait) {
@@ -98,12 +98,14 @@ void CPosixThreadImpl::wait(unsigned int nTimeout)
             if (now > max)
                 break;
             
-            pthread_cond_timedwait(&m_condSync, m_mxSync.getNativeMutex(), &ts);
+            nRet = pthread_cond_timedwait(&m_condSync, m_mxSync.getNativeMutex(), &ts) == ETIMEDOUT ? 1 : 0;
         }
         else
             pthread_cond_wait(&m_condSync, m_mxSync.getNativeMutex());
     }
     m_stop_wait = false;
+
+    return nRet;
 }
 
 void CPosixThreadImpl::sleep(unsigned int nTimeout)

data/platform/shared/common/PosixThreadImpl.h

@@ -18,7 +18,7 @@ public:
 
     void start(IRhoRunnable *pRunnable, IRhoRunnable::EPriority ePriority);
     void stop(unsigned int nTimeoutToKill);
-    void wait(unsigned int nTimeout);
+    int wait(unsigned int nTimeout);
     void stopWait();
     void sleep(unsigned int nTimeout);
 

data/platform/shared/common/RhoFilePath.h

@@ -19,6 +19,17 @@ public:
         return m_szPath;
     }
 
+    String getFolderName(){ 
+        const char* base = findLastSlash();
+        if (base)
+        {
+            String strRes = m_szPath;
+            return strRes.substr(0, base-m_szPath);
+        }
+
+        return m_szPath;
+    }
+
     String makeFullPath(const char* szFileName){
         String res = m_szPath;
         if ( res.length() > 0 && !findLastSlash() )

data/platform/shared/common/RhoNativeViewManager.h

@@ -13,6 +13,7 @@
 
 class NativeView {
 public:
+	virtual ~NativeView(){}
 	// that function must return native object provided view functionality :
 	// UIView* for iPhone
 	// jobject for Android - jobect must be android.view.View class type
@@ -24,10 +25,13 @@ public:
 
 class NativeViewFactory {
 public:
+	virtual ~NativeViewFactory(){}
 	virtual NativeView* getNativeView(const char* viewType) = 0;
 	virtual void destroyNativeView(NativeView* nativeView) = 0;
 };
 
+
+
 class RhoNativeViewManager {
 public: 
 	static void registerViewType(const char* viewType, NativeViewFactory* factory);
@@ -40,4 +44,17 @@ public:
 	static void* getWebViewObject(int tab_index);
 };
 
+
+class RhoNativeViewRunnable {
+public:
+	virtual ~RhoNativeViewRunnable(){}
+	virtual void run() = 0;
+};
+
+
+class RhoNativeViewUtil {
+public: 
+	static void executeInUIThread_WM(RhoNativeViewRunnable* command);
+};
+
 #endif

data/platform/shared/common/RhoThread.h

@@ -24,7 +24,7 @@ public:
 
     virtual void start(EPriority ePriority);
     virtual void stop(unsigned int nTimeoutToKill){ m_nState |= TS_STOPPING; if (m_nState&TS_RUNNING) m_pImpl->stop(nTimeoutToKill); m_nState &= ~TS_STOPPING; }
-    virtual void wait(unsigned int nTimeout){ m_nState |= TS_WAIT; if ((m_nState&TS_RUNNING) && !(m_nState&TS_STOPPING) ) m_pImpl->wait(nTimeout); m_nState &= ~TS_WAIT; }
+    virtual int wait(unsigned int nTimeout){ m_nState |= TS_WAIT; int nRet = 0; if ((m_nState&TS_RUNNING) && !(m_nState&TS_STOPPING) ) nRet = m_pImpl->wait(nTimeout); m_nState &= ~TS_WAIT; return nRet; }
     virtual void stopWait(){ /*if (isWaiting())*/ m_pImpl->stopWait(); }
     virtual void sleep(unsigned int nTimeout){ m_pImpl->sleep(nTimeout); }
     virtual void run() = 0;

data/platform/shared/common/RhodesApp.cpp

@@ -236,12 +236,14 @@ public:
 void CRhodesApp::callAppActiveCallback(boolean bActive)
 {
     LOG(INFO) + "callAppActiveCallback";
-    int stop = !rho_conf_getBool("dont_stop_local_server_in_background");
     if (bActive)
     {
-        if (stop)
-            if (m_activateCounter++ > 0)
-                this->stopWait();
+        // Restart server each time when we go to foreground
+        if (m_activateCounter++ > 0)
+        {
+            m_httpServer->stop();
+            this->stopWait();
+        }
         
         String strUrl = m_strHomeUrl + "/system/activateapp";
         // Activation callback need to be runned in separate thread
@@ -262,9 +264,20 @@ void CRhodesApp::callAppActiveCallback(boolean bActive)
         String strUrl = m_strHomeUrl + "/system/deactivateapp";
         NetResponse(resp,getNet().pullData( strUrl, null ));
         if ( !resp.isOK() )
+        {
             LOG(ERROR) + "deactivate app failed. Code: " + resp.getRespCode() + "; Error body: " + resp.getCharData();
-        if (stop)
-            m_httpServer->stop();
+        }else
+        {
+            const char* szData = resp.getCharData();
+            boolean bStop = szData && strcmp(szData,"stop_local_server") == 0;
+
+            if (bStop)
+            {
+                LOG(INFO) + "Stopping local server.";
+                m_httpServer->stop();
+            }
+        }
+
         m_bDeactivationMode = false;
     }
 }
@@ -387,6 +400,14 @@ static void callback_getrhomessage(void *arg, String const &strQuery)
         int nError = atoi(strError.c_str());
 
         strMsg = rho_ruby_internal_getErrorText(nError);
+    }else
+    {
+        size_t nErrorPos = strQuery.find("msgid=");
+        if ( nErrorPos != String::npos )
+        {
+            String strName = strQuery.substr(nErrorPos+6);
+            strMsg = rho_ruby_internal_getMessageText(strName.c_str());
+        }
     }
 
     rho_http_sendresponse(arg, strMsg.c_str());
@@ -399,7 +420,7 @@ const String& CRhodesApp::getRhoMessage(int nError, const char* szName)
         strUrl += "error=" + convertToStringA(nError);
     else if ( szName && *szName )
     {
-        strUrl = "msgid=";
+        strUrl += "msgid=";
         strUrl += szName;
     }
 
@@ -1059,7 +1080,7 @@ const char* rho_ruby_getErrorText(int nError)
 
 const char* rho_ruby_getMessageText(const char* szName)
 {
-    return "";//RHODESAPP().getRhoMessage( 0, szName).c_str();
+    return RHODESAPP().getRhoMessage( 0, szName).c_str();
 }
 
 int rho_rhodesapp_isrubycompiler()

data/platform/shared/common/ThreadQueue.cpp

@@ -17,6 +17,8 @@ CThreadQueue::~CThreadQueue(void)
 
 void CThreadQueue::addQueueCommandInt(IQueueCommand* pCmd)
 {
+    LOG(INFO) + "addCommand: " + pCmd->toString();
+
     synchronized(m_mxStackCommands);
 
 	boolean bExist = false;
@@ -26,6 +28,7 @@ void CThreadQueue::addQueueCommandInt(IQueueCommand* pCmd)
 	    {
 		    if ( m_stackCommands.get(i)->equals(*pCmd) )
 		    {
+                LOG(INFO) + "Command already exists in queue. Skip it.";
 			    bExist = true;
 			    break;
 		    }
@@ -39,8 +42,6 @@ void CThreadQueue::addQueueCommandInt(IQueueCommand* pCmd)
 
 void CThreadQueue::addQueueCommand(IQueueCommand* pCmd)
 { 
-    LOG(INFO) + "addCommand: " + pCmd->toString();
-
     addQueueCommandInt(pCmd);
 
     if ( isNoThreadedMode()  )
@@ -70,7 +71,8 @@ void CThreadQueue::run()
         if ( nWait >= 0 && !isStopping() && isNoCommands() )
 		{
             LOG(INFO) + "ThreadQueue blocked for " + nWait + " seconds...";
-            wait(nWait);
+            if ( wait(nWait) == 1 )
+                onTimeout();
         }
         nLastPollInterval = 0;
 

data/platform/shared/common/ThreadQueue.h

@@ -54,8 +54,9 @@ protected:
     virtual int getLastPollInterval(){ return 0;}
     virtual void processCommand(IQueueCommand* pCmd) = 0;
     virtual boolean isSkipDuplicateCmd() { return false; }
+    virtual void onTimeout(){}
 
-    virtual void processCommands();
+    void processCommands();
 
     void addQueueCommandInt(IQueueCommand* pCmd);
 

data/platform/shared/common/app_build_configs.c

@@ -0,0 +1,25 @@
+// WARNING! THIS FILE IS GENERATED AUTOMATICALLY! DO NOT EDIT IT MANUALLY!
+// Generated Tue Dec 07 06:35:02 +0300 2010
+
+#include <string.h>
+
+#include "app_build_configs.h"
+
+static const char* keys[] = { ""
+};
+
+static const char* values[] = { ""
+};
+
+#define APP_BUILD_CONFIG_COUNT 1
+
+const char* get_app_build_config_item(const char* key) {
+  int i;
+  for (i = 1; i < APP_BUILD_CONFIG_COUNT; i++) {
+    if (strcmp(key, keys[i]) == 0) {
+      return values[i];
+    }
+  }
+  return 0;
+}
+

data/platform/shared/common/app_build_configs.h

@@ -0,0 +1,11 @@
+#pragma once
+
+#ifdef __cplusplus
+extern "C" {
+#endif //__cplusplus
+
+const char* get_app_build_config_item(const char* key);
+
+#ifdef __cplusplus
+}
+#endif //__cplusplus