FS-11065: [Build-System, mod_v8] Update libv8 to 6.1.298 on windows, speedup windows...

diff --git a/Freeswitch.2015.sln b/Freeswitch.2015.sln
index 580be3cd79260cf206e5b2a84bd6e1ea57fb69e2..64ec54f3d05414a270890d2905dd959358753f83 100644 (file)
--- a/Freeswitch.2015.sln
+++ b/Freeswitch.2015.sln
@@ -562,8 +562,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcbt", "libs\win32\libcbt
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_cielab_luts", "libs\spandsp\src\msvc\make_cielab_luts.2015.vcxproj", "{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}"\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libv8", "libs\win32\v8\libv8.2015.vcxproj", "{AB03E82B-48B1-4374-B32A-A1AF83DDC6C2}"\r
-EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download OPUS", "libs\win32\Download OPUS.2015.vcxproj", "{092124C9-09ED-43C7-BD6D-4AE5D6B3C547}"\r
 EndProject\r
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "opus", "opus", "{ED2CA8B5-8E91-4296-A120-02BB0B674652}"\r
@@ -2535,17 +2533,6 @@ Global
                {85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Release|Win32.Build.0 = All|Win32\r
                {85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Release|x64.ActiveCfg = All|Win32\r
                {85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Release|x64.Build.0 = All|Win32\r
-               {AB03E82B-48B1-4374-B32A-A1AF83DDC6C2}.All|Win32.ActiveCfg = Debug|x64\r
-               {AB03E82B-48B1-4374-B32A-A1AF83DDC6C2}.All|x64.ActiveCfg = Debug|x64\r
-               {AB03E82B-48B1-4374-B32A-A1AF83DDC6C2}.All|x64.Build.0 = Debug|x64\r
-               {AB03E82B-48B1-4374-B32A-A1AF83DDC6C2}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {AB03E82B-48B1-4374-B32A-A1AF83DDC6C2}.Debug|Win32.Build.0 = Debug|Win32\r
-               {AB03E82B-48B1-4374-B32A-A1AF83DDC6C2}.Debug|x64.ActiveCfg = Debug|x64\r
-               {AB03E82B-48B1-4374-B32A-A1AF83DDC6C2}.Debug|x64.Build.0 = Debug|x64\r
-               {AB03E82B-48B1-4374-B32A-A1AF83DDC6C2}.Release|Win32.ActiveCfg = Release|Win32\r
-               {AB03E82B-48B1-4374-B32A-A1AF83DDC6C2}.Release|Win32.Build.0 = Release|Win32\r
-               {AB03E82B-48B1-4374-B32A-A1AF83DDC6C2}.Release|x64.ActiveCfg = Release|x64\r
-               {AB03E82B-48B1-4374-B32A-A1AF83DDC6C2}.Release|x64.Build.0 = Release|x64\r
                {092124C9-09ED-43C7-BD6D-4AE5D6B3C547}.All|Win32.ActiveCfg = Release|Win32\r
                {092124C9-09ED-43C7-BD6D-4AE5D6B3C547}.All|Win32.Build.0 = Release|Win32\r
                {092124C9-09ED-43C7-BD6D-4AE5D6B3C547}.All|x64.ActiveCfg = Release|Win32\r
@@ -3208,7 +3195,6 @@ Global
                {2386B892-35F5-46CF-A0F0-10394D2FBF9B} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}\r
                {77BC1DD2-C9A1-44D7-BFFA-1320370CACB9} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}\r
                {85F0CF8C-C7AB-48F6-BA19-CC94CF87F981} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}\r
-               {AB03E82B-48B1-4374-B32A-A1AF83DDC6C2} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}\r
                {092124C9-09ED-43C7-BD6D-4AE5D6B3C547} = {C120A020-773F-4EA3-923F-B67AF28B750D}\r
                {ED2CA8B5-8E91-4296-A120-02BB0B674652} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}\r
                {FD60942F-72D6-4CA1-8B57-EA1D1B95A89E} = {ED2CA8B5-8E91-4296-A120-02BB0B674652}\r

diff --git a/libs/.gitignore b/libs/.gitignore
index a567a236730ee985f5faaa4bf77aafe31f8d305b..8862900d896c6488e10392b34a96646f1f4f3d02 100644 (file)
--- a/libs/.gitignore
+++ b/libs/.gitignore
@@ -794,6 +794,7 @@ opal
 /zeromq-*/
 /jpeg-8d/
 /v8-*/
