From 7adc20fd4a259b404a45b623488c3f38b96f7a42 Mon Sep 17 00:00:00 2001 From: Peter Olsson Date: Tue, 21 Jan 2014 12:34:14 +0100 Subject: [PATCH] mod_v8: Simplify Visual Studio projects to make it easier to change version of V8 in the future --- libs/win32/Download V8.2010.vcxproj | 14 ++++++++------ libs/win32/Download V8.2012.vcxproj | 14 ++++++++------ libs/win32/v8/libv8.2010.vcxproj | 20 ++++++++++++-------- libs/win32/v8/libv8.2012.vcxproj | 20 ++++++++++++-------- w32/v8-version.props | 17 +++++++++++++++++ w32/v8.props | 8 +++----- 6 files changed, 60 insertions(+), 33 deletions(-) create mode 100644 w32/v8-version.props diff --git a/libs/win32/Download V8.2010.vcxproj b/libs/win32/Download V8.2010.vcxproj index 4a90486d39..fe2b60935c 100644 --- a/libs/win32/Download V8.2010.vcxproj +++ b/libs/win32/Download V8.2010.vcxproj @@ -31,9 +31,11 @@ + + @@ -63,15 +65,15 @@ Document Downloading V8. - if not exist "$(ProjectDir)..\v8-3.24.14" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/v8-3.24.14.tar.bz2 "$(ProjectDir).." -if not exist "$(ProjectDir)..\v8-3.24.14\third_party\cygwin" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/v8-3.24.14-win.tar.bz2 "$(ProjectDir).." + if not exist "$(ProjectDir)..\v8-$(V8Version)" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/v8-$(V8Version).tar.bz2 "$(ProjectDir).." +if not exist "$(ProjectDir)..\v8-$(V8Version)\third_party\cygwin" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/v8-$(V8Version)-win.tar.bz2 "$(ProjectDir).." - $(ProjectDir)..\v8-3.24.14;%(Outputs) + $(ProjectDir)..\v8-$(V8Version);%(Outputs) Downloading V8. - if not exist "$(ProjectDir)..\v8-3.24.14" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/v8-3.24.14.tar.bz2 "$(ProjectDir).." -if not exist "$(ProjectDir)..\v8-3.24.14\third_party\cygwin" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/v8-3.24.14-win.tar.bz2 "$(ProjectDir).." + if not exist "$(ProjectDir)..\v8-$(V8Version)" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/v8-$(V8Version).tar.bz2 "$(ProjectDir).." +if not exist "$(ProjectDir)..\v8-$(V8Version)\third_party\cygwin" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/v8-$(V8Version)-win.tar.bz2 "$(ProjectDir).." - $(ProjectDir)..\v8-3.24.14;%(Outputs) + $(ProjectDir)..\v8-$(V8Version);%(Outputs) diff --git a/libs/win32/Download V8.2012.vcxproj b/libs/win32/Download V8.2012.vcxproj index 3760ca1298..352bacb744 100644 --- a/libs/win32/Download V8.2012.vcxproj +++ b/libs/win32/Download V8.2012.vcxproj @@ -33,9 +33,11 @@ + + @@ -65,15 +67,15 @@ Document Downloading V8. - if not exist "$(ProjectDir)..\v8-3.24.14" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/v8-3.24.14.tar.bz2 "$(ProjectDir).." -if not exist "$(ProjectDir)..\v8-3.24.14\third_party\cygwin" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/v8-3.24.14-win.tar.bz2 "$(ProjectDir).." + if not exist "$(ProjectDir)..\v8-$(V8Version)" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/v8-$(V8Version).tar.bz2 "$(ProjectDir).." +if not exist "$(ProjectDir)..\v8-$(V8Version)\third_party\cygwin" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/v8-$(V8Version)-win.tar.bz2 "$(ProjectDir).." - $(ProjectDir)..\v8-3.24.14;%(Outputs) + $(ProjectDir)..\v8-$(V8Version);%(Outputs) Downloading V8. - if not exist "$(ProjectDir)..\v8-3.24.14" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/v8-3.24.14.tar.bz2 "$(ProjectDir).." -if not exist "$(ProjectDir)..\v8-3.24.14\third_party\cygwin" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/v8-3.24.14-win.tar.bz2 "$(ProjectDir).." + if not exist "$(ProjectDir)..\v8-$(V8Version)" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/v8-$(V8Version).tar.bz2 "$(ProjectDir).." +if not exist "$(ProjectDir)..\v8-$(V8Version)\third_party\cygwin" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/v8-$(V8Version)-win.tar.bz2 "$(ProjectDir).." - $(ProjectDir)..\v8-3.24.14;%(Outputs) + $(ProjectDir)..\v8-$(V8Version);%(Outputs) diff --git a/libs/win32/v8/libv8.2010.vcxproj b/libs/win32/v8/libv8.2010.vcxproj index 414cef7827..b9fc5476a8 100644 --- a/libs/win32/v8/libv8.2010.vcxproj +++ b/libs/win32/v8/libv8.2010.vcxproj @@ -47,15 +47,19 @@ + + + + @@ -111,21 +115,21 @@ Document Building Google V8 - $(ProjectDir)build-v8.bat x86 Release "$(ProjectDir)..\..\v8-3.24.14" + $(ProjectDir)build-v8.bat x86 Release "$(ProjectDir)..\..\v8-$(V8Version)" - $(ProjectDir)..\..\v8-3.24.14;%(Outputs) + $(ProjectDir)..\..\v8-$(V8Version);%(Outputs) Building Google V8 - $(ProjectDir)build-v8.bat x86 Debug "$(ProjectDir)..\..\v8-3.24.14" + $(ProjectDir)build-v8.bat x86 Debug "$(ProjectDir)..\..\v8-$(V8Version)" - $(ProjectDir)..\..\v8-3.24.14;%(Outputs) + $(ProjectDir)..\..\v8-$(V8Version);%(Outputs) Building Google V8 - $(ProjectDir)build-v8.bat x64 Release "$(ProjectDir)..\..\v8-3.24.14" + $(ProjectDir)build-v8.bat x64 Release "$(ProjectDir)..\..\v8-$(V8Version)" - $(ProjectDir)..\..\v8-3.24.14;%(Outputs) + $(ProjectDir)..\..\v8-$(V8Version);%(Outputs) Building Google V8 - $(ProjectDir)build-v8.bat x64 Debug "$(ProjectDir)..\..\v8-3.24.14" + $(ProjectDir)build-v8.bat x64 Debug "$(ProjectDir)..\..\v8-$(V8Version)" - $(ProjectDir)..\..\v8-3.24.14;%(Outputs) + $(ProjectDir)..\..\v8-$(V8Version);%(Outputs) diff --git a/libs/win32/v8/libv8.2012.vcxproj b/libs/win32/v8/libv8.2012.vcxproj index 827cd5d65e..abe317fff9 100644 --- a/libs/win32/v8/libv8.2012.vcxproj +++ b/libs/win32/v8/libv8.2012.vcxproj @@ -51,15 +51,19 @@ + + + + @@ -115,21 +119,21 @@ Document Building Google V8 - $(ProjectDir)build-v8.bat x86 Release "$(ProjectDir)..\..\v8-3.24.14" + $(ProjectDir)build-v8.bat x86 Release "$(ProjectDir)..\..\v8-$(V8Version)" - $(ProjectDir)..\..\v8-3.24.14;%(Outputs) + $(ProjectDir)..\..\v8-$(V8Version);%(Outputs) Building Google V8 - $(ProjectDir)build-v8.bat x86 Debug "$(ProjectDir)..\..\v8-3.24.14" + $(ProjectDir)build-v8.bat x86 Debug "$(ProjectDir)..\..\v8-$(V8Version)" - $(ProjectDir)..\..\v8-3.24.14;%(Outputs) + $(ProjectDir)..\..\v8-$(V8Version);%(Outputs) Building Google V8 - $(ProjectDir)build-v8.bat x64 Release "$(ProjectDir)..\..\v8-3.24.14" + $(ProjectDir)build-v8.bat x64 Release "$(ProjectDir)..\..\v8-$(V8Version)" - $(ProjectDir)..\..\v8-3.24.14;%(Outputs) + $(ProjectDir)..\..\v8-$(V8Version);%(Outputs) Building Google V8 - $(ProjectDir)build-v8.bat x64 Debug "$(ProjectDir)..\..\v8-3.24.14" + $(ProjectDir)build-v8.bat x64 Debug "$(ProjectDir)..\..\v8-$(V8Version)" - $(ProjectDir)..\..\v8-3.24.14;%(Outputs) + $(ProjectDir)..\..\v8-$(V8Version);%(Outputs) diff --git a/w32/v8-version.props b/w32/v8-version.props new file mode 100644 index 0000000000..800ab9a7e6 --- /dev/null +++ b/w32/v8-version.props @@ -0,0 +1,17 @@ + + + + + 3.24.14 + + + true + + + + + + $(V8Version) + + + \ No newline at end of file diff --git a/w32/v8.props b/w32/v8.props index 1cebc8864e..5476106df3 100644 --- a/w32/v8.props +++ b/w32/v8.props @@ -2,19 +2,17 @@ + - - <_ProjectFileVersion>10.0.30319.1 - Level3 true - $(SolutionDir)libs\v8-3.24.14\include;$(SolutionDir)src\mod\languages\mod_v8;$(SolutionDir)src\mod\languages\mod_v8\include;%(AdditionalIncludeDirectories) + $(SolutionDir)libs\v8-$(V8Version)\include;$(SolutionDir)src\mod\languages\mod_v8;$(SolutionDir)src\mod\languages\mod_v8\include;%(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - $(SolutionDir)libs\v8-3.24.14\build\$(Configuration)\lib;%(AdditionalLibraryDirectories) + $(SolutionDir)libs\v8-$(V8Version)\build\$(Configuration)\lib;%(AdditionalLibraryDirectories) icui18n.lib;icuuc.lib;v8.lib;%(AdditionalDependencies)