rhodes 6.2.0 → 7.1.17

data/lib/commonAPI/RubyServer/ext/platform/iphone/RubyServer_Prefix.pch

@@ -0,0 +1,7 @@
+//
+// Prefix header for all source files of the 'CocoaTouchStaticLibrary' target in the 'CocoaTouchStaticLibrary' project.
+//
+
+#ifdef __OBJC__
+    #import <Foundation/Foundation.h>
+#endif

data/lib/commonAPI/RubyServer/ext/shared/RubyServerImpl.cpp

@@ -0,0 +1,242 @@
+//
+//  RubyServerImpl.cpp
+#include "common/RhoStd.h"
+#include "common/AutoPointer.h"
+#include "common/RhodesApp.h"
+#include "common/RhoConf.h"
+#include "generated/cpp/RubyServerBase.h"
+#include "logging/RhoLog.h"
+#include "rhoruby/api/RhoRuby.h"
+
+
+
+
+class CRhoRubyServerRunMethodHolder : public  rho::ruby::IRunnable {
+public:
+
+    CRhoRubyServerRunMethodHolder(   const rho::String& classFullName,
+                                    const rho::String& methodName,
+                                    const rho::String& parameters_in_JSON,
+                                    rho::apiGenerator::CMethodResult& mresult) {
+        mClassName = classFullName;
+        mMethodName = methodName;
+        mParameters = parameters_in_JSON;
+        mMethodResult = mresult;
+    }
+
+    virtual ~CRhoRubyServerRunMethodHolder() {}
+
+    virtual void run() {
+        rho::ruby::IRhoRuby* rr = rho::ruby::RhoRubySingletone::getRhoRuby();
+        rho::ruby::IString* rr_str = rr->executeRubyMethodWithJSON(mClassName.c_str(), mMethodName.c_str(), mParameters.c_str());
+        rho::String res_str;
+        if (rr_str != NULL) {
+            res_str = rr_str->getUTF8();
+        }
+        mMethodResult.set(res_str);
+        delete this;
+    }
+
+private:
+    rho::String mClassName;
+    rho::String mMethodName;
+    rho::String mParameters;
+    rho::apiGenerator::CMethodResult mMethodResult;
+
+};
+
+class CRhoRubyServerLoadRubyHolder : public  rho::ruby::IRunnable {
+public:
+    
+    CRhoRubyServerLoadRubyHolder(   const rho::String& filename) {
+        mFileName = filename;
+    }
+    
+    virtual ~CRhoRubyServerLoadRubyHolder() {}
+    
+    virtual void run() {
+        rho::ruby::IRhoRuby* rr = rho::ruby::RhoRubySingletone::getRhoRuby();
+        rr->loadRubyFile(mFileName.c_str());
+        delete this;
+    }
+    
+private:
+    rho::String mFileName;
+    
+};
+
+class CRhoRubyServerLoadModelHolder : public  rho::ruby::IRunnable {
+public:
+    
+    CRhoRubyServerLoadModelHolder(   const rho::String& filename) {
+        mFileName = filename;
+    }
+    
+    virtual ~CRhoRubyServerLoadModelHolder() {}
+    
+    virtual void run() {
+        rho::ruby::IRhoRuby* rr = rho::ruby::RhoRubySingletone::getRhoRuby();
+        rr->loadModel(mFileName.c_str());
+        delete this;
+    }
+    
+private:
+    rho::String mFileName;
+    
+};
+
+
+class CRhoRubyServerNativeCallbackHolder : public  rho::ruby::IRubyNativeCallback {
+public:
+
+    CRhoRubyServerNativeCallbackHolder(rho::apiGenerator::CMethodResult& mresult) {
+        mMethodResult = mresult;
+    }
+
+    virtual ~CRhoRubyServerNativeCallbackHolder() {}
+
+    virtual void onRubyNative(rho::ruby::IObject* param) {
+        rho::ruby::IRhoRuby* rr = rho::ruby::RhoRubySingletone::getRhoRuby();
+        rho::String res_str;
+        if (param != NULL) {
+            rho::ruby::IString* str = rr->convertObject_to_JSON(param);
+            if (str != NULL) {
+                res_str = str->getUTF8();
+            }
+        }
+        mMethodResult.set(res_str);
+    }
+    
+    
+private:
+    rho::apiGenerator::CMethodResult mMethodResult;
+    
+};
+
+
+class CRhoRubyServerLocalServerRequestCallbackHolder : public  rho::ruby::IRubyLocalServerRequestCallback {
+public:
+    
+    CRhoRubyServerLocalServerRequestCallbackHolder(rho::apiGenerator::CMethodResult& mresult) {
+        mMethodResult = mresult;
+    }
+    
+    virtual ~CRhoRubyServerLocalServerRequestCallbackHolder() {}
+    
+    virtual void onLocalServerResponce(rho::ruby::IString* responce) {
+        rho::String res_str;
+        if (responce != NULL) {
+           res_str = responce->getUTF8();
+        }
+        mMethodResult.set(res_str);
+    }
+    
+    
+private:
+    rho::apiGenerator::CMethodResult mMethodResult;
+    
+};
+
+
+
+namespace rho {
+
+    using namespace apiGenerator;
+    using namespace common;
+
+    class CRubyServerSingletonImpl: public CRubyServerSingletonBase
+    {
+    public:
+
+        CRubyServerSingletonImpl(): CRubyServerSingletonBase(){}
+
+        //methods
+
+        // serverURL getter for "serverURL" property
+        virtual void getServerURL(rho::apiGenerator::CMethodResult& oResult) {
+            // RAWLOGC_INFO("getServerURL","RubyServer");
+            oResult.set(RHODESAPP().getRubyHomeURL());
+        }
+
+        // loadRubyFile Load ruby file into Ruby VM
+        virtual void loadRubyFile( const rho::String& filepath, rho::apiGenerator::CMethodResult& oResult) {
+            // RAWLOGC_INFO("loadRubyFile","RubyServer");
+            rho::ruby::IRhoRuby* rr = rho::ruby::RhoRubySingletone::getRhoRuby();
+            CRhoRubyServerLoadRubyHolder* rr_holder = new CRhoRubyServerLoadRubyHolder(filepath);
+            rr->executeInRubyThread(rr_holder);
+        }
+
+        // loadModel Load ruby model file into Ruby VM
+        virtual void loadModel( const rho::String& filepath, rho::apiGenerator::CMethodResult& oResult) {
+            // RAWLOGC_INFO("loadModel","RubyServer");
+            rho::ruby::IRhoRuby* rr = rho::ruby::RhoRubySingletone::getRhoRuby();
+            CRhoRubyServerLoadModelHolder* rr_holder = new CRhoRubyServerLoadModelHolder(filepath);
+            rr->executeInRubyThread(rr_holder);
+        }
+
+        // executeRubyMethodWithJSON Async call ruby code in Ruby thread and return result in callback
+        virtual void executeRubyMethodWithJSON( const rho::String& classFullName,  const rho::String& methodName,  const rho::String& parameters_in_JSON, rho::apiGenerator::CMethodResult& oResult) {
+            // RAWLOGC_INFO("executeRubyMethodWithJSON","RubyServer");
+            rho::ruby::IRhoRuby* rr = rho::ruby::RhoRubySingletone::getRhoRuby();
+            CRhoRubyServerRunMethodHolder* rr_holder = new CRhoRubyServerRunMethodHolder(classFullName, methodName, parameters_in_JSON, oResult);
+            //rr_holder->run();
+            rr->executeInRubyThread(rr_holder);
+        }
+
+        // executeGetRequestToRubyServer Async make GET request to Ruby local server and return responce in callback
+        virtual void executeGetRequestToRubyServer( const rho::String& url, rho::apiGenerator::CMethodResult& oResult) {
+            // RAWLOGC_INFO("executeGetRequestToRubyServer","RubyServer");
+            rho::ruby::IRhoRuby* rr = rho::ruby::RhoRubySingletone::getRhoRuby();
+            CRhoRubyServerLocalServerRequestCallbackHolder* rr_holder = new CRhoRubyServerLocalServerRequestCallbackHolder(oResult);
+            rr->executeGetRequestToRubyServer(url.c_str(), rr_holder);
+        }
+
+        // addRubyNativeCallback add Ruby callback for call your code from Ruby. In Ruby : Rho::Ruby.callNativeCallback(callbackID, param)
+        virtual void addRubyNativeCallback( const rho::String& callbackID, rho::apiGenerator::CMethodResult& oResult) {
+            // RAWLOGC_INFO("addRubyNativeCallback","RubyServer");
+            rho::ruby::IRhoRuby* rr = rho::ruby::RhoRubySingletone::getRhoRuby();
+            CRhoRubyServerNativeCallbackHolder* rr_holder = new CRhoRubyServerNativeCallbackHolder(oResult);
+            rr->addRubyNativeCallback(callbackID.c_str(), rr_holder);
+        }
+
+        // removeRubyNativeCallback remove previously added Ruby callback for call your code from Ruby. In Ruby : Rho::Ruby.callNativeCallback(callbackID, param)
+        virtual void removeRubyNativeCallback( const rho::String& callbackID, rho::apiGenerator::CMethodResult& oResult) {
+            // RAWLOGC_INFO("removeRubyNativeCallback","RubyServer");
+            rho::ruby::IRhoRuby* rr = rho::ruby::RhoRubySingletone::getRhoRuby();
+            rr->removeRubyNativeCallback(callbackID.c_str());
+        }
+
+    };
+
+    class CRubyServerImpl : public CRubyServerBase
+    {
+    public:
+        virtual ~CRubyServerImpl() {}
+
+        //methods
+
+    };
+
+    ////////////////////////////////////////////////////////////////////////
+
+    class CRubyServerFactory: public CRubyServerFactoryBase    {
+    public:
+        CRubyServerFactory(){}
+
+        IRubyServerSingleton* createModuleSingleton()
+        {
+            return new CRubyServerSingletonImpl();
+        }
+        
+        virtual IRubyServer* createModuleByID(const rho::String& strID){ return new CRubyServerImpl(); };
+
+    };
+
+}
+
+extern "C" void Init_RubyServer_extension()
+{
+    rho::CRubyServerFactory::setInstance( new rho::CRubyServerFactory() );
+    rho::Init_RubyServer_API();
+
+}

