FS-11065: [Build-System, mod_v8] Update libv8 to 6.1.298 on windows, speedup windows build by moving libv8 to pre-compiled binaries.
This commit is contained in:
Andrey Volk
Muteesa Fred
parent
73d616a318
commit
24ef5b2762
|
|
@ -562,8 +562,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcbt", "libs\win32\libcbt
|
||||||
EndProject
|
EndProject
|
||||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_cielab_luts", "libs\spandsp\src\msvc\make_cielab_luts.2015.vcxproj", "{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}"
|
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_cielab_luts", "libs\spandsp\src\msvc\make_cielab_luts.2015.vcxproj", "{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}"
|
||||||
EndProject
|
EndProject
|
||||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libv8", "libs\win32\v8\libv8.2015.vcxproj", "{AB03E82B-48B1-4374-B32A-A1AF83DDC6C2}"
|
|
||||||
EndProject
|
|
||||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download OPUS", "libs\win32\Download OPUS.2015.vcxproj", "{092124C9-09ED-43C7-BD6D-4AE5D6B3C547}"
|
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download OPUS", "libs\win32\Download OPUS.2015.vcxproj", "{092124C9-09ED-43C7-BD6D-4AE5D6B3C547}"
|
||||||
EndProject
|
EndProject
|
||||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "opus", "opus", "{ED2CA8B5-8E91-4296-A120-02BB0B674652}"
|
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "opus", "opus", "{ED2CA8B5-8E91-4296-A120-02BB0B674652}"
|
||||||
|
|
@ -2535,17 +2533,6 @@ Global
|
||||||
{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Release|Win32.Build.0 = All|Win32
|
{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Release|Win32.Build.0 = All|Win32
|
||||||
{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Release|x64.ActiveCfg = All|Win32
|
{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Release|x64.ActiveCfg = All|Win32
|
||||||
{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Release|x64.Build.0 = All|Win32
|
{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}.Release|x64.Build.0 = All|Win32
|
||||||
{AB03E82B-48B1-4374-B32A-A1AF83DDC6C2}.All|Win32.ActiveCfg = Debug|x64
|
|
||||||
{AB03E82B-48B1-4374-B32A-A1AF83DDC6C2}.All|x64.ActiveCfg = Debug|x64
|
|
||||||
{AB03E82B-48B1-4374-B32A-A1AF83DDC6C2}.All|x64.Build.0 = Debug|x64
|
|
||||||
{AB03E82B-48B1-4374-B32A-A1AF83DDC6C2}.Debug|Win32.ActiveCfg = Debug|Win32
|
|
||||||
{AB03E82B-48B1-4374-B32A-A1AF83DDC6C2}.Debug|Win32.Build.0 = Debug|Win32
|
|
||||||
{AB03E82B-48B1-4374-B32A-A1AF83DDC6C2}.Debug|x64.ActiveCfg = Debug|x64
|
|
||||||
{AB03E82B-48B1-4374-B32A-A1AF83DDC6C2}.Debug|x64.Build.0 = Debug|x64
|
|
||||||
{AB03E82B-48B1-4374-B32A-A1AF83DDC6C2}.Release|Win32.ActiveCfg = Release|Win32
|
|
||||||
{AB03E82B-48B1-4374-B32A-A1AF83DDC6C2}.Release|Win32.Build.0 = Release|Win32
|
|
||||||
{AB03E82B-48B1-4374-B32A-A1AF83DDC6C2}.Release|x64.ActiveCfg = Release|x64
|
|
||||||
{AB03E82B-48B1-4374-B32A-A1AF83DDC6C2}.Release|x64.Build.0 = Release|x64
|
|
||||||
{092124C9-09ED-43C7-BD6D-4AE5D6B3C547}.All|Win32.ActiveCfg = Release|Win32
|
{092124C9-09ED-43C7-BD6D-4AE5D6B3C547}.All|Win32.ActiveCfg = Release|Win32
|
||||||
{092124C9-09ED-43C7-BD6D-4AE5D6B3C547}.All|Win32.Build.0 = Release|Win32
|
{092124C9-09ED-43C7-BD6D-4AE5D6B3C547}.All|Win32.Build.0 = Release|Win32
|
||||||
{092124C9-09ED-43C7-BD6D-4AE5D6B3C547}.All|x64.ActiveCfg = Release|Win32
|
{092124C9-09ED-43C7-BD6D-4AE5D6B3C547}.All|x64.ActiveCfg = Release|Win32
|
||||||
|
|
@ -3208,7 +3195,6 @@ Global
|
||||||
{2386B892-35F5-46CF-A0F0-10394D2FBF9B} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
|
{2386B892-35F5-46CF-A0F0-10394D2FBF9B} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
|
||||||
{77BC1DD2-C9A1-44D7-BFFA-1320370CACB9} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
|
{77BC1DD2-C9A1-44D7-BFFA-1320370CACB9} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
|
||||||
{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
|
{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
|
||||||
{AB03E82B-48B1-4374-B32A-A1AF83DDC6C2} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
|
|
||||||
{092124C9-09ED-43C7-BD6D-4AE5D6B3C547} = {C120A020-773F-4EA3-923F-B67AF28B750D}
|
{092124C9-09ED-43C7-BD6D-4AE5D6B3C547} = {C120A020-773F-4EA3-923F-B67AF28B750D}
|
||||||
{ED2CA8B5-8E91-4296-A120-02BB0B674652} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
|
{ED2CA8B5-8E91-4296-A120-02BB0B674652} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
|
||||||
{FD60942F-72D6-4CA1-8B57-EA1D1B95A89E} = {ED2CA8B5-8E91-4296-A120-02BB0B674652}
|
{FD60942F-72D6-4CA1-8B57-EA1D1B95A89E} = {ED2CA8B5-8E91-4296-A120-02BB0B674652}
|
||||||
|
|
|
||||||
|
|
@ -794,6 +794,7 @@ opal
|
||||||
/zeromq-*/
|
/zeromq-*/
|
||||||
/jpeg-8d/
|
/jpeg-8d/
|
||||||
/v8-*/
|
/v8-*/
|
||||||
|
/v8-*.zip
|
||||||
|
|
||||||
# build products we should remove
|
# build products we should remove
|
||||||
!/apr-util/xml/expat/conftools/config.guess
|
!/apr-util/xml/expat/conftools/config.guess
|
||||||
|
|
|
||||||
|
|
@ -1,127 +0,0 @@
|
||||||
@ECHO OFF
|
|
||||||
|
|
||||||
REM First argument is the target architecture
|
|
||||||
REM Second argument is "Debug" or "Release" mode
|
|
||||||
REM Third argument is the V8 root directory path
|
|
||||||
REM Fourth argument is the version of Visual Studio (optional)
|
|
||||||
|
|
||||||
IF "%1" == "" GOTO Fail
|
|
||||||
IF "%2" == "" GOTO Fail
|
|
||||||
IF "%3" == "" GOTO Fail
|
|
||||||
|
|
||||||
REM Go into the V8 lib directory
|
|
||||||
cd "%3"
|
|
||||||
|
|
||||||
REM Check the last build info, so we know if we're supposed to build again or not
|
|
||||||
SET /P LAST_BUILD_INFO=<last_build
|
|
||||||
IF "%1-%2" == "%LAST_BUILD_INFO%" (
|
|
||||||
IF EXIST ".\build\%2\v8.dll" (
|
|
||||||
ECHO V8 is already built!
|
|
||||||
SET COPY_FILES_ONLY=1
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
SET LIB_DEST_DIR=
|
|
||||||
SET DEPOT_TOOLS_WIN_TOOLCHAIN=0
|
|
||||||
SET GYP_GENERATORS=msvs
|
|
||||||
REM Bake snapshot blobs (natives_blob.bin and snapshot_blob.bin) into the library
|
|
||||||
SET GYPFLAGS="-Dv8_use_external_startup_data=0"
|
|
||||||
|
|
||||||
CALL .\third_party\python_26\setup_env.bat
|
|
||||||
|
|
||||||
SET GYP_MSVS_VERSION=2015
|
|
||||||
|
|
||||||
IF "%VisualStudioVersion%" == "11.0" (
|
|
||||||
REM SET VS_VERSION=-Gmsvs_version=2012
|
|
||||||
SET GYP_MSVS_VERSION=2012
|
|
||||||
ECHO Forcing build to use Visual Studio 2012
|
|
||||||
) ELSE IF "%VisualStudioVersion%" == "12.0" (
|
|
||||||
REM SET VS_VERSION=-Gmsvs_version=2013
|
|
||||||
SET GYP_MSVS_VERSION=2013
|
|
||||||
ECHO Forcing build to use Visual Studio 2013
|
|
||||||
) ELSE IF "%VisualStudioVersion%" == "14.0" (
|
|
||||||
REM SET VS_VERSION=-Gmsvs_version=2015
|
|
||||||
SET GYP_MSVS_VERSION=2015
|
|
||||||
ECHO Forcing build to use Visual Studio 2015
|
|
||||||
) ELSE IF NOT "%4" == "" (
|
|
||||||
REM SET VS_VERSION=-Gmsvs_version=%4
|
|
||||||
SET GYP_MSVS_VERSION=%4
|
|
||||||
ECHO Forcing build to use Visual Studio %4
|
|
||||||
)
|
|
||||||
|
|
||||||
IF "%1" == "x64" (
|
|
||||||
REM If this is a 32-bit system (but we target x64), we must disable the snapshot feature to get it to build.
|
|
||||||
IF NOT EXIST "%PROGRAMFILES(X86)%" (
|
|
||||||
SET SKIP_V8_SNAPSHOT=-Dv8_use_snapshot=false
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
IF "%1" == "x64" (
|
|
||||||
IF NOT "%SKIP_V8_SNAPSHOT%" == "" ECHO Targeting x64 platform on a x86 system, disabling V8 snapshout feature to make this work [%SKIP_V8_SNAPSHOT%]
|
|
||||||
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%
|
|
||||||
IF NOT "%COPY_FILES_ONLY%" == "1" .\third_party\python_26\python.exe gypfiles\gyp_v8 -Dtarget_arch=x64 -Dcomponent=shared_library %GYPFLAGS%
|
|
||||||
IF ERRORLEVEL 1 GOTO Fail
|
|
||||||
SET LIB_DEST_DIR=..\..\x64\%2\
|
|
||||||
)
|
|
||||||
|
|
||||||
IF "%1" == "x86" (
|
|
||||||
REM IF NOT "%COPY_FILES_ONLY%" == "1" .\third_party\python_26\python.exe build\gyp_v8 -Dcomponent=shared_library %VS_VERSION%
|
|
||||||
IF NOT "%COPY_FILES_ONLY%" == "1" .\third_party\python_26\python.exe gypfiles\gyp_v8 -Dcomponent=shared_library %GYPFLAGS%
|
|
||||||
IF ERRORLEVEL 1 GOTO Fail
|
|
||||||
SET LIB_DEST_DIR=..\..\Win32\%2\
|
|
||||||
)
|
|
||||||
|
|
||||||
IF "%LIB_DEST_DIR%" == "" GOTO Fail
|
|
||||||
|
|
||||||
IF "%COPY_FILES_ONLY%" == "1" GOTO CopyFiles
|
|
||||||
|
|
||||||
REM Clean build before we continue
|
|
||||||
REM First try to clean using the solution path (works for most VS versions)
|
|
||||||
REM msbuild "tools\gyp\v8.sln" /t:"_tools_\_gyp_\v8:Clean" /p:Configuration=%2 /clp:WarningsOnly
|
|
||||||
msbuild "src\v8.sln" /t:"_src_\v8:Clean" /p:Configuration=%2 /clp:WarningsOnly
|
|
||||||
IF NOT ERRORLEVEL 1 GOTO CleanDone
|
|
||||||
REM If clean using solution path didn't work, try to build without the path (works for some VS versions...)
|
|
||||||
REM msbuild "tools\gyp\v8.sln" /t:v8:Clean /p:Configuration=%2
|
|
||||||
msbuild "src\v8.sln" /t:v8:Clean /p:Configuration=%2
|
|
||||||
IF ERRORLEVEL 1 GOTO Fail
|
|
||||||
:CleanDone
|
|
||||||
|
|
||||||
REM Just to make sure that everything is cleaned up
|
|
||||||
rmdir /S /Q .\build\%2
|
|
||||||
|
|
||||||
REM Build the V8 library
|
|
||||||
REM First try to build using the solution path (works for most VS versions)
|
|
||||||
REM msbuild "tools\gyp\v8.sln" /t:"_tools_\_gyp_\v8:Rebuild" /p:Configuration=%2 /clp:WarningsOnly
|
|
||||||
REM msbuild "src\v8.sln" /t:"_src_\v8_libpaltfrom:Rebuild" /p:Configuration=%2 /clp:WarningsOnly
|
|
||||||
msbuild "src\v8.sln" /t:"_src_\v8:Rebuild" /p:Configuration=%2 /clp:WarningsOnly
|
|
||||||
IF NOT ERRORLEVEL 1 GOTO CopyFiles
|
|
||||||
REM If build using solution path didn't work, try to build without the path (works for some VS versions...)
|
|
||||||
REM msbuild "tools\gyp\v8.sln" /t:v8:Rebuild /p:Configuration=%2
|
|
||||||
msbuild "src\v8.sln" /t:v8:Rebuild /p:Configuration=%2
|
|
||||||
IF ERRORLEVEL 1 GOTO Fail
|
|
||||||
|
|
||||||
:CopyFiles
|
|
||||||
|
|
||||||
xcopy /C /F /R /Y .\build\%2\icui18n.dll %LIB_DEST_DIR%
|
|
||||||
IF ERRORLEVEL 1 GOTO Fail
|
|
||||||
|
|
||||||
xcopy /C /F /R /Y .\build\%2\icuuc.dll %LIB_DEST_DIR%
|
|
||||||
IF ERRORLEVEL 1 GOTO Fail
|
|
||||||
|
|
||||||
xcopy /C /F /R /Y .\build\%2\v8.dll %LIB_DEST_DIR%
|
|
||||||
IF ERRORLEVEL 1 GOTO Fail
|
|
||||||
|
|
||||||
xcopy /C /F /R /Y .\build\%2\v8_libplatform.dll %LIB_DEST_DIR%
|
|
||||||
IF ERRORLEVEL 1 GOTO Fail
|
|
||||||
|
|
||||||
xcopy /C /F /R /Y .\build\%2\v8_libbase.dll %LIB_DEST_DIR%
|
|
||||||
IF ERRORLEVEL 1 GOTO Fail
|
|
||||||
|
|
||||||
ECHO %1-%2> last_build
|
|
||||||
|
|
||||||
exit /b 0
|
|
||||||
|
|
||||||
:Fail
|
|
||||||
REM Delete the last_build info if this build failed!
|
|
||||||
@del /Q last_build
|
|
||||||
exit /b 1
|
|
||||||
|
|
@ -1,144 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<ItemGroup Label="ProjectConfigurations">
|
|
||||||
<ProjectConfiguration Include="Debug|Win32">
|
|
||||||
<Configuration>Debug</Configuration>
|
|
||||||
<Platform>Win32</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Debug|x64">
|
|
||||||
<Configuration>Debug</Configuration>
|
|
||||||
<Platform>x64</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Release|Win32">
|
|
||||||
<Configuration>Release</Configuration>
|
|
||||||
<Platform>Win32</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="Release|x64">
|
|
||||||
<Configuration>Release</Configuration>
|
|
||||||
<Platform>x64</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
</ItemGroup>
|
|
||||||
<PropertyGroup Label="Globals">
|
|
||||||
<ProjectName>libv8</ProjectName>
|
|
||||||
<ProjectGuid>{AB03E82B-48B1-4374-B32A-A1AF83DDC6C2}</ProjectGuid>
|
|
||||||
<RootNamespace>libv8</RootNamespace>
|
|
||||||
<Keyword>Win32Proj</Keyword>
|
|
||||||
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
|
|
||||||
</PropertyGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>Utility</ConfigurationType>
|
|
||||||
<CharacterSet>NotSet</CharacterSet>
|
|
||||||
<PlatformToolset>v140</PlatformToolset>
|
|
||||||
<CLRSupport>false</CLRSupport>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>Utility</ConfigurationType>
|
|
||||||
<CharacterSet>NotSet</CharacterSet>
|
|
||||||
<PlatformToolset>v140</PlatformToolset>
|
|
||||||
<CLRSupport>false</CLRSupport>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
|
||||||
<ConfigurationType>Utility</ConfigurationType>
|
|
||||||
<CharacterSet>NotSet</CharacterSet>
|
|
||||||
<PlatformToolset>v140</PlatformToolset>
|
|
||||||
<CLRSupport>false</CLRSupport>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
|
||||||
<ConfigurationType>Utility</ConfigurationType>
|
|
||||||
<CharacterSet>NotSet</CharacterSet>
|
|
||||||
<PlatformToolset>v140</PlatformToolset>
|
|
||||||
<CLRSupport>false</CLRSupport>
|
|
||||||
</PropertyGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
|
||||||
<Import Project="$(SolutionDir)\w32\v8.props" />
|
|
||||||
<Import Project="$(SolutionDir)\w32\extdll.props" />
|
|
||||||
<ImportGroup Label="ExtensionSettings">
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<PropertyGroup Label="UserMacros" />
|
|
||||||
<PropertyGroup>
|
|
||||||
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
|
|
||||||
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(PlatformName)\V8\$(Configuration)\</IntDir>
|
|
||||||
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(PlatformName)\V8\$(Configuration)\</IntDir>
|
|
||||||
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(PlatformName)\V8\$(Configuration)\</IntDir>
|
|
||||||
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(PlatformName)\V8\$(Configuration)\</IntDir>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
|
||||||
<BuildLog>
|
|
||||||
<Path>$(IntDir)BuildLog $(ProjectName).htm</Path>
|
|
||||||
</BuildLog>
|
|
||||||
<PreBuildEvent>
|
|
||||||
<Command>
|
|
||||||
</Command>
|
|
||||||
</PreBuildEvent>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
|
||||||
<Midl>
|
|
||||||
<TargetEnvironment>X64</TargetEnvironment>
|
|
||||||
</Midl>
|
|
||||||
<BuildLog>
|
|
||||||
<Path>$(IntDir)BuildLog $(ProjectName).htm</Path>
|
|
||||||
</BuildLog>
|
|
||||||
<PreBuildEvent>
|
|
||||||
<Command>
|
|
||||||
</Command>
|
|
||||||
</PreBuildEvent>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
|
||||||
<BuildLog>
|
|
||||||
<Path>$(IntDir)BuildLog $(ProjectName).htm</Path>
|
|
||||||
</BuildLog>
|
|
||||||
<PreBuildEvent>
|
|
||||||
<Command>
|
|
||||||
</Command>
|
|
||||||
</PreBuildEvent>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
|
||||||
<Midl>
|
|
||||||
<TargetEnvironment>X64</TargetEnvironment>
|
|
||||||
</Midl>
|
|
||||||
<BuildLog>
|
|
||||||
<Path>$(IntDir)BuildLog $(ProjectName).htm</Path>
|
|
||||||
</BuildLog>
|
|
||||||
<PreBuildEvent>
|
|
||||||
<Command>
|
|
||||||
</Command>
|
|
||||||
</PreBuildEvent>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<CustomBuild Include="cleancount">
|
|
||||||
<FileType>Document</FileType>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Building Google V8</Message>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)build-v8.bat x86 Release "$(ProjectDir)..\..\v8-$(V8Version)"
|
|
||||||
</Command>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)..\..\v8-$(V8Version);%(Outputs)</Outputs>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Building Google V8</Message>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)build-v8.bat x86 Debug "$(ProjectDir)..\..\v8-$(V8Version)"
|
|
||||||
</Command>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\..\v8-$(V8Version);%(Outputs)</Outputs>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Building Google V8</Message>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)build-v8.bat x64 Release "$(ProjectDir)..\..\v8-$(V8Version)"
|
|
||||||
</Command>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)..\..\v8-$(V8Version);%(Outputs)</Outputs>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Building Google V8</Message>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)build-v8.bat x64 Debug "$(ProjectDir)..\..\v8-$(V8Version)"
|
|
||||||
</Command>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)..\..\v8-$(V8Version);%(Outputs)</Outputs>
|
|
||||||
</CustomBuild>
|
|
||||||
</ItemGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
|
||||||
<ImportGroup Label="ExtensionTargets">
|
|
||||||
</ImportGroup>
|
|
||||||
</Project>
|
|
||||||
|
|
@ -210,10 +210,6 @@
|
||||||
<ProjectReference Include="..\..\..\..\libs\libteletone\libteletone.2015.vcxproj">
|
<ProjectReference Include="..\..\..\..\libs\libteletone\libteletone.2015.vcxproj">
|
||||||
<Project>{89385c74-5860-4174-9caf-a39e7c48909c}</Project>
|
<Project>{89385c74-5860-4174-9caf-a39e7c48909c}</Project>
|
||||||
</ProjectReference>
|
</ProjectReference>
|
||||||
<ProjectReference Include="..\..\..\..\libs\win32\v8\libv8.2015.vcxproj">
|
|
||||||
<Project>{AB03E82B-48B1-4374-B32A-A1AF83DDC6C2}</Project>
|
|
||||||
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
|
|
||||||
</ProjectReference>
|
|
||||||
<ProjectReference Include="..\..\..\..\libs\win32\curl\curllib.2015.vcxproj">
|
<ProjectReference Include="..\..\..\..\libs\win32\curl\curllib.2015.vcxproj">
|
||||||
<Project>{87ee9da4-de1e-4448-8324-183c98dca588}</Project>
|
<Project>{87ee9da4-de1e-4448-8324-183c98dca588}</Project>
|
||||||
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
|
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
|
||||||
|
|
|
||||||
|
|
@ -185,10 +185,6 @@
|
||||||
<ClCompile Include="mod_v8_skel.cpp" />
|
<ClCompile Include="mod_v8_skel.cpp" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\..\..\..\libs\win32\v8\libv8.2015.vcxproj">
|
|
||||||
<Project>{AB03E82B-48B1-4374-B32A-A1AF83DDC6C2}</Project>
|
|
||||||
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
|
|
||||||
</ProjectReference>
|
|
||||||
<ProjectReference Include="..\..\..\..\libs\win32\curl\curllib.2015.vcxproj">
|
<ProjectReference Include="..\..\..\..\libs\win32\curl\curllib.2015.vcxproj">
|
||||||
<Project>{87ee9da4-de1e-4448-8324-183c98dca588}</Project>
|
<Project>{87ee9da4-de1e-4448-8324-183c98dca588}</Project>
|
||||||
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
|
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@
|
||||||
<Import Project="basedir.props" Condition=" '$(BaseDirImported)' == ''"/>
|
<Import Project="basedir.props" Condition=" '$(BaseDirImported)' == ''"/>
|
||||||
</ImportGroup>
|
</ImportGroup>
|
||||||
<PropertyGroup Label="UserMacros">
|
<PropertyGroup Label="UserMacros">
|
||||||
<V8Version>5.6.326</V8Version>
|
<V8Version>6.1.298</V8Version>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<V8VersionImported>true</V8VersionImported>
|
<V8VersionImported>true</V8VersionImported>
|
||||||
|
|
|
||||||
37
w32/v8.props
37
w32/v8.props
|
|
@ -1,7 +1,6 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
<ImportGroup Label="PropertySheets">
|
<ImportGroup Label="PropertySheets">
|
||||||
<Import Project="curl.props" Condition=" '$(CurlPropsImported)' == '' "/>
|
|
||||||
<Import Project="v8-version.props" Condition=" '$(V8VersionImported)' == '' "/>
|
<Import Project="v8-version.props" Condition=" '$(V8VersionImported)' == '' "/>
|
||||||
<Import Project="downloadpackage.task" Condition=" '$(downloadpackagetask_Imported)' == '' " />
|
<Import Project="downloadpackage.task" Condition=" '$(downloadpackagetask_Imported)' == '' " />
|
||||||
</ImportGroup>
|
</ImportGroup>
|
||||||
|
|
@ -30,24 +29,34 @@
|
||||||
extractto: Folder to extract an archive to
|
extractto: Folder to extract an archive to
|
||||||
-->
|
-->
|
||||||
|
|
||||||
<Target Name="v8libTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">
|
<Target Name="v8BinariesDownloadTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">
|
||||||
<DownloadPackageTask
|
<DownloadPackageTask
|
||||||
package="http://files.freeswitch.org/downloads/libs/v8-$(V8Version).tar.bz2"
|
package="http://files.freeswitch.org/windows/packages/v8/$(V8Version)/v8-$(V8Version)-binaries-$(Platform.ToLower())-$(Configuration.ToLower()).zip"
|
||||||
|
expectfileordirectory="$(V8libDir)\binaries\$(Platform)\$(Configuration)\v8.dll"
|
||||||
|
outputfolder=""
|
||||||
|
outputfilename=""
|
||||||
|
extractto="$(BaseDir)libs\"
|
||||||
|
/>
|
||||||
|
</Target>
|
||||||
|
<Target Name="v8HeadersDownloadTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">
|
||||||
|
<DownloadPackageTask
|
||||||
|
package="http://files.freeswitch.org/windows/packages/v8/$(V8Version)/v8-$(V8Version)-headers.zip"
|
||||||
expectfileordirectory="$(V8libDir)\include\v8.h"
|
expectfileordirectory="$(V8libDir)\include\v8.h"
|
||||||
outputfolder=""
|
outputfolder=""
|
||||||
outputfilename=""
|
outputfilename=""
|
||||||
extractto="$(BaseDir)libs"
|
extractto="$(BaseDir)libs\"
|
||||||
/>
|
/>
|
||||||
</Target>
|
</Target>
|
||||||
|
|
||||||
<Target Name="v8libwinTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">
|
<Target Name="v8copyTarget" BeforeTargets="CustomBuild" DependsOnTargets="v8BinariesDownloadTarget">
|
||||||
<DownloadPackageTask
|
<Message Text="Copying v8 libraries to the freeswitch output folder." Importance="High" />
|
||||||
package="http://files.freeswitch.org/downloads/libs/v8-$(V8Version)-win.tar.bz2"
|
<ItemGroup>
|
||||||
expectfileordirectory="$(V8libDir)\third_party\cygwin"
|
<v8Files Include="$(V8libDir)\binaries\$(Platform)\$(Configuration)\*.dll"/>
|
||||||
outputfolder=""
|
</ItemGroup>
|
||||||
outputfilename=""
|
<Copy Condition="!exists('$(BaseDir)\$(Platform)\$(Configuration)\v8.dll')"
|
||||||
extractto="$(BaseDir)libs"
|
SourceFiles="@(v8Files)"
|
||||||
/>
|
DestinationFiles="@(v8Files->'$(BaseDir)\$(Platform)\$(Configuration)\%(Filename)%(Extension)')"
|
||||||
|
/>
|
||||||
</Target>
|
</Target>
|
||||||
|
|
||||||
<ItemDefinitionGroup>
|
<ItemDefinitionGroup>
|
||||||
|
|
@ -58,8 +67,8 @@
|
||||||
<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<Link>
|
<Link>
|
||||||
<AdditionalLibraryDirectories>$(SolutionDir)libs\v8-$(V8Version)\build\$(Configuration)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
<AdditionalLibraryDirectories>$(SolutionDir)libs\v8-$(V8Version)\binaries\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||||
<AdditionalDependencies>icui18n.lib;icuuc.lib;v8.lib;v8_libplatform.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
<AdditionalDependencies>v8.dll.lib;v8_libbase.dll.lib;v8_libplatform.dll.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||||
</Link>
|
</Link>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue