Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for Visual Studio 2017 #16307

Merged
merged 2 commits into from Apr 11, 2017
Merged

Add support for Visual Studio 2017 #16307

merged 2 commits into from Apr 11, 2017

Conversation

@UK992
Copy link
Contributor

UK992 commented Apr 8, 2017

This adds support for Visual Studio 2017.
Also need update cmake to 3.7.2.

r? @larsbergstrom

Can you please upload this cmake to s3 bucket?


This change is Reviewable

@highfive

This comment has been minimized.

Copy link

highfive commented Apr 8, 2017

Heads up! This PR modifies the following files:

@UK992 UK992 force-pushed the UK992:msvc2017 branch 3 times, most recently from 783d7e8 to 2ea9b98 Apr 8, 2017
@atouchet atouchet mentioned this pull request Apr 10, 2017
0 of 5 tasks complete
@Coder206

This comment has been minimized.

Copy link
Contributor

Coder206 commented Apr 11, 2017

@UK992 I was successful in building and running Servo with 3.8.0 downloaded from the CMake website as a binary.

@larsbergstrom

This comment has been minimized.

Copy link
Contributor

larsbergstrom commented Apr 11, 2017

Does this require an update to heartbeats? I tried it locally (and put an updated cmake in the s3 bucket), but got:

error: failed to run custom build command for `heartbeats-simple-sys v0.4.1`
process didn't exit successfully: `C:\Users\lars\code\servo\target\debug\build\heartbeats-simple-sys-bf7003c17df5d8c7\build-script-build` (exit code: 101)
--- stdout
running: "cmake" "C:\\Users\\lars\\code\\servo\\.cargo\\registry\\src\\github.com-1ecc6299db9ec823\\heartbeats-simple-sys-0.4.1/heartbeats-simple" "-G" "Visual Studio 15 Win64" "-DCMAKE_INSTALL_PREFIX=C:\\Users\\lars\\code\\servo\\target\\debug\\build\\heartbeats-simple-sys-28376003c39ead8c\\out" "-DCMAKE_C_FLAGS= /nologo /MD" "-DCMAKE_C_FLAGS_RELEASE= /nologo /MD" "-DCMAKE_CXX_FLAGS= /nologo /MD" "-DCMAKE_CXX_FLAGS_RELEASE= /nologo /MD" "-DCMAKE_BUILD_TYPE=Release"

--- stderr
CMake Error: Could not create named generator Visual Studio 15 Win64

Generators
  Visual Studio 14 2015 [arch] = Generates Visual Studio 2015 project files.
                                 Optional [arch] can be "Win64" or "ARM".
  Visual Studio 12 2013 [arch] = Generates Visual Studio 2013 project files.
                                 Optional [arch] can be "Win64" or "ARM".
  Visual Studio 11 2012 [arch] = Generates Visual Studio 2012 project files.
                                 Optional [arch] can be "Win64" or "ARM".
  Visual Studio 10 2010 [arch] = Generates Visual Studio 2010 project files.
                                 Optional [arch] can be "Win64" or "IA64".
  Visual Studio 9 2008 [arch]  = Generates Visual Studio 2008 project files.
                                 Optional [arch] can be "Win64" or "IA64".
  Visual Studio 8 2005 [arch]  = Generates Visual Studio 2005 project files.
                                 Optional [arch] can be "Win64".
@larsbergstrom

This comment has been minimized.

Copy link
Contributor

larsbergstrom commented Apr 11, 2017

Oh, duh, I needed to change python/servo/packages.py to 3.7.2. Now fighting s3 permissions :-/

@larsbergstrom

This comment has been minimized.

Copy link
Contributor

larsbergstrom commented Apr 11, 2017

OK, just add that one change I mentioned (for the cmake version) and r=me. Thanks as always for all your Windows help!

@UK992 UK992 force-pushed the UK992:msvc2017 branch from ae6733c to 54d9ad8 Apr 11, 2017
@UK992

This comment has been minimized.

Copy link
Contributor Author

UK992 commented Apr 11, 2017

Updated cmake and added checking for version of installed cmake to avoid using outdated cmake.

@UK992 UK992 force-pushed the UK992:msvc2017 branch from 54d9ad8 to e3654e1 Apr 11, 2017
@larsbergstrom

This comment has been minimized.

Copy link
Contributor

larsbergstrom commented Apr 11, 2017

@bors-servo

This comment has been minimized.

Copy link
Contributor

bors-servo commented Apr 11, 2017

📌 Commit e3654e1 has been approved by larsbergstrom

@bors-servo

This comment has been minimized.

Copy link
Contributor

bors-servo commented Apr 11, 2017

⌛️ Testing commit e3654e1 with merge 065f500...

bors-servo added a commit that referenced this pull request Apr 11, 2017
Add support for Visual Studio 2017

This adds support for Visual Studio 2017.
Also need update cmake to 3.7.2.

r? @larsbergstrom

Can you please upload [this cmake](https://www.dropbox.com/s/3b2z36jj4gh4qpk/cmake-3.7.2.zip?dl=0) to s3 bucket?

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/16307)
<!-- Reviewable:end -->
@bors-servo

This comment has been minimized.

Copy link
Contributor

bors-servo commented Apr 11, 2017

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css, mac-rel-wpt1, mac-rel-wpt2, windows-msvc-dev
Approved by: larsbergstrom
Pushing 065f500 to master...

@bors-servo bors-servo merged commit e3654e1 into servo:master Apr 11, 2017
2 of 3 checks passed
2 of 3 checks passed
continuous-integration/appveyor/pr Waiting for AppVeyor build to complete
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@atouchet atouchet mentioned this pull request Aug 20, 2017
4 of 8 tasks complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
You can’t perform that action at this time.