data/lib/commonAPI/barcode/ext/platform/android/src/com/rho/barcode/BarcodeFactory.java

@@ -51,6 +51,7 @@ public class BarcodeFactory extends RhoApiFactory<Barcode, BarcodeSingleton> imp
 	private int defaultEMDKScanner = -1;
 	protected final int KEYCODE_TRIGGER_1 = 102;
 	protected final int KEYCODE_TRIGGER_2 = 103;
+	protected final int KEYCODE_SCAN = 10036;
 	private int lastKeyAction;
 	private StartScannerTask startTask;
 	private StopScannerTask stopTask;
@@ -469,6 +470,22 @@ public class BarcodeFactory extends RhoApiFactory<Barcode, BarcodeSingleton> imp
 	{
 		return defaultEMDKScanner;
 	}
+
+	private boolean isKeyScan(int keyCode)
+	{
+		switch (keyCode) {
+			case KEYCODE_TRIGGER_2:
+			case KEYCODE_TRIGGER_1:
+			case KEYCODE_SCAN:
+			    return true;
+	
+			default:
+			{
+			    Logger.E(TAG, "Key code not found: " + keyCode);
+				return false;
+			}
+		}
+	} 
 	
 	public boolean onKey(int keyCode, KeyEvent event)
 	{
@@ -476,7 +493,8 @@ public class BarcodeFactory extends RhoApiFactory<Barcode, BarcodeSingleton> imp
 		//TODO enabledScanner is not being populated by EMDK3 Scanner
 		if(enabledScanner != null)
 		{
-			if (((keyCode == KEYCODE_TRIGGER_1) || (keyCode == KEYCODE_TRIGGER_2)) && event.getRepeatCount() == 0)
+			Logger.D(TAG, "Key code: " + keyCode);
+			if (isKeyScan(keyCode) && event.getRepeatCount() == 0)
 			{
 				boolean isDown = (event.getAction() == KeyEvent.ACTION_DOWN);
 				Logger.D(TAG, "Caught Trigger for the Scanner: " + isDown);
@@ -581,7 +599,8 @@ public class BarcodeFactory extends RhoApiFactory<Barcode, BarcodeSingleton> imp
 
 		if (releaseEMDKOnPause) {		
 			Logger.D( TAG, "Will restore EMDK resources" );
-			emdk3Listener.resume();			
+			if(emdk3Listener != null)			
+			    emdk3Listener.resume();			
 		}
 
 		if(enabledScanner != null)
@@ -629,7 +648,8 @@ public class BarcodeFactory extends RhoApiFactory<Barcode, BarcodeSingleton> imp
 			Logger.D( TAG, "Will release EMDK resources" );
 			enabledScanner = null;
 			removeAllEMDKScannerIDs();
-			emdk3Listener.pause();
+			if(emdk3Listener != null)			
+			    emdk3Listener.pause();
 			setIsEMDKScannerSetupCalled(false);
 		}
 

data/lib/commonAPI/barcode/ext/platform/android/src/com/rho/barcode/BarcodeRhoExtension.java

@@ -7,13 +7,15 @@ import com.rhomobile.rhodes.extmanager.IRhoExtManager;
 import com.rhomobile.rhodes.extmanager.IRhoWebView;
 import com.rhomobile.rhodes.webview.GoogleWebView;
 import com.rhomobile.rhodes.webview.WebViewConfig;
+import com.rhomobile.rhodes.Logger;
+
+import android.net.Uri;
 
 public class BarcodeRhoExtension extends AbstractRhoExtension{
-	
-	@Override
-	public boolean onNavigateStarted(IRhoExtManager extManager, String url,
-			IRhoWebView ext, boolean res) {
-		// TODO Auto-generated method stub
+
+	private final static String TAG = "BarcodeRhoExtension";
+
+	public boolean onBeforeNavigate(IRhoExtManager extManager, String url, IRhoWebView ext, boolean res) {
 		int disable_scanner_val = 0;
 		IRhoConfig rhoelementsGetConfig= null;
         IRhoWebView vi=RhodesActivity.safeGetInstance().getMainView().getWebView(0);
@@ -35,10 +37,68 @@ public class BarcodeRhoExtension extends AbstractRhoExtension{
 
 		if(disable_scanner_val == 1){
 			BarcodeFactory factory=(BarcodeFactory) BarcodeFactorySingleton.getInstance();
-			if(factory!=null)
-				factory.disableScannerOnNavigate();
+			if(factory!=null) {
+
+				Logger.D( TAG, "Will check for url before disabling scanner on navigate: " + url );
+
+				boolean doDisable = isControllerURL(url);
+
+				if (doDisable) {
+					Logger.D( TAG, "Will disable active scanner as navigating to other page.");
+					factory.disableScannerOnNavigate();
+				} else {
+					Logger.D( TAG, "Won't disable active scaner as target URL didn't met required contitions.");
+				}
+			}
+				
 		}
-		return super.onNavigateStarted(extManager, url, ext, res);
+
+		//return res;
+		return super.onBeforeNavigate(extManager, url, ext, res);
+	}
+	
+	//this will determine if requested URL belongs to controller part of the app.
+	//we need to only apply disable scanner policy when really changing the page.
+	private static boolean isControllerURL( String url ) {
+
+		try {
+			Uri uri = Uri.parse(url);
+			String protocol = uri.getScheme();
+			if ( null == protocol ) {
+				protocol = "";
+			}
+			protocol = protocol.toLowerCase();
+
+			String host = uri.getHost();
+			if ( null == host ) {
+				host = "";
+			}
+			host = host.toLowerCase();
+
+			String path = uri.getPath();
+			if ( null == path ) {
+				path = "";
+			}
+			path = path.toLowerCase();
+
+			boolean validProtocol = protocol.isEmpty() || protocol.equals("http") || protocol.equals( "https");
+			boolean validHost = host.isEmpty() || host.equals("localhost") || host.equals("127.0.0.1");
+			boolean validPath = path.startsWith("/app/");
+
+			Logger.D( TAG, "isControllerURL: " + 
+				"proto:" + protocol + ":" + String.valueOf(validProtocol) +
+				" host:" + host + ":" + String.valueOf(validHost) +
+				" path:" + path + ":" + String.valueOf(validPath)
+			);
+
+			return validProtocol && validHost && validPath;
+		}
+		catch( Throwable e ) {
+			Logger.W(TAG, "Error parsing pre-navigate URL" );
+			e.printStackTrace();
+		}
+
+		return false;
 	}
 
 

data/lib/commonAPI/barcode/ext/platform/iphone/Barcode.xcodeproj/project.pbxproj

@@ -8,7 +8,6 @@
 
 /* Begin PBXBuildFile section */
 		AA747D9F0F9514B9006C5449 /* Barcode_Prefix.pch in Headers */ = {isa = PBXBuildFile; fileRef = AA747D9E0F9514B9006C5449 /* Barcode_Prefix.pch */; };
-		AC3113DB2090484500B94E0D /* libzbar.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FA4D3F0B136AF9BD009D6E63 /* libzbar.a */; };
 		ACC8390A20890CB000677617 /* libZXingObjC-iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ACC838DA2087838100677617 /* libZXingObjC-iOS.a */; };
 		FA21F9FA170658EE0061F9DC /* barcode_api_init.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA21F9F7170658EE0061F9DC /* barcode_api_init.cpp */; };
 		FA21F9FB170658EE0061F9DC /* barcode_js_api.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA21F9F8170658EE0061F9DC /* barcode_js_api.cpp */; };
@@ -66,13 +65,6 @@
 			remoteGlobalIDString = 25403CB3166A96FA00E13304;
 			remoteInfo = "ZXingObjC-iOS";
 		};
