Merge remote-tracking branch 'origin/V8-5.1.300' into Mac-5.1.300

Author: nakosung

Source/V8/Private/Debugger.cpp

@@ -2,6 +2,7 @@
 
 PRAGMA_DISABLE_SHADOW_VARIABLE_WARNINGS
 
+#if !PLATFORM_LINUX
 #include "JavascriptIsolate.h"
 #include "JavascriptContext.h"
 #include "SocketSubSystem.h"
@@ -20,10 +21,11 @@ PRAGMA_DISABLE_SHADOW_VARIABLE_WARNINGS
 #define DEBUG_V8_DEBUGGER 0
 
 #include "Translator.h"
+#endif
 
 using namespace v8;
 
-#if WITH_EDITOR
+#if WITH_EDITOR && !PLATFORM_LINUX
 #include "TickableEditorObject.h"
 
 namespace 
@@ -436,4 +438,4 @@ IJavascriptDebugger* IJavascriptDebugger::Create(int32 InPort, Local<Context> In
 } 
 #endif
 
-PRAGMA_ENABLE_SHADOW_VARIABLE_WARNINGS
+PRAGMA_ENABLE_SHADOW_VARIABLE_WARNINGS

Source/V8/Private/V8Module.cpp

@@ -32,7 +32,7 @@ using namespace v8;
 UJavascriptSettings::UJavascriptSettings(const FObjectInitializer& ObjectInitializer)
 	: Super(ObjectInitializer)
 {
-	V8Flags = TEXT("--harmony --harmony-shipping --es-staging --expose-debug-as=v8debug --expose-gc --harmony_destructuring --harmony_simd --harmony_default_parameters");
+	V8Flags = TEXT("--harmony --harmony-shipping --es-staging --expose-debug-as=v8debug --expose-gc --harmony_simd");
 }
 
 void UJavascriptSettings::Apply() const