+/v8-*.zip
 
 # build products we should remove
 !/apr-util/xml/expat/conftools/config.guess

diff --git a/libs/win32/v8/build-v8.bat b/libs/win32/v8/build-v8.bat
deleted file mode 100644 (file)
index 24268ba..0000000
--- a/libs/win32/v8/build-v8.bat
+++ /dev/null
@@ -1,127 +0,0 @@
-@ECHO OFF\r
-\r
-REM First argument is the target architecture\r
-REM Second argument is "Debug" or "Release" mode\r
-REM Third argument is the V8 root directory path\r
-REM Fourth argument is the version of Visual Studio (optional)\r
-\r
-IF "%1" == "" GOTO Fail\r
-IF "%2" == "" GOTO Fail\r
-IF "%3" == "" GOTO Fail\r
-\r
-REM Go into the V8 lib directory\r
-cd "%3"\r
-\r
-REM Check the last build info, so we know if we're supposed to build again or not\r
-SET /P LAST_BUILD_INFO=<last_build\r
-IF "%1-%2" == "%LAST_BUILD_INFO%" (\r
-       IF EXIST ".\build\%2\v8.dll" (\r
-               ECHO V8 is already built!\r
-               SET COPY_FILES_ONLY=1\r
-       )\r
-)\r
-\r
-SET LIB_DEST_DIR=\r
-SET DEPOT_TOOLS_WIN_TOOLCHAIN=0\r
-SET GYP_GENERATORS=msvs\r
-REM Bake snapshot blobs (natives_blob.bin and snapshot_blob.bin) into the library\r
-SET GYPFLAGS="-Dv8_use_external_startup_data=0"\r
-\r
-CALL .\third_party\python_26\setup_env.bat\r
-\r
-SET GYP_MSVS_VERSION=2015\r
-\r
-IF "%VisualStudioVersion%" == "11.0" (\r
-       REM SET VS_VERSION=-Gmsvs_version=2012\r
-        SET GYP_MSVS_VERSION=2012\r
-       ECHO Forcing build to use Visual Studio 2012\r
-) ELSE IF "%VisualStudioVersion%" == "12.0" (\r
-       REM SET VS_VERSION=-Gmsvs_version=2013\r
-        SET GYP_MSVS_VERSION=2013\r
-       ECHO Forcing build to use Visual Studio 2013\r
-) ELSE IF "%VisualStudioVersion%" == "14.0" (\r
-       REM SET VS_VERSION=-Gmsvs_version=2015\r
-        SET GYP_MSVS_VERSION=2015\r
-       ECHO Forcing build to use Visual Studio 2015\r
-) ELSE IF NOT "%4" == "" (\r
-       REM SET VS_VERSION=-Gmsvs_version=%4\r
-        SET GYP_MSVS_VERSION=%4\r
-       ECHO Forcing build to use Visual Studio %4\r
-)\r
-\r
-IF "%1" == "x64" (\r
-       REM If this is a 32-bit system (but we target x64), we must disable the snapshot feature to get it to build.\r
-       IF NOT EXIST "%PROGRAMFILES(X86)%" (\r
-               SET SKIP_V8_SNAPSHOT=-Dv8_use_snapshot=false\r
-       )\r
-)\r
-\r
-IF "%1" == "x64" (\r
-       IF NOT "%SKIP_V8_SNAPSHOT%" == "" ECHO Targeting x64 platform on a x86 system, disabling V8 snapshout feature to make this work [%SKIP_V8_SNAPSHOT%]\r
-       REM IF NOT "%COPY_FILES_ONLY%" == "1" .\third_party\python_26\python.exe build\gyp_v8 -Dtarget_arch=x64 -Dcomponent=shared_library %SKIP_V8_SNAPSHOT% %VS_VERSION%\r
-       IF NOT "%COPY_FILES_ONLY%" == "1" .\third_party\python_26\python.exe gypfiles\gyp_v8 -Dtarget_arch=x64 -Dcomponent=shared_library %GYPFLAGS%\r
-       IF ERRORLEVEL 1 GOTO Fail\r
-       SET LIB_DEST_DIR=..\..\x64\%2\\r
-)\r
-\r
-IF "%1" == "x86" (\r
-       REM IF NOT "%COPY_FILES_ONLY%" == "1" .\third_party\python_26\python.exe build\gyp_v8 -Dcomponent=shared_library %VS_VERSION%\r
-       IF NOT "%COPY_FILES_ONLY%" == "1" .\third_party\python_26\python.exe gypfiles\gyp_v8 -Dcomponent=shared_library %GYPFLAGS%\r
-       IF ERRORLEVEL 1 GOTO Fail\r
-       SET LIB_DEST_DIR=..\..\Win32\%2\\r
-)\r
-\r
-IF "%LIB_DEST_DIR%" == "" GOTO Fail\r
-\r
-IF "%COPY_FILES_ONLY%" == "1" GOTO CopyFiles\r
-\r
-REM Clean build before we continue\r
-REM First try to clean using the solution path (works for most VS versions)\r
-REM msbuild "tools\gyp\v8.sln" /t:"_tools_\_gyp_\v8:Clean" /p:Configuration=%2 /clp:WarningsOnly\r
-msbuild "src\v8.sln" /t:"_src_\v8:Clean" /p:Configuration=%2 /clp:WarningsOnly\r
-IF NOT ERRORLEVEL 1 GOTO CleanDone\r
-REM If clean using solution path didn't work, try to build without the path (works for some VS versions...)\r
-REM msbuild "tools\gyp\v8.sln" /t:v8:Clean /p:Configuration=%2\r
-msbuild "src\v8.sln" /t:v8:Clean /p:Configuration=%2\r
-IF ERRORLEVEL 1 GOTO Fail\r
-:CleanDone\r
-\r
-REM Just to make sure that everything is cleaned up\r
-rmdir /S /Q .\build\%2\r
-\r
-REM Build the V8 library\r
-REM First try to build using the solution path (works for most VS versions)\r
-REM msbuild "tools\gyp\v8.sln" /t:"_tools_\_gyp_\v8:Rebuild" /p:Configuration=%2 /clp:WarningsOnly\r
-REM msbuild "src\v8.sln" /t:"_src_\v8_libpaltfrom:Rebuild" /p:Configuration=%2 /clp:WarningsOnly\r
-msbuild "src\v8.sln" /t:"_src_\v8:Rebuild" /p:Configuration=%2 /clp:WarningsOnly\r
-IF NOT ERRORLEVEL 1 GOTO CopyFiles\r
-REM If build using solution path didn't work, try to build without the path (works for some VS versions...)\r
-REM msbuild "tools\gyp\v8.sln" /t:v8:Rebuild /p:Configuration=%2\r
-msbuild "src\v8.sln" /t:v8:Rebuild /p:Configuration=%2\r
-IF ERRORLEVEL 1 GOTO Fail\r
-\r
-:CopyFiles\r
-\r
-xcopy /C /F /R /Y .\build\%2\icui18n.dll %LIB_DEST_DIR%\r
-IF ERRORLEVEL 1 GOTO Fail\r
-\r
-xcopy /C /F /R /Y .\build\%2\icuuc.dll %LIB_DEST_DIR%\r
-IF ERRORLEVEL 1 GOTO Fail\r
-\r
-xcopy /C /F /R /Y .\build\%2\v8.dll %LIB_DEST_DIR%\r
-IF ERRORLEVEL 1 GOTO Fail\r
-\r
-xcopy /C /F /R /Y .\build\%2\v8_libplatform.dll %LIB_DEST_DIR%\r
-IF ERRORLEVEL 1 GOTO Fail\r
-\r
-xcopy /C /F /R /Y .\build\%2\v8_libbase.dll %LIB_DEST_DIR%\r
-IF ERRORLEVEL 1 GOTO Fail\r
-\r
-ECHO %1-%2> last_build\r
-\r
-exit /b 0\r
-\r
-:Fail\r
-REM Delete the last_build info if this build failed!\r
-@del /Q last_build\r
-exit /b 1\r