-		ACC838DB2087838100677617 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = ACC838D02087838000677617 /* ZXingObjC.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 25403CC4166A96FA00E13304;
-			remoteInfo = "Unit Tests iOS";
-		};
 		ACC838DD2087838100677617 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = ACC838D02087838000677617 /* ZXingObjC.xcodeproj */;
@@ -80,13 +72,6 @@
 			remoteGlobalIDString = 25404166166AADAC00E13304;
 			remoteInfo = "ZXingObjC-osx";
 		};
-		ACC838DF2087838100677617 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = ACC838D02087838000677617 /* ZXingObjC.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 25404178166AADAC00E13304;
-			remoteInfo = "Unit Tests OS X";
-		};
 		ACC838E12087838100677617 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = ACC838D02087838000677617 /* ZXingObjC.xcodeproj */;
@@ -157,7 +142,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				AC3113DB2090484500B94E0D /* libzbar.a in Frameworks */,
 				ACC8390A20890CB000677617 /* libZXingObjC-iOS.a in Frameworks */,
 				FA4D3F50136B07BB009D6E63 /* CoreVideo.framework in Frameworks */,
 				FA4D3F4E136B07B2009D6E63 /* CoreMedia.framework in Frameworks */,
@@ -242,9 +226,7 @@
 			isa = PBXGroup;
 			children = (
 				ACC838DA2087838100677617 /* libZXingObjC-iOS.a */,
-				ACC838DC2087838100677617 /* Unit Tests iOS.xctest */,
 				ACC838DE2087838100677617 /* libZXingObjC-osx.a */,
-				ACC838E02087838100677617 /* Unit Tests OS X.xctest */,
 				ACC838E22087838100677617 /* ZXingObjC.framework */,
 				ACC838E42087838100677617 /* ZXingObjC.framework */,
 			);
