Visual Studio 2012 Express compatibility. Bump version to 5.0.3.

ClearScriptLib · ClearScriptLib · commit c9a9565e7cd9 · 2013-02-11T11:37:27.000-05:00
diff --git a/ClearScript/Properties/AssemblyInfo.cs b/ClearScript/Properties/AssemblyInfo.cs
@@ -73,5 +73,5 @@
 [assembly: InternalsVisibleTo("ClearScriptTest")]
 
 [assembly: ComVisible(false)]
-[assembly: AssemblyVersion("5.0.2.0")]
-[assembly: AssemblyFileVersion("5.0.2.0")]
+[assembly: AssemblyVersion("5.0.3.0")]
+[assembly: AssemblyFileVersion("5.0.3.0")]
diff --git a/ClearScript/V8/ClearScriptV8/32/ClearScriptV8-32.vcxproj b/ClearScript/V8/ClearScriptV8/32/ClearScriptV8-32.vcxproj
@@ -148,7 +148,6 @@
     <ClInclude Include="..\V8ObjectHolderImpl.h" />
     <ClInclude Include="..\V8ProxyImpl.h" />
     <ClInclude Include="..\V8Value.h" />
-    <ClInclude Include="resource.h" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="Resource.rc" />
diff --git a/ClearScript/V8/ClearScriptV8/32/ClearScriptV8-32.vcxproj.filters b/ClearScript/V8/ClearScriptV8/32/ClearScriptV8-32.vcxproj.filters
@@ -84,9 +84,6 @@
     <ClInclude Include="..\ManagedPlatform.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="resource.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Source Files">
diff --git a/ClearScript/V8/ClearScriptV8/32/Resource.rc b/ClearScript/V8/ClearScriptV8/32/Resource.rc
diff --git a/ClearScript/V8/ClearScriptV8/32/resource.h b/ClearScript/V8/ClearScriptV8/32/resource.h
diff --git a/ClearScript/V8/ClearScriptV8/64/ClearScriptV8-64.vcxproj b/ClearScript/V8/ClearScriptV8/64/ClearScriptV8-64.vcxproj
@@ -148,7 +148,6 @@
     <ClInclude Include="..\V8ObjectHolderImpl.h" />
     <ClInclude Include="..\V8ProxyImpl.h" />
     <ClInclude Include="..\V8Value.h" />
-    <ClInclude Include="resource.h" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="Resource.rc" />
diff --git a/ClearScript/V8/ClearScriptV8/64/ClearScriptV8-64.vcxproj.filters b/ClearScript/V8/ClearScriptV8/64/ClearScriptV8-64.vcxproj.filters
@@ -84,9 +84,6 @@
     <ClInclude Include="..\ManagedPlatform.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="resource.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Header Files">
diff --git a/ClearScript/V8/ClearScriptV8/64/Resource.rc b/ClearScript/V8/ClearScriptV8/64/Resource.rc
diff --git a/ClearScript/V8/ClearScriptV8/64/resource.h b/ClearScript/V8/ClearScriptV8/64/resource.h
diff --git a/ClearScript/V8/ClearScriptV8/Platform.h b/ClearScript/V8/ClearScriptV8/Platform.h
@@ -76,14 +76,6 @@
 #include <hash_map>
 using namespace std;
 
-//-----------------------------------------------------------------------------
-// ATL headers
-//-----------------------------------------------------------------------------
-
-#include <atlbase.h>
-#include <atlconv.h>
-using namespace ATL;
-
 //-----------------------------------------------------------------------------
 // global macros
 //-----------------------------------------------------------------------------
diff --git a/ClearScript/V8/ClearScriptV8/V8ContextImpl.cpp b/ClearScript/V8/ClearScriptV8/V8ContextImpl.cpp
@@ -236,7 +236,7 @@ V8ContextImpl::V8ContextImpl(LPCWSTR pName, bool enableDebugging, bool disableGl
         if (enableDebugging)
         {
             Debug::SetDebugMessageDispatchHandler(pDebugMessageDispatcher);
-            m_DebugAgentEnabled = Debug::EnableAgent(CW2A(pName), debugPort);
+            m_DebugAgentEnabled = Debug::EnableAgent(*String::Utf8Value(String::New(pName)), debugPort);
         }
 
     END_ISOLATE_SCOPE
diff --git 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 13624)
+--- tools/gyp/v8.gyp	(revision 13633)
 +++ tools/gyp/v8.gyp	(working copy)
 @@ -32,6 +32,7 @@
        'targets': [
diff --git a/ClearScript/VersionSymbols.h b/ClearScript/VersionSymbols.h
@@ -61,5 +61,5 @@
 
 
 
-#define CLEARSCRIPT_VERSION_STRING "5.0.2.0"
-#define CLEARSCRIPT_VERSION_COMMA_SEPARATED 5,0,2,0
+#define CLEARSCRIPT_VERSION_STRING "5.0.3.0"
+#define CLEARSCRIPT_VERSION_COMMA_SEPARATED 5,0,3,0
diff --git a/ClearScript/Windows/ActiveXDebugging.cs b/ClearScript/Windows/ActiveXDebugging.cs
@@ -262,6 +262,17 @@ [Out] [MarshalAs(UnmanagedType.Bool)] out bool callOnScriptErrorWhenContinuing
         );
     }
 
