Permalink
Browse files

Update to v8 d840ed1

  • Loading branch information...
RussellLVP committed Jan 23, 2017
1 parent a77fe1f commit 8ecfe99877622ca9d28d3ef24596f223b662a895
Showing with 22 additions and 20 deletions.
  1. +2 −1 .gitignore
  2. +9 −8 README-V8.md
  3. +6 −6 src/playground/bindings/runtime.cc
  4. +2 −2 src/playground/bindings/runtime.h
  5. +2 −2 src/playground/playgroundjs-plugin.vcxproj
  6. +1 −1 src/v8
View
@@ -1 +1,2 @@
-*.opendb
+*.opendb
+src/playground.VC.db
View
@@ -4,9 +4,9 @@ PlaygroundJS uses the [v8 JavaScript engine](https://code.google.com/p/v8/) to e
## Current revision
PlaygroundJS tracks the master branch of v8, and is currently build against the following revision:
- 13b8a1238b4d08d91938b3fea6bc25a34958ac78
- "Move async/await JS support code out of experimental natives"
- Saturday, September 24th, 2016
+ d840ed11d9fa9f38676e6edcee93ed749afb284d
+ "Revert of [build] Introduce an embedder version string (...)"
+ Saturday, January 21st, 2017
This is reflected in the [//src/v8](/src/v8) folder, which will load the given revision of the v8 JavaScript engine as a git submodule.
@@ -26,12 +26,13 @@ The following preparatory steps have to be executed on all platforms. They check
## Building on Windows
On Windows, run the following command to create the MSVC project files:
- $ $env:GYP_GENERATORS = "msvs,ninja"
- $ python gypfiles/gyp_v8 -Dtarget_arch=ia32 -Dcomponent=shared_library -Dv8_use_snapshot=0 -Dv8_use_external_startup_data=0 -Dv8_enable_i18n_support=0
+ $ $env:DEPOT_TOOLS_WIN_TOOLCHAIN = 0
+ $ $env:GYP_MSVS_VERSION = 2015
+ $ $env:GYP_CHROMIUM_NO_ACTION = 0
+ $ gn gen --ide=vs2015 --args='target_cpu=\"x86\" is_component_build=true is_debug=false v8_use_snapshot=false v8_use_external_startup_data=false v8_enable_i18n_support=false' out.gn/x86.release
+ $ ninja -C out.gn/x86.release v8 v8_libplatform
-Then open `src\v8\gypfiles\all.sln` in the Visual Studio version you're using to build the plugin, and build the `all` target in release mode for x86.
-
-Browse to `src\v8\build\Release` where you will find `v8.dll` that has to be copied to the [//bin](/bin) directory.
+Browse to `src\v8\out.gn\x86.release` where you will find `v8.dll`, `v8_libbase.dll` and `v8_libplatform.dll` that have to be copied to the [//bin](/bin) directory.
## Building on Linux
On Linux, the following commands should be used to compile v8 completely from the command line.
@@ -126,7 +126,7 @@ Runtime::Runtime(Delegate* runtime_delegate,
: global_scope_(new GlobalScope(plugin_controller)),
runtime_delegate_(runtime_delegate),
is_ready_(false),
- frame_counter_start_(base::monotonicallyIncreasingTime()),
+ frame_counter_start_(::base::monotonicallyIncreasingTime()),
frame_counter_(0) {
V8::InitializeICU();
@@ -154,7 +154,7 @@ Runtime::Runtime(Delegate* runtime_delegate,
timer_queue_.reset(new TimerQueue(this));
// TODO: This should be set by some sort of Configuration object.
- script_directory_ = base::FilePath("javascript");
+ script_directory_ = ::base::FilePath("javascript");
}
Runtime::~Runtime() {
@@ -209,7 +209,7 @@ void Runtime::SetReady() {
void Runtime::GetAndResetFrameCounter(double* duration, double* average_fps) {
DCHECK(duration && average_fps);
- double current = base::monotonicallyIncreasingTime();
+ double current = ::base::monotonicallyIncreasingTime();
*duration = current - frame_counter_start_;
*average_fps = frame_counter_ / (*duration / 1000);
@@ -221,7 +221,7 @@ void Runtime::GetAndResetFrameCounter(double* duration, double* average_fps) {
void Runtime::OnFrame() {
++frame_counter_;
- double current_time = base::monotonicallyIncreasingTime();
+ double current_time = ::base::monotonicallyIncreasingTime();
for (FrameObserver* observer : frame_observers_)
observer->OnFrame();
@@ -280,10 +280,10 @@ bool Runtime::Execute(const ScriptSource& script_source,
return true;
}
-bool Runtime::ExecuteFile(const base::FilePath& file,
+bool Runtime::ExecuteFile(const ::base::FilePath& file,
ExecutionType execution_type,
v8::Local<v8::Value>* result) {
- const base::FilePath script_path = script_directory_.Append(file);
+ const ::base::FilePath script_path = script_directory_.Append(file);
std::ifstream handle(script_path.value().c_str());
if (!handle.is_open() || handle.fail())
@@ -116,7 +116,7 @@ class Runtime {
// Executes |file| using the runtime. The file will be read from disk before it will be executed.
// The caller must have created a handle scope prior to using this method.
- bool ExecuteFile(const base::FilePath& file,
+ bool ExecuteFile(const ::base::FilePath& file,
ExecutionType execution_type,
v8::Local<v8::Value>* result = nullptr);
@@ -135,7 +135,7 @@ class Runtime {
// Dispatches the exception caught in |try_catch| to the delegate, if any.
void DisplayException(const v8::TryCatch& try_catch);
- base::FilePath script_directory_;
+ ::base::FilePath script_directory_;
Delegate* runtime_delegate_;
// Set of attached frame observers.
@@ -226,14 +226,14 @@
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)v8\;$(SolutionDir)v8\include\;$(ProjectDir);$(SolutionDir)..\..\mysql-plugin\libmysql\include\;$(SolutionDir)..\..\mysql-plugin\libmysql\lvpbuild\include;$(SolutionDir)..\..\mysql-plugin\libmysql\libbinlogevents\export;C:\boost_1_61_0</AdditionalIncludeDirectories>
<TreatWarningAsError>true</TreatWarningAsError>
- <PreprocessorDefinitions>_WINDLL;NDEBUG;HAVE_STDINT_H;_CRT_SECURE_NO_WARNINGS;WIN32;PLAYGROUND_IMPLEMENTATION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_WINDLL;NDEBUG;HAVE_STDINT_H;_CRT_SECURE_NO_WARNINGS;WIN32;PLAYGROUND_IMPLEMENTATION;_WIN32_WINNT=0x0602;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
- <AdditionalDependencies>$(SolutionDir)out\release\lib\gtest.lib;$(SolutionDir)v8\build\Release\lib\v8.lib;$(SolutionDir)v8\build\Release\lib\v8_libbase.lib;$(SolutionDir)v8\build\Release\lib\v8_libplatform.lib;$(SolutionDir)v8\build\Release\lib\v8_nosnapshot.lib;$(SolutionDir)..\..\mysql-plugin\libmysql\lvpbuild\libmysql\RelWithDebInfo\libmysql.lib;WINMM.LIB;Dbghelp.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(SolutionDir)out\release\lib\gtest.lib;$(SolutionDir)v8\out.gn\x86.release\v8.dll.lib;$(SolutionDir)v8\out.gn\x86.release\v8_libbase.dll.lib;$(SolutionDir)v8\out.gn\x86.release\v8_libplatform.dll.lib;$(SolutionDir)..\..\mysql-plugin\libmysql\lvpbuild\libmysql\RelWithDebInfo\libmysql.lib;WINMM.LIB;Dbghelp.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors>
<ModuleDefinitionFile>playgroundjs-plugin.def</ModuleDefinitionFile>
<AdditionalLibraryDirectories>C:\boost_1_61_0\stage\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
2 src/v8
Submodule v8 updated from 13b8a1 to d840ed

0 comments on commit 8ecfe99

Please sign in to comment.