diff --git a/libs/win32/v8/libv8.2015.vcxproj b/libs/win32/v8/libv8.2015.vcxproj
deleted file mode 100644 (file)
index 7d9848b..0000000
--- a/libs/win32/v8/libv8.2015.vcxproj
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <ItemGroup Label="ProjectConfigurations">\r
-    <ProjectConfiguration Include="Debug|Win32">\r
-      <Configuration>Debug</Configuration>\r
-      <Platform>Win32</Platform>\r
-    </ProjectConfiguration>\r
-    <ProjectConfiguration Include="Debug|x64">\r
-      <Configuration>Debug</Configuration>\r
-      <Platform>x64</Platform>\r
-    </ProjectConfiguration>\r
-    <ProjectConfiguration Include="Release|Win32">\r
-      <Configuration>Release</Configuration>\r
-      <Platform>Win32</Platform>\r
-    </ProjectConfiguration>\r
-    <ProjectConfiguration Include="Release|x64">\r
-      <Configuration>Release</Configuration>\r
-      <Platform>x64</Platform>\r
-    </ProjectConfiguration>\r
-  </ItemGroup>\r
-  <PropertyGroup Label="Globals">\r
-    <ProjectName>libv8</ProjectName>\r
-    <ProjectGuid>{AB03E82B-48B1-4374-B32A-A1AF83DDC6C2}</ProjectGuid>\r
-    <RootNamespace>libv8</RootNamespace>\r
-    <Keyword>Win32Proj</Keyword>\r
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>\r
-  </PropertyGroup>\r
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
-    <ConfigurationType>Utility</ConfigurationType>\r
-    <CharacterSet>NotSet</CharacterSet>\r
-    <PlatformToolset>v140</PlatformToolset>\r
-    <CLRSupport>false</CLRSupport>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">\r
-    <ConfigurationType>Utility</ConfigurationType>\r
-    <CharacterSet>NotSet</CharacterSet>\r
-    <PlatformToolset>v140</PlatformToolset>\r
-    <CLRSupport>false</CLRSupport>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">\r
-    <ConfigurationType>Utility</ConfigurationType>\r
-    <CharacterSet>NotSet</CharacterSet>\r
-    <PlatformToolset>v140</PlatformToolset>\r
-    <CLRSupport>false</CLRSupport>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">\r
-    <ConfigurationType>Utility</ConfigurationType>\r
-    <CharacterSet>NotSet</CharacterSet>\r
-    <PlatformToolset>v140</PlatformToolset>\r
-    <CLRSupport>false</CLRSupport>\r
-  </PropertyGroup>\r
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
-  <Import Project="$(SolutionDir)\w32\v8.props" />\r
-  <Import Project="$(SolutionDir)\w32\extdll.props" />\r
-  <ImportGroup Label="ExtensionSettings">\r
-  </ImportGroup>\r
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">\r
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-  </ImportGroup>\r
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">\r
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-  </ImportGroup>\r
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">\r
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-  </ImportGroup>\r
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">\r
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-  </ImportGroup>\r
-  <PropertyGroup Label="UserMacros" />\r
-  <PropertyGroup>\r
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(PlatformName)\V8\$(Configuration)\</IntDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(PlatformName)\V8\$(Configuration)\</IntDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(PlatformName)\V8\$(Configuration)\</IntDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(PlatformName)\V8\$(Configuration)\</IntDir>\r
-  </PropertyGroup>\r
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
-    <BuildLog>\r
-      <Path>$(IntDir)BuildLog $(ProjectName).htm</Path>\r
-    </BuildLog>\r
-    <PreBuildEvent>\r
-      <Command>\r
-      </Command>\r
-    </PreBuildEvent>\r
-  </ItemDefinitionGroup>\r
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
-    <Midl>\r
-      <TargetEnvironment>X64</TargetEnvironment>\r
-    </Midl>\r
-    <BuildLog>\r
-      <Path>$(IntDir)BuildLog $(ProjectName).htm</Path>\r
-    </BuildLog>\r
-    <PreBuildEvent>\r
-      <Command>\r
-      </Command>\r
-    </PreBuildEvent>\r
-  </ItemDefinitionGroup>\r
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
-    <BuildLog>\r
-      <Path>$(IntDir)BuildLog $(ProjectName).htm</Path>\r
-    </BuildLog>\r
-    <PreBuildEvent>\r
-      <Command>\r
-      </Command>\r
-    </PreBuildEvent>\r
-  </ItemDefinitionGroup>\r
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
-    <Midl>\r
-      <TargetEnvironment>X64</TargetEnvironment>\r
-    </Midl>\r
-    <BuildLog>\r
-      <Path>$(IntDir)BuildLog $(ProjectName).htm</Path>\r
-    </BuildLog>\r
-    <PreBuildEvent>\r
-      <Command>\r
-      </Command>\r
-    </PreBuildEvent>\r
-  </ItemDefinitionGroup>\r
-  <ItemGroup>\r
-    <CustomBuild Include="cleancount">\r
-      <FileType>Document</FileType>\r
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Building Google V8</Message>\r
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)build-v8.bat x86 Release "$(ProjectDir)..\..\v8-$(V8Version)"\r
-</Command>\r
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)..\..\v8-$(V8Version);%(Outputs)</Outputs>\r
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Building Google V8</Message>\r
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)build-v8.bat x86 Debug "$(ProjectDir)..\..\v8-$(V8Version)"\r
-</Command>\r
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\..\v8-$(V8Version);%(Outputs)</Outputs>\r
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Building Google V8</Message>\r
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)build-v8.bat x64 Release "$(ProjectDir)..\..\v8-$(V8Version)"\r
-</Command>\r
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)..\..\v8-$(V8Version);%(Outputs)</Outputs>\r
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Building Google V8</Message>\r
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)build-v8.bat x64 Debug "$(ProjectDir)..\..\v8-$(V8Version)"\r
-</Command>\r
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)..\..\v8-$(V8Version);%(Outputs)</Outputs>\r
-    </CustomBuild>\r
-  </ItemGroup>\r
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
-  <ImportGroup Label="ExtensionTargets">\r
-  </ImportGroup>\r
-</Project>
\ No newline at end of file

