Merge pull request #15130 from chengstory/AddUseLocalScriptCommand

Add "-use-local-script" command param.

It's OK for me, merged.

tools/simulator/libsimulator/lib/ProjectConfig/ProjectConfig.cpp

@@ -50,6 +50,7 @@ ProjectConfig::ProjectConfig()
     , _consolePort(kProjectConfigConsolePort)
     , _fileUploadPort(kProjectConfigUploadPort)
     , _bindAddress("")
+    , _useLocalScript(false)
 {
     normalize();
 }
@@ -272,6 +273,17 @@ void ProjectConfig::setDebuggerType(int debuggerType)
     _debuggerType = debuggerType;
 }
 
+
+bool ProjectConfig::isUseLocalScript() const
+{
+    return _useLocalScript;
+}
+
+void ProjectConfig::setUseLocalScript(bool useLocalScript)
+{
+    _useLocalScript = useLocalScript;
+}
+
 void ProjectConfig::parseCommandLine(const vector<string> &args)
 {
     auto it = args.begin();
@@ -409,7 +421,19 @@ void ProjectConfig::parseCommandLine(const vector<string> &args)
             vector<string> pathes = split((*it), ';');
             setSearchPath(pathes);
         }
-
+        else if (arg.compare("-use-local-script") == 0)
+        {
+            ++it;
+            if (it == args.end()) break;
+            if ((*it).compare("enable") == 0)
+            {
+                setUseLocalScript(true);
+            }
+            else
+            {
+                setUseLocalScript(false);
+            }
+        }
         ++it;
     }
 }
@@ -571,7 +595,20 @@ vector<string> ProjectConfig::makeCommandLineVector(unsigned int mask /* = kProj
             ret.push_back(pathArgs);
         }
     }
-       
+
+    if (mask & kProjectConfigUseLocalScript)
+    {
+        if (isUseLocalScript())
+        {
+            ret.push_back("-use-local-script");
+            ret.push_back("enable");
+        }
+        else
+        {
+            ret.push_back("-use-local-script");
+            ret.push_back("disable");
+        }
+    }
     return ret;
 }
 

tools/simulator/libsimulator/lib/ProjectConfig/ProjectConfig.h

@@ -28,6 +28,7 @@ using namespace std;
 #define kProjectConfigDebugger                  1024    // -debugger-ldt, -debugger-codeide, -disable-debugger
 #define kProjectConfigListen                    2048    //
 #define kProjectConfigSearchPath                4096    //
+#define kProjectConfigUseLocalScript            8192    // -use-local-script
 
 #define kProjectConfigOpenRecent (kProjectConfigProjectDir | kProjectConfigScriptFile | kProjectConfigPackagePath | kProjectConfigWritablePath | kProjectConfigFrameSize | kProjectConfigFrameScale | kProjectConfigShowConsole | kProjectConfigLoadPrecompiledFramework | kProjectConfigWriteDebugLogToFile)
 
@@ -104,7 +105,10 @@ public:
     const std::string &getBindAddress() const;
     void setSearchPath(const vector<string> &args);
     const vector<string> &getSearchPath() const;
-    
+
+    bool isUseLocalScript() const;
+    void setUseLocalScript(bool useLocalScript);
+
     bool isAppMenu() const;
     bool isResizeWindow() const;
     bool isRetinaDisplay() const;
@@ -133,6 +137,7 @@ private:
     int _fileUploadPort;
     string _bindAddress;
     vector<string> _searchPath;
+    bool _useLocalScript;
 
     void normalize();
     string replaceProjectDirToMacro(const string &path) const;

tools/simulator/libsimulator/lib/runtime/Runtime.cpp

@@ -223,8 +223,12 @@ void RuntimeEngine::setProjectPath(const std::string &workPath)
         g_projectPath = workPath;
     }
 
-    // add project's root directory to search path
-    searchPathArray.insert(searchPathArray.begin(), g_projectPath);
+    if (!_project.isUseLocalScript())
+    {
+        // add project's root directory to search path
+        searchPathArray.insert(searchPathArray.begin(), g_projectPath);
+    }
+    
 
     // add writable path to search path
     searchPathArray.insert(searchPathArray.begin(), FileServer::getShareInstance()->getWritePath());