Changeset 225563 in webkit
- Timestamp:
- Dec 5, 2017 6:18:57 PM (6 years ago)
- Location:
- trunk
- Files:
-
- 14 edited
-
ChangeLog (modified) (1 diff)
-
Source/JavaScriptCore/ChangeLog (modified) (1 diff)
-
Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.proj (modified) (1 diff)
-
Source/WTF/ChangeLog (modified) (1 diff)
-
Source/WTF/WTF.vcxproj/WTF.proj (modified) (1 diff)
-
Source/WTF/wtf/Compiler.h (modified) (1 diff)
-
Source/WebCore/ChangeLog (modified) (1 diff)
-
Source/WebCore/WebCore.vcxproj/WebCore.proj (modified) (1 diff)
-
Source/WebKitLegacy/ChangeLog (modified) (1 diff)
-
Source/WebKitLegacy/WebKitLegacy.vcxproj/WebKitLegacy.proj (modified) (1 diff)
-
Source/cmake/OptionsMSVC.cmake (modified) (1 diff)
-
Tools/ChangeLog (modified) (1 diff)
-
Tools/Scripts/build-webkit (modified) (1 diff)
-
Tools/Scripts/webkitdirs.pm (modified) (12 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/ChangeLog
r225421 r225563 1 2017-12-05 Stephan Szabo <stephan.szabo@sony.com> 2 3 Switch windows build to Visual Studio 2017 4 https://bugs.webkit.org/show_bug.cgi?id=172412 5 6 Reviewed by Per Arne Vollan. 7 8 * Source/cmake/OptionsMSVC.cmake: 9 1 10 2017-12-01 Konstantin Tokarev <annulen@yandex.ru> 2 11 -
trunk/Source/JavaScriptCore/ChangeLog
r225550 r225563 1 2017-12-05 Stephan Szabo <stephan.szabo@sony.com> 2 3 Switch windows build to Visual Studio 2017 4 https://bugs.webkit.org/show_bug.cgi?id=172412 5 6 Reviewed by Per Arne Vollan. 7 8 * JavaScriptCore.vcxproj/JavaScriptCore.proj: 9 1 10 2017-12-05 JF Bastien <jfbastien@apple.com> 2 11 -
trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.proj
r222287 r225563 55 55 <Message Text="Building $(CONFIGURATION) Solution" /> 56 56 <Error Text="DSTROOT property or environment variable must be defined." Condition="'$(DSTROOT)' == ''" /> 57 <Exec Command="$(CMakeCommandCommon) -DWTF_CPU_X86=1 -G "Visual Studio 1 4 2015"" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build32"/>57 <Exec Command="$(CMakeCommandCommon) -DWTF_CPU_X86=1 -G "Visual Studio 15 2017"" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build32"/> 58 58 <Exec Command="msbuild Project.sln /p:Configuration=$(CONFIG)" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build32"/> 59 <Exec Command="$(CMakeCommandCommon) -DWTF_CPU_X86_64=1 -G "Visual Studio 1 4 2015Win64"" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build64"/>59 <Exec Command="$(CMakeCommandCommon) -DWTF_CPU_X86_64=1 -G "Visual Studio 15 2017 Win64"" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build64"/> 60 60 <Exec Command="msbuild Project.sln /p:Configuration=$(CONFIG)" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build64"/> 61 61 </Target> -
trunk/Source/WTF/ChangeLog
r225558 r225563 1 2017-12-05 Stephan Szabo <stephan.szabo@sony.com> 2 3 Switch windows build to Visual Studio 2017 4 https://bugs.webkit.org/show_bug.cgi?id=172412 5 6 Reviewed by Per Arne Vollan. 7 8 * WTF.vcxproj/WTF.proj: 9 * wtf/Compiler.h: 10 1 11 2017-12-05 Andy Estes <aestes@apple.com> 2 12 -
trunk/Source/WTF/WTF.vcxproj/WTF.proj
r221076 r225563 47 47 <Message Text="Building $(CONFIGURATION) Solution" /> 48 48 <Error Text="DSTROOT property or environment variable must be defined." Condition="'$(DSTROOT)' == ''" /> 49 <Exec Command="$(CMakeCommandCommon) -DWTF_CPU_X86=1 -G "Visual Studio 1 4 2015"" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build32"/>49 <Exec Command="$(CMakeCommandCommon) -DWTF_CPU_X86=1 -G "Visual Studio 15 2017"" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build32"/> 50 50 <Exec Command="msbuild Project.sln /p:Configuration=$(CONFIG)" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build32"/> 51 <Exec Command="$(CMakeCommandCommon) -DWTF_CPU_X86_64=1 -G "Visual Studio 1 4 2015Win64"" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build64"/>51 <Exec Command="$(CMakeCommandCommon) -DWTF_CPU_X86_64=1 -G "Visual Studio 15 2017 Win64"" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build64"/> 52 52 <Exec Command="msbuild Project.sln /p:Configuration=$(CONFIG)" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build64"/> 53 53 </Target> -
trunk/Source/WTF/wtf/Compiler.h
r222930 r225563 131 131 #define WTF_COMPILER_SUPPORTS_CXX_REFERENCE_QUALIFIED_FUNCTIONS 1 132 132 133 #if _MSC_VER < 19 00134 #error "Please use a newer version of Visual Studio. WebKit requires VS201 5or newer to compile."133 #if _MSC_VER < 1910 134 #error "Please use a newer version of Visual Studio. WebKit requires VS2017 or newer to compile." 135 135 #endif 136 136 -
trunk/Source/WebCore/ChangeLog
r225562 r225563 1 2017-12-05 Stephan Szabo <stephan.szabo@sony.com> 2 3 Switch windows build to Visual Studio 2017 4 https://bugs.webkit.org/show_bug.cgi?id=172412 5 6 Reviewed by Per Arne Vollan. 7 8 Only changes proj file to update generator 9 10 * WebCore.vcxproj/WebCore.proj: 11 1 12 2017-12-05 Brent Fulgham <bfulgham@apple.com> 2 13 -
trunk/Source/WebCore/WebCore.vcxproj/WebCore.proj
r219335 r225563 55 55 <Message Text="Building $(CONFIGURATION) Solution" /> 56 56 <Error Text="DSTROOT property or environment variable must be defined." Condition="'$(DSTROOT)' == ''" /> 57 <Exec Command="$(CMakeCommandCommon) -DWTF_CPU_X86=1 -G "Visual Studio 1 4 2015"" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build32"/>57 <Exec Command="$(CMakeCommandCommon) -DWTF_CPU_X86=1 -G "Visual Studio 15 2017"" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build32"/> 58 58 <Exec Command="msbuild Project.sln /p:Configuration=$(CONFIG)" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build32"/> 59 <Exec Command="$(CMakeCommandCommon) -DWTF_CPU_X86_64=1 -G "Visual Studio 1 4 2015Win64"" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build64"/>59 <Exec Command="$(CMakeCommandCommon) -DWTF_CPU_X86_64=1 -G "Visual Studio 15 2017 Win64"" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build64"/> 60 60 <Exec Command="msbuild Project.sln /p:Configuration=$(CONFIG)" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build64"/> 61 61 </Target> -
trunk/Source/WebKitLegacy/ChangeLog
r225191 r225563 1 2017-12-05 Stephan Szabo <stephan.szabo@sony.com> 2 3 Switch windows build to Visual Studio 2017 4 https://bugs.webkit.org/show_bug.cgi?id=172412 5 6 Reviewed by Per Arne Vollan. 7 8 * WebKitLegacy.vcxproj/WebKitLegacy.proj: 9 1 10 2017-11-27 Don Olmstead <don.olmstead@sony.com> 2 11 -
trunk/Source/WebKitLegacy/WebKitLegacy.vcxproj/WebKitLegacy.proj
r222526 r225563 55 55 <Message Text="Building $(CONFIGURATION) Solution" /> 56 56 <Error Text="DSTROOT property or environment variable must be defined." Condition="'$(DSTROOT)' == ''" /> 57 <Exec Command="$(CMakeCommandCommon) -DWTF_CPU_X86=1 -G "Visual Studio 1 4 2015"" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build32"/>57 <Exec Command="$(CMakeCommandCommon) -DWTF_CPU_X86=1 -G "Visual Studio 15 2017"" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build32"/> 58 58 <Exec Command="msbuild Project.sln /p:Configuration=$(CONFIG)" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build32"/> 59 <Exec Command="$(CMakeCommandCommon) -DWTF_CPU_X86_64=1 -G "Visual Studio 1 4 2015Win64"" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build64"/>59 <Exec Command="$(CMakeCommandCommon) -DWTF_CPU_X86_64=1 -G "Visual Studio 15 2017 Win64"" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build64"/> 60 60 <Exec Command="msbuild Project.sln /p:Configuration=$(CONFIG)" WorkingDirectory="$(OBJROOT)/$(CONFIG)/build64"/> 61 61 </Target> -
trunk/Source/cmake/OptionsMSVC.cmake
r225191 r225563 98 98 99 99 if (COMPILER_IS_CLANG_CL) 100 # FIXME: We need to set the msc-version above the one it defaults to 101 # when using clang-cl with VS2015. This might be unnecessary when moving to 102 # VS2017 as part of https://bugs.webkit.org/show_bug.cgi?id=172412 103 add_compile_options(-fmsc-version=190023918) 100 # FIXME: The clang-cl visual studio integration seemed to set 101 # this to 1900 explicitly even when building in VS2017 with the 102 # newest toolset option, but we want to be versioned to match 103 # VS2017. 104 add_compile_options(-fmsc-version=1911) 104 105 105 106 # FIXME: Building with clang-cl seemed to fail with 128 bit int support -
trunk/Tools/ChangeLog
r225553 r225563 1 2017-12-05 Stephan Szabo <stephan.szabo@sony.com> 2 3 Switch windows build to Visual Studio 2017 4 https://bugs.webkit.org/show_bug.cgi?id=172412 5 6 Reviewed by Per Arne Vollan. 7 8 * Scripts/build-webkit: 9 * Scripts/webkitdirs.pm: 10 (visualStudioInstallDir): 11 (visualStudioInstallDirFallback): 12 (msBuildInstallDir): 13 (setupAppleWinEnv): 14 (setupCygwinEnv): 15 (generateBuildSystemFromCMakeProject): 16 (pickLegacyVisualStudioInstallation): Deleted. 17 (visualStudioInstallDirLegacy): Deleted. 18 (visualStudioVersion): Deleted. 19 (visualStudioVersionFromInstallDir): Deleted. 20 1 21 2017-12-05 Alex Christensen <achristensen@webkit.org> 2 22 -
trunk/Tools/Scripts/build-webkit
r225098 r225563 289 289 chdirWebKit(); 290 290 if (exitStatus(generateBuildSystemFromCMakeProject($prefixPath, @cmakeArgs))) { 291 die "Run \"C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/vcvarsall.bat\"before build-webkit when using ninja";291 die "Run Visual Studio 2017 installation vcvars.bat before build-webkit when using ninja"; 292 292 } 293 293 -
trunk/Tools/Scripts/webkitdirs.pm
r225098 r225563 162 162 my $willUseVCExpressWhenBuilding = 0; 163 163 my $vsWhereFoundInstallation; 164 my $vsWhereLegacyInstallation;165 164 166 165 # Defined in VCSUtils. … … 635 634 } 636 635 637 sub pickLegacyVisualStudioInstallation638 {639 return $vsWhereLegacyInstallation if defined $vsWhereLegacyInstallation;640 641 requireModulesForVSWhere();642 determineSourceDir();643 644 my $vsWhereOut = `$sourceDir/WebKitLibraries/win/tools/vswhere -nologo -legacy -format json`;645 my $installations_all = [];646 eval {647 $installations_all = JSON::PP::decode_json(Encode::encode('UTF-8' => Encode::decode(console_in => $vsWhereOut)));648 };649 print "Error getting Visual Studio Legacy Location: $@\n" if $@;650 undef $@;651 652 # It's possible that a non-legacy installation without msbuild653 # would not be found by the latest, but would be found by this654 # vswhere call, and we want to skip those, so check for versions655 # with an installation version before 15.0.656 my @installations = grep { $_->{installationVersion} < 15 } @$installations_all;657 658 # We don't get much information that would let us choose between659 # legacy installations, so we'll take the first.660 if (scalar @installations) {661 my $installation = $installations[0];662 $vsWhereLegacyInstallation = $installation;663 return $installation;664 }665 return undef;666 }667 668 636 sub visualStudioInstallDir 669 637 { … … 676 644 $vsInstallDir = visualStudioInstallDirVSWhere(); 677 645 if (not -e $vsInstallDir) { 678 $vsInstallDir = visualStudioInstallDirLegacy();679 }680 if (not -e $vsInstallDir) {681 646 $vsInstallDir = visualStudioInstallDirFallback(); 682 print "Fallback $vsInstallDir\n";683 647 } 684 648 } … … 694 658 if (defined($vsWhereFoundInstallation)) { 695 659 return $vsWhereFoundInstallation->{installationPath}; 696 }697 return undef;698 }699 700 sub visualStudioInstallDirLegacy701 {702 pickLegacyVisualStudioInstallation();703 if (defined($vsWhereLegacyInstallation)) {704 return $vsWhereLegacyInstallation->{installationPath};705 660 } 706 661 return undef; … … 722 677 } 723 678 } 724 return File::Spec->catdir(programFilesPathX86(), "Microsoft Visual Studio 14.0");679 return undef; 725 680 } 726 681 … … 729 684 return $msBuildInstallDir if defined $msBuildInstallDir; 730 685 731 my $version = visualStudioVersion(); 732 if ($version >= 15.0) { 733 my $installDir = visualStudioInstallDir(); 734 $msBuildInstallDir = File::Spec->catdir($installDir, 735 "MSBuild", $version, "bin"); 736 } else { 737 $msBuildInstallDir = File::Spec->catdir(programFilesPathX86(), 738 "MSBuild", "14.0", "Bin") 739 } 686 my $installDir = visualStudioInstallDir(); 687 $msBuildInstallDir = File::Spec->catdir($installDir, 688 "MSBuild", "15.0", "bin"); 740 689 741 690 chomp($msBuildInstallDir = `cygpath "$msBuildInstallDir"`) if isCygwin(); … … 743 692 print "Using MSBuild: $msBuildInstallDir\n"; 744 693 return $msBuildInstallDir; 745 }746 747 sub visualStudioVersion748 {749 return $vsVersion if defined $vsVersion;750 751 my $installDir = visualStudioInstallDir();752 $vsVersion = visualStudioVersionFromInstallDir($installDir);753 754 print "Using Visual Studio $vsVersion\n";755 return $vsVersion;756 }757 758 sub visualStudioVersionFromInstallDir759 {760 my ($dir) = @_;761 my $version;762 763 if ($dir =~ m|Microsoft Visual Studio[/\\]2017|) {764 $version = "15.0";765 }766 767 if (!defined($version)) {768 if ($dir =~ /Microsoft Visual Studio ([0-9]+\.[0-9]*)/) {769 $version = $1;770 }771 }772 773 return $version;774 694 } 775 695 … … 1859 1779 if (!defined $ENV{'WEBKIT_LIBRARIES'} || !$ENV{'WEBKIT_LIBRARIES'}) { 1860 1780 print "Warning: You must set the 'WebKit_Libraries' environment variable\n"; 1861 print " to be able build WebKit from within Visual Studio 201 3and newer.\n";1781 print " to be able build WebKit from within Visual Studio 2017 and newer.\n"; 1862 1782 print " Make sure that 'WebKit_Libraries' points to the\n"; 1863 1783 print " 'WebKitLibraries/win' directory, not the 'WebKitLibraries/' directory.\n\n"; … … 1865 1785 if (!defined $ENV{'WEBKIT_OUTPUTDIR'} || !$ENV{'WEBKIT_OUTPUTDIR'}) { 1866 1786 print "Warning: You must set the 'WebKit_OutputDir' environment variable\n"; 1867 print " to be able build WebKit from within Visual Studio 201 3and newer.\n\n";1787 print " to be able build WebKit from within Visual Studio 2017 and newer.\n\n"; 1868 1788 } 1869 1789 if (!defined $ENV{'MSBUILDDISABLENODEREUSE'} || !$ENV{'MSBUILDDISABLENODEREUSE'}) { … … 1886 1806 my $programFilesPath = programFilesPath(); 1887 1807 my $visualStudioPath = File::Spec->catfile(visualStudioInstallDir(), qw(Common7 IDE devenv.com)); 1888 if (-e $visualStudioPath) { 1889 # Visual Studio is installed; 1890 if (visualStudioVersion() eq "12") { 1891 $visualStudioPath = File::Spec->catfile(visualStudioInstallDir(), qw(Common7 IDE devenv.exe)); 1892 } 1893 } else { 1808 if (!-e $visualStudioPath) { 1894 1809 # Visual Studio not found, try VC++ Express 1895 1810 $visualStudioPath = File::Spec->catfile(visualStudioInstallDir(), qw(Common7 IDE WDExpress.exe)); … … 1898 1813 print "Cannot find '$visualStudioPath'\n"; 1899 1814 print "Please execute the file 'vcvars32.bat' from\n"; 1900 print " '$programFilesPath\\Microsoft Visual Studio 14.0\\VC\\bin\\'\n";1815 print "your Visual Studio 2017 installation\n"; 1901 1816 print "to setup the necessary environment variables.\n"; 1902 1817 print "*************************************************************\n"; … … 2225 2140 } 2226 2141 } elsif (isAnyWindows() && isWin64()) { 2227 if (visualStudioVersion() >= 15) { 2228 push @args, '-G "Visual Studio 15 2017 Win64"'; 2229 } else { 2230 push @args, '-G "Visual Studio 14 2015 Win64"'; 2231 } 2142 push @args, '-G "Visual Studio 15 2017 Win64"'; 2232 2143 } 2233 2144 # Do not show progress of generating bindings in interactive Ninja build not to leave noisy lines on tty
Note: See TracChangeset
for help on using the changeset viewer.