diff --git a/src/mod/languages/mod_v8/mod_v8.2015.vcxproj b/src/mod/languages/mod_v8/mod_v8.2015.vcxproj
index dfdf26e0ec2d20ac080adc387b4924c6848ec01a..df75233dc62c603e408878c3fbe80f50fbc11632 100644 (file)
--- a/src/mod/languages/mod_v8/mod_v8.2015.vcxproj
+++ b/src/mod/languages/mod_v8/mod_v8.2015.vcxproj
@@ -210,10 +210,6 @@
     <ProjectReference Include="..\..\..\..\libs\libteletone\libteletone.2015.vcxproj">\r
       <Project>{89385c74-5860-4174-9caf-a39e7c48909c}</Project>\r
     </ProjectReference>\r
-    <ProjectReference Include="..\..\..\..\libs\win32\v8\libv8.2015.vcxproj">\r
-      <Project>{AB03E82B-48B1-4374-B32A-A1AF83DDC6C2}</Project>\r
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>\r
-    </ProjectReference>\r
     <ProjectReference Include="..\..\..\..\libs\win32\curl\curllib.2015.vcxproj">\r
       <Project>{87ee9da4-de1e-4448-8324-183c98dca588}</Project>\r
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>\r

diff --git a/src/mod/languages/mod_v8/mod_v8_skel.2015.vcxproj b/src/mod/languages/mod_v8/mod_v8_skel.2015.vcxproj
index fe03185da72e9ad13e941bbaba071e1d902c67a0..855c6b69d0a954b9dcf0d8088a5b797042456541 100644 (file)
--- a/src/mod/languages/mod_v8/mod_v8_skel.2015.vcxproj
+++ b/src/mod/languages/mod_v8/mod_v8_skel.2015.vcxproj
@@ -185,10 +185,6 @@
     <ClCompile Include="mod_v8_skel.cpp" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ProjectReference Include="..\..\..\..\libs\win32\v8\libv8.2015.vcxproj">\r