@@ -412,13 +394,6 @@
 			remoteRef = ACC838D92087838100677617 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		ACC838DC2087838100677617 /* Unit Tests iOS.xctest */ = {
-			isa = PBXReferenceProxy;
-			fileType = wrapper.cfbundle;
-			path = "Unit Tests iOS.xctest";
-			remoteRef = ACC838DB2087838100677617 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
 		ACC838DE2087838100677617 /* libZXingObjC-osx.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
@@ -426,13 +401,6 @@
 			remoteRef = ACC838DD2087838100677617 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		ACC838E02087838100677617 /* Unit Tests OS X.xctest */ = {
-			isa = PBXReferenceProxy;
-			fileType = wrapper.cfbundle;
-			path = "Unit Tests OS X.xctest";
-			remoteRef = ACC838DF2087838100677617 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
 		ACC838E22087838100677617 /* ZXingObjC.framework */ = {
 			isa = PBXReferenceProxy;
 			fileType = wrapper.framework;
@@ -515,11 +483,12 @@
 					"$(RHO_ROOT)/platform/shared",
 					ZBarSDK/Headers/ZBarSDK,
 					ZBarSDK/Headers/ZBarSDK/zbar,
-					/Users/MOHUS/rhodes/platform/shared/common,
-					/Users/MOHUS/rhodes/platform/shared/rubyext,
-					/Users/MOHUS/rhodes/platform/shared/ruby/include,
-					/Users/MOHUS/rhodes/platform/shared/ruby/iphone,
-					/Users/MOHUS/rhodes/platform/shared,
+					/Users/MOHUS/tauplatform/rhodes/platform/shared/common,
+					/Users/MOHUS/tauplatform/rhodes/platform/shared/rubyext,
+					/Users/MOHUS/tauplatform/rhodes/platform/shared/ruby/include,
+					/Users/MOHUS/tauplatform/rhodes/platform/shared/ruby/iphone,
+					/Users/MOHUS/tauplatform/rhodes/platform/shared,
+					/Users/MOHUS/tauplatform/rhodes/platform/iphone/Classes,
 					"./ZXingObjC/ZXingObjC/**",
 				);
 				INSTALL_PATH = /usr/local/lib;
@@ -563,11 +532,12 @@
 					"$(RHO_ROOT)/platform/shared",
 					ZBarSDK/Headers/ZBarSDK,
 					ZBarSDK/Headers/ZBarSDK/zbar,
-					/Users/MOHUS/rhodes/platform/shared/common,
-					/Users/MOHUS/rhodes/platform/shared/rubyext,
-					/Users/MOHUS/rhodes/platform/shared/ruby/include,
-					/Users/MOHUS/rhodes/platform/shared/ruby/iphone,
-					/Users/MOHUS/rhodes/platform/shared,
+					/Users/MOHUS/tauplatform/rhodes/platform/shared/common,
+					/Users/MOHUS/tauplatform/rhodes/platform/shared/rubyext,
+					/Users/MOHUS/tauplatform/rhodes/platform/shared/ruby/include,
+					/Users/MOHUS/tauplatform/rhodes/platform/shared/ruby/iphone,
+					/Users/MOHUS/tauplatform/rhodes/platform/shared,
+					/Users/MOHUS/tauplatform/rhodes/platform/iphone/Classes,
 					"./ZXingObjC/ZXingObjC/**",
 				);
 				INSTALL_PATH = /usr/local/lib;
@@ -603,11 +573,12 @@
 					"$(RHO_ROOT)/platform/shared",
 					ZBarSDK/Headers/ZBarSDK,
 					ZBarSDK/Headers/ZBarSDK/zbar,
-					/Users/MOHUS/rhodes/platform/shared/common,
-					/Users/MOHUS/rhodes/platform/shared/rubyext,
-					/Users/MOHUS/rhodes/platform/shared/ruby/include,
-					/Users/MOHUS/rhodes/platform/shared/ruby/iphone,
-					/Users/MOHUS/rhodes/platform/shared,
+					/Users/MOHUS/tauplatform/rhodes/platform/shared/common,
+					/Users/MOHUS/tauplatform/rhodes/platform/shared/rubyext,
+					/Users/MOHUS/tauplatform/rhodes/platform/shared/ruby/include,
+					/Users/MOHUS/tauplatform/rhodes/platform/shared/ruby/iphone,
+					/Users/MOHUS/tauplatform/rhodes/platform/shared,
+					/Users/MOHUS/tauplatform/rhodes/platform/iphone/Classes,
 				);
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				ONLY_ACTIVE_ARCH = NO;
@@ -632,11 +603,12 @@
 					"$(RHO_ROOT)/platform/shared",
 					ZBarSDK/Headers/ZBarSDK,
 					ZBarSDK/Headers/ZBarSDK/zbar,
-					/Users/MOHUS/rhodes/platform/shared/common,
-					/Users/MOHUS/rhodes/platform/shared/rubyext,
-					/Users/MOHUS/rhodes/platform/shared/ruby/include,
-					/Users/MOHUS/rhodes/platform/shared/ruby/iphone,
-					/Users/MOHUS/rhodes/platform/shared,
+					/Users/MOHUS/tauplatform/rhodes/platform/shared/common,
+					/Users/MOHUS/tauplatform/rhodes/platform/shared/rubyext,
+					/Users/MOHUS/tauplatform/rhodes/platform/shared/ruby/include,
+					/Users/MOHUS/tauplatform/rhodes/platform/shared/ruby/iphone,
+					/Users/MOHUS/tauplatform/rhodes/platform/shared,
+					/Users/MOHUS/tauplatform/rhodes/platform/iphone/Classes,
 				);
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				ONLY_ACTIVE_ARCH = NO;