+    [ComImport]
+    [Guid("bb722ccb-6ad2-41c6-b780-af9c03ee69f5")]
+    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+    internal interface IActiveScriptSiteDebugEx
+    {
+        void OnCanNotJITScriptErrorDebug(
+            [In] [MarshalAs(UnmanagedType.Interface)] IActiveScriptErrorDebug errorDebug,
+            [Out] [MarshalAs(UnmanagedType.Bool)] out bool callOnScriptErrorWhenContinuing
+        );
+    }
+
     [ComImport]
     [Guid("51973c2f-cb0c-11d0-b5c9-00a0244a0e7a")]
     [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
diff --git a/ClearScript/Windows/WindowsScriptEngine.Site.cs b/ClearScript/Windows/WindowsScriptEngine.Site.cs
@@ -72,7 +72,7 @@ public abstract partial class WindowsScriptEngine
     {
         #region Nested type: ScriptSite
 
-        private class ScriptSite : IActiveScriptSite, IActiveScriptSiteInterruptPoll, IActiveScriptSiteDebug32, IActiveScriptSiteDebug64, ICustomQueryInterface
+        private class ScriptSite : IActiveScriptSite, IActiveScriptSiteInterruptPoll, IActiveScriptSiteDebug32, IActiveScriptSiteDebug64, IActiveScriptSiteDebugEx, ICustomQueryInterface
         {
             private readonly WindowsScriptEngine engine;
 
@@ -228,12 +228,22 @@ public void GetApplication(out IDebugApplication64 application)
 
             #endregion
 
+            #region IActiveScriptSiteDebugEx implementation
+
+            public void OnCanNotJITScriptErrorDebug(IActiveScriptErrorDebug errorDebug, out bool callOnScriptErrorWhenContinuing)
+            {
+                bool enterDebugger;
+                OnScriptErrorDebug(errorDebug, out enterDebugger, out callOnScriptErrorWhenContinuing);
+            }
+
+            #endregion
+
             #region ICustomQueryInterface implementation
 
             public CustomQueryInterfaceResult GetInterface(ref Guid iid, out IntPtr pInterface)
             {
                 pInterface = IntPtr.Zero;
-                if ((iid == typeof(IActiveScriptSiteDebug32).GUID) || (iid == typeof(IActiveScriptSiteDebug64).GUID))
+                if ((iid == typeof(IActiveScriptSiteDebug32).GUID) || (iid == typeof(IActiveScriptSiteDebug64).GUID) || (iid == typeof(IActiveScriptSiteDebugEx).GUID))
                 {
                     var debuggingEnabled = engine.engineFlags.HasFlag(WindowsScriptEngineFlags.EnableDebugging);
                     return debuggingEnabled ? CustomQueryInterfaceResult.NotHandled : CustomQueryInterfaceResult.Failed;
diff --git a/ClearScriptBenchmarks/Properties/AssemblyInfo.cs b/ClearScriptBenchmarks/Properties/AssemblyInfo.cs
@@ -69,5 +69,5 @@
 [assembly: AssemblyCopyright("© Microsoft Corporation")]
 
 [assembly: ComVisible(false)]
-[assembly: AssemblyVersion("5.0.2.0")]
-[assembly: AssemblyFileVersion("5.0.2.0")]
+[assembly: AssemblyVersion("5.0.3.0")]
+[assembly: AssemblyFileVersion("5.0.3.0")]
diff --git a/ClearScriptConsole/Properties/AssemblyInfo.cs b/ClearScriptConsole/Properties/AssemblyInfo.cs
@@ -69,5 +69,5 @@
 [assembly: AssemblyCopyright("© Microsoft Corporation")]
 
 [assembly: ComVisible(false)]
-[assembly: AssemblyVersion("5.0.2.0")]
-[assembly: AssemblyFileVersion("5.0.2.0")]
+[assembly: AssemblyVersion("5.0.3.0")]
+[assembly: AssemblyFileVersion("5.0.3.0")]
diff --git a/ClearScriptTest/Properties/AssemblyInfo.cs b/ClearScriptTest/Properties/AssemblyInfo.cs
@@ -69,5 +69,5 @@
 [assembly: AssemblyCopyright("© Microsoft Corporation")]
 
 [assembly: ComVisible(false)]
-[assembly: AssemblyVersion("5.0.2.0")]
-[assembly: AssemblyFileVersion("5.0.2.0")]
+[assembly: AssemblyVersion("5.0.3.0")]
+[assembly: AssemblyFileVersion("5.0.3.0")]
diff --git a/V8Update.cmd b/V8Update.cmd
@@ -67,7 +67,7 @@ if errorlevel 1 goto Error1
 cd v8-ia32
 third_party\python_26\python build\gyp_v8 -Dtarget_arch=ia32 -Dcomponent=shared_library -Dv8_use_snapshot=false >gyp.log
 if errorlevel 1 goto Error2
-devenv /build "%mode%|Win32" tools\gyp\v8.sln >build.log
+msbuild /p:Configuration=%mode% /p:Platform=Win32 tools\gyp\v8.sln >build.log
 if errorlevel 1 goto Error2
 cd ..
 
@@ -79,7 +79,7 @@ if errorlevel 1 goto Error1
 cd v8-x64
 third_party\python_26\python build\gyp_v8 -Dtarget_arch=x64 -Dcomponent=shared_library -Dv8_use_snapshot=false >gyp.log
 if errorlevel 1 goto Error2
-devenv /build "%mode%|x64" tools\gyp\v8.sln >build.log
+msbuild /p:Configuration=%mode% /p:Platform=x64 tools\gyp\v8.sln >build.log
 if errorlevel 1 goto Error2
 cd ..\..
 
diff --git a/Version.tt b/Version.tt
@@ -1 +1 @@
-<# var version = new Version(5, 0, 2, 0); #>
+<# var version = new Version(5, 0, 3, 0); #>
