From bfd6c6981b106ae7fd2f1c359d241cd7a70b7482 Mon Sep 17 00:00:00 2001 From: ClearScript Date: Wed, 15 May 2013 08:58:33 -0400 Subject: [PATCH] Version 5.2.2: Fixed compilation errors due to V8 API deprecation. --- ClearScript/Properties/AssemblyInfo.cs | 4 ++-- ClearScript/V8/ClearScriptV8/V8ContextImpl.cpp | 4 ++-- ClearScript/V8/V8/V8Patch.txt | 2 +- ClearScript/VersionSymbols.h | 4 ++-- ClearScriptBenchmarks/Properties/AssemblyInfo.cs | 4 ++-- ClearScriptConsole/Properties/AssemblyInfo.cs | 4 ++-- ClearScriptTest/Properties/AssemblyInfo.cs | 4 ++-- Version.tt | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/ClearScript/Properties/AssemblyInfo.cs b/ClearScript/Properties/AssemblyInfo.cs index 42e7b382..4de0abe0 100644 --- a/ClearScript/Properties/AssemblyInfo.cs +++ b/ClearScript/Properties/AssemblyInfo.cs @@ -73,5 +73,5 @@ using System.Runtime.InteropServices; [assembly: InternalsVisibleTo("ClearScriptTest")] [assembly: ComVisible(false)] -[assembly: AssemblyVersion("5.2.1.0")] -[assembly: AssemblyFileVersion("5.2.1.0")] +[assembly: AssemblyVersion("5.2.2.0")] +[assembly: AssemblyFileVersion("5.2.2.0")] diff --git a/ClearScript/V8/ClearScriptV8/V8ContextImpl.cpp b/ClearScript/V8/ClearScriptV8/V8ContextImpl.cpp index 84a632ce..bda2a507 100644 --- a/ClearScript/V8/ClearScriptV8/V8ContextImpl.cpp +++ b/ClearScript/V8/ClearScriptV8/V8ContextImpl.cpp @@ -183,7 +183,7 @@ V8ContextImpl::V8ContextImpl(LPCWSTR pName, bool enableDebugging, bool disableGl if (disableGlobalMembers) { - m_hContext = Context::New(); + m_hContext = Persistent::New(m_pIsolate, Context::New(m_pIsolate)); } else { @@ -192,7 +192,7 @@ V8ContextImpl::V8ContextImpl(LPCWSTR pName, bool enableDebugging, bool disableGl hGlobalTemplate->SetNamedPropertyHandler(GetGlobalProperty, SetGlobalProperty, QueryGlobalProperty, DeleteGlobalProperty, GetGlobalPropertyNames); hGlobalTemplate->SetIndexedPropertyHandler(GetGlobalProperty, SetGlobalProperty, QueryGlobalProperty, DeleteGlobalProperty, GetGlobalPropertyIndices); - m_hContext = Context::New(nullptr, hGlobalTemplate); + m_hContext = Persistent::New(m_pIsolate, Context::New(m_pIsolate, nullptr, hGlobalTemplate)); m_hGlobal = Persistent::New(m_pIsolate, m_hContext->Global()->GetPrototype()->ToObject()); _ASSERTE(m_hGlobal->InternalFieldCount() > 0); diff --git a/ClearScript/V8/V8/V8Patch.txt b/ClearScript/V8/V8/V8Patch.txt index 72e23c4a..2b987301 100644 --- a/ClearScript/V8/V8/V8Patch.txt +++ b/ClearScript/V8/V8/V8Patch.txt @@ -1,6 +1,6 @@ Index: tools/gyp/v8.gyp =================================================================== ---- tools/gyp/v8.gyp (revision 14518) +--- tools/gyp/v8.gyp (revision 14680) +++ tools/gyp/v8.gyp (working copy) @@ -32,6 +32,7 @@ 'targets': [ diff --git a/ClearScript/VersionSymbols.h b/ClearScript/VersionSymbols.h index 6da7f0ad..ce3ff4c0 100644 --- a/ClearScript/VersionSymbols.h +++ b/ClearScript/VersionSymbols.h @@ -61,5 +61,5 @@ -#define CLEARSCRIPT_VERSION_STRING "5.2.1.0" -#define CLEARSCRIPT_VERSION_COMMA_SEPARATED 5,2,1,0 +#define CLEARSCRIPT_VERSION_STRING "5.2.2.0" +#define CLEARSCRIPT_VERSION_COMMA_SEPARATED 5,2,2,0 diff --git a/ClearScriptBenchmarks/Properties/AssemblyInfo.cs b/ClearScriptBenchmarks/Properties/AssemblyInfo.cs index 5fc9e995..b7544674 100644 --- a/ClearScriptBenchmarks/Properties/AssemblyInfo.cs +++ b/ClearScriptBenchmarks/Properties/AssemblyInfo.cs @@ -69,5 +69,5 @@ using System.Runtime.InteropServices; [assembly: AssemblyCopyright("© Microsoft Corporation")] [assembly: ComVisible(false)] -[assembly: AssemblyVersion("5.2.1.0")] -[assembly: AssemblyFileVersion("5.2.1.0")] +[assembly: AssemblyVersion("5.2.2.0")] +[assembly: AssemblyFileVersion("5.2.2.0")] diff --git a/ClearScriptConsole/Properties/AssemblyInfo.cs b/ClearScriptConsole/Properties/AssemblyInfo.cs index c1ac45af..d06ca7df 100644 --- a/ClearScriptConsole/Properties/AssemblyInfo.cs +++ b/ClearScriptConsole/Properties/AssemblyInfo.cs @@ -69,5 +69,5 @@ using System.Runtime.InteropServices; [assembly: AssemblyCopyright("© Microsoft Corporation")] [assembly: ComVisible(false)] -[assembly: AssemblyVersion("5.2.1.0")] -[assembly: AssemblyFileVersion("5.2.1.0")] +[assembly: AssemblyVersion("5.2.2.0")] +[assembly: AssemblyFileVersion("5.2.2.0")] diff --git a/ClearScriptTest/Properties/AssemblyInfo.cs b/ClearScriptTest/Properties/AssemblyInfo.cs index 1a57d6bf..d10a35b7 100644 --- a/ClearScriptTest/Properties/AssemblyInfo.cs +++ b/ClearScriptTest/Properties/AssemblyInfo.cs @@ -69,5 +69,5 @@ using System.Runtime.InteropServices; [assembly: AssemblyCopyright("© Microsoft Corporation")] [assembly: ComVisible(false)] -[assembly: AssemblyVersion("5.2.1.0")] -[assembly: AssemblyFileVersion("5.2.1.0")] +[assembly: AssemblyVersion("5.2.2.0")] +[assembly: AssemblyFileVersion("5.2.2.0")] diff --git a/Version.tt b/Version.tt index 6971528c..a22e0b0b 100644 --- a/Version.tt +++ b/Version.tt @@ -1 +1 @@ -<# var version = new Version(5, 2, 1, 0); #> +<# var version = new Version(5, 2, 2, 0); #>