@@ -141,7 +141,7 @@ class V8Module : public IV8
 		{
 			UJavascriptContext* Context = *It;
 
-			if (Context->ContextId == TargetContext || !TargetContext.IsValid() && Context->IsDebugContext())
+			if (Context->ContextId == TargetContext || (!TargetContext.IsValid() && Context->IsDebugContext()))
 			{
 				FString Result = Context->RunScript(FString::Printf(SourceCode, *FString(Input).ReplaceCharWithEscapedChar()), false);
 				Result.ParseIntoArray(OutArray, TEXT(","));
@@ -155,7 +155,7 @@ class V8Module : public IV8
 		{
 			UJavascriptContext* Context = *It;
 
-			if (Context->ContextId == TargetContext || !TargetContext.IsValid() && Context->IsDebugContext())
+			if (Context->ContextId == TargetContext || (!TargetContext.IsValid() && Context->IsDebugContext()))
 			{
 				static FName NAME_JavascriptCmd("JavascriptCmd");
 				GLog->Log(NAME_JavascriptCmd, ELogVerbosity::Log, Command);

Source/V8/V8.Build.cs

@@ -58,24 +58,15 @@ private bool LoadV8(TargetInfo Target)
     {
         if ((Target.Platform == UnrealTargetPlatform.Win64) || (Target.Platform == UnrealTargetPlatform.Win32))
         {
-            string LibrariesPath = Path.Combine(ThirdPartyPath, "v8", "lib", "Windows");
-
-            if (WindowsPlatform.Compiler == WindowsCompiler.VisualStudio2015)
-            {
-                LibrariesPath = Path.Combine(LibrariesPath, "MSVC2015");
-            }
-            else
-            {
-                LibrariesPath = Path.Combine(LibrariesPath, "MSVC2013");
-            }
+            string LibrariesPath = Path.Combine(ThirdPartyPath, "v8", "lib");
 
             if (Target.Platform == UnrealTargetPlatform.Win64)
             {
-                LibrariesPath = Path.Combine(LibrariesPath, "x64");
+                LibrariesPath = Path.Combine(LibrariesPath, "Win64");
             }
             else
-            {   
-                LibrariesPath = Path.Combine(LibrariesPath, "x86");
+            {
+                LibrariesPath = Path.Combine(LibrariesPath, "Win32");
             }
 
             if (Target.Configuration == UnrealTargetConfiguration.Debug)
@@ -85,7 +76,7 @@ private bool LoadV8(TargetInfo Target)
             else
             {
                 LibrariesPath = Path.Combine(LibrariesPath, "Release");
-            }            
+            }
 
             PublicAdditionalLibraries.Add(Path.Combine(LibrariesPath, "v8_base_0.lib"));
             PublicAdditionalLibraries.Add(Path.Combine(LibrariesPath, "v8_base_1.lib"));
@@ -96,7 +87,7 @@ private bool LoadV8(TargetInfo Target)
             PublicAdditionalLibraries.Add(Path.Combine(LibrariesPath, "v8_nosnapshot.lib"));
 
             Definitions.Add(string.Format("WITH_V8=1"));
-            Definitions.Add(string.Format("WITH_V8_FAST_CALL=1"));
+            Definitions.Add(string.Format("WITH_V8_FAST_CALL=0"));
             Definitions.Add(string.Format("WITH_JSWEBSOCKET=1"));
 
             return true;
@@ -120,6 +111,23 @@ private bool LoadV8(TargetInfo Target)
 
             return true;
         }
+        else if (Target.Platform == UnrealTargetPlatform.Linux)
+        {
+            string LibrariesPath = Path.Combine(ThirdPartyPath, "v8", "lib", "Linux");
+            PublicLibraryPaths.Add(Path.Combine(LibrariesPath, "x64"));
+
+            PublicAdditionalLibraries.Add("v8_base");
+            PublicAdditionalLibraries.Add("v8_libbase");
+            PublicAdditionalLibraries.Add("v8_libplatform");
+            PublicAdditionalLibraries.Add("v8_nosnapshot");
+            RuntimeDependencies.Add(new RuntimeDependency("$(GameDir)/Plugins/UnrealJS/ThirdParty/v8/lib/Linux/x64/libv8.so"));
+
+            Definitions.Add(string.Format("WITH_V8=1"));
+            Definitions.Add(string.Format("WITH_V8_FAST_CALL=0"));
+            Definitions.Add(string.Format("WITH_JSWEBSOCKET=0"));
+
+            return true;
+        }
         else if (Target.Platform == UnrealTargetPlatform.Mac)
         {
             string LibrariesPath = Path.Combine(ThirdPartyPath, "v8", "lib", "Mac", "x64");

UnrealJS.uplugin

@@ -15,19 +15,19 @@
       "Name": "V8",
       "Type": "Runtime",
       "LoadingPhase": "PreDefault",
-      "WhitelistPlatforms" : ["Win64", "Win32", "Mac", "Android"]
+      "WhitelistPlatforms" : ["Win64", "Win32", "Mac", "Android", "Linux"]
     },
     {
       "Name": "JavascriptUMG",
       "Type": "Runtime",
       "LoadingPhase": "PreDefault",
-      "WhitelistPlatforms" : ["Win64", "Win32", "Mac", "Android"]
+      "WhitelistPlatforms" : ["Win64", "Win32", "Mac", "Android", "Linux"]
     },
     {
       "Name": "JavascriptHttp",
       "Type": "Runtime",
       "LoadingPhase": "PreDefault",
-      "WhitelistPlatforms" : ["Win64", "Win32", "Mac", "Android"]
+      "WhitelistPlatforms" : ["Win64", "Win32", "Mac", "Android", "Linux"]
     },
     {
       "Name": "JavascriptWebSocket",
@@ -38,12 +38,12 @@
     {
       "Name": "JavascriptEditor",
       "Type": "Editor",
-      "WhitelistPlatforms" : ["Win64", "Win32", "Mac"]
+      "WhitelistPlatforms" : ["Win64", "Win32", "Mac", "Linux"]
     },
     {
       "Name": "JavascriptConsole",
       "Type": "Editor",
-      "WhitelistPlatforms" : ["Win64", "Win32", "Mac"]
+      "WhitelistPlatforms" : ["Win64", "Win32", "Mac", "Linux"]
     }
   ],
   "CanContainContent": true