-      <Project>{AB03E82B-48B1-4374-B32A-A1AF83DDC6C2}</Project>\r
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>\r
-    </ProjectReference>\r
     <ProjectReference Include="..\..\..\..\libs\win32\curl\curllib.2015.vcxproj">\r
       <Project>{87ee9da4-de1e-4448-8324-183c98dca588}</Project>\r
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>\r

diff --git a/w32/v8-version.props b/w32/v8-version.props
index a0b442cd5bf2ade4ff22eda7e0b128f140fd2df8..f31874859dec32e753bdc1fefdec8864c46c7067 100644 (file)
--- a/w32/v8-version.props
+++ b/w32/v8-version.props
@@ -4,7 +4,7 @@
     <Import Project="basedir.props" Condition=" '$(BaseDirImported)' == ''"/>\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros">\r
-    <V8Version>5.6.326</V8Version>\r
+    <V8Version>6.1.298</V8Version>\r
   </PropertyGroup>\r
   <PropertyGroup>\r
     <V8VersionImported>true</V8VersionImported>\r

diff --git a/w32/v8.props b/w32/v8.props
index 58449a57c15d131bf87524bcda887e91d838c54b..c041e5b5f78485e1bbb2da423e23d3d2f0da05ce 100644 (file)
--- a/w32/v8.props
+++ b/w32/v8.props
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ImportGroup Label="PropertySheets">\r
-    <Import Project="curl.props" Condition=" '$(CurlPropsImported)' == '' "/>\r
     <Import Project="v8-version.props" Condition=" '$(V8VersionImported)' == '' "/>\r
     <Import Project="downloadpackage.task" Condition=" '$(downloadpackagetask_Imported)' == '' " />\r
   </ImportGroup>\r
@@ -30,26 +29,36 @@
        extractto: Folder to extract an archive to\r
    -->\r
 \r
-  <Target Name="v8libTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">  \r
+  <Target Name="v8BinariesDownloadTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">  \r
       <DownloadPackageTask \r
-           package="http://files.freeswitch.org/downloads/libs/v8-$(V8Version).tar.bz2"\r
-           expectfileordirectory="$(V8libDir)\include\v8.h" \r
+           package="http://files.freeswitch.org/windows/packages/v8/$(V8Version)/v8-$(V8Version)-binaries-$(Platform.ToLower())-$(Configuration.ToLower()).zip"\r
+           expectfileordirectory="$(V8libDir)\binaries\$(Platform)\$(Configuration)\v8.dll" \r
            outputfolder=""\r
            outputfilename="" \r
-           extractto="$(BaseDir)libs"\r
+           extractto="$(BaseDir)libs\"\r
       />\r
   </Target> \r
-\r
-  <Target Name="v8libwinTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">  \r
+  <Target Name="v8HeadersDownloadTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">  \r
       <DownloadPackageTask \r
-           package="http://files.freeswitch.org/downloads/libs/v8-$(V8Version)-win.tar.bz2"\r
-           expectfileordirectory="$(V8libDir)\third_party\cygwin" \r
+           package="http://files.freeswitch.org/windows/packages/v8/$(V8Version)/v8-$(V8Version)-headers.zip"\r
+           expectfileordirectory="$(V8libDir)\include\v8.h" \r
            outputfolder=""\r
            outputfilename="" \r
-           extractto="$(BaseDir)libs"\r
+           extractto="$(BaseDir)libs\"\r
       />\r
   </Target> \r
 \r
+  <Target Name="v8copyTarget" BeforeTargets="CustomBuild" DependsOnTargets="v8BinariesDownloadTarget">  \r
+        <Message Text="Copying v8 libraries to the freeswitch output folder." Importance="High" />\r
+        <ItemGroup>  \r
+             <v8Files Include="$(V8libDir)\binaries\$(Platform)\$(Configuration)\*.dll"/>  \r
+        </ItemGroup>  \r
+        <Copy Condition="!exists('$(BaseDir)\$(Platform)\$(Configuration)\v8.dll')"\r
+            SourceFiles="@(v8Files)"  \r
+            DestinationFiles="@(v8Files->'$(BaseDir)\$(Platform)\$(Configuration)\%(Filename)%(Extension)')"  \r
+        />  \r
+  </Target>   \r
+\r
   <ItemDefinitionGroup>\r
     <ClCompile>\r
       <WarningLevel>Level3</WarningLevel>\r
@@ -58,8 +67,8 @@
       <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
     </ClCompile>\r
     <Link>\r
-      <AdditionalLibraryDirectories>$(SolutionDir)libs\v8-$(V8Version)\build\$(Configuration)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
-      <AdditionalDependencies>icui18n.lib;icuuc.lib;v8.lib;v8_libplatform.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <AdditionalLibraryDirectories>$(SolutionDir)libs\v8-$(V8Version)\binaries\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalDependencies>v8.dll.lib;v8_libbase.dll.lib;v8_libplatform.dll.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
     </Link>\r
   </ItemDefinitionGroup>\r
 </Project>\r