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

VS 2015 support #2036

Merged
merged 3 commits into from
Jun 25, 2015
Merged

VS 2015 support #2036

merged 3 commits into from
Jun 25, 2015

Conversation

rvagg
Copy link
Member

@rvagg rvagg commented Jun 23, 2015

Continues on from #478 but against master this time

/R=@nodejs/platform-windows

if defined noprojgen goto msbuild

@rem Generate the VS project.
python configure %download_arg% %i18n_arg% %debug_arg% %nosnapshot_arg% %noetw_arg% %noperfctr_arg% --dest-cpu=%target_arch% --tag=%TAG%
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cherry-picking leftover... %nosnapshot_arg% should be %snapshot_arg%

@rvagg
Copy link
Member Author

rvagg commented Jun 23, 2015

Thanks @orangemocha, decided that they belong in a separate commit rather than amending the cherry-pick

@orangemocha
Copy link
Contributor

LGTM

@mscdex mscdex added windows Issues and PRs related to the Windows platform. build Issues and PRs related to build files or the CI. labels Jun 23, 2015
@rvagg
Copy link
Member Author

rvagg commented Jun 25, 2015

ran another CI against this and got this on win2008 only:

not ok 661 - test-timers-first-fire.js
#
#assert.js:89
#  throw new assert.AssertionError({
#        ^
#AssertionError: Timer fired early
#    at null._onTimeout (c:\workspace\iojs+pr+win\nodes\win2008r2\test\parallel\test-timers-first-fire.js:12:10)
#    at Timer.listOnTimeout (timers.js:89:15)
#timer fired in -0.6709120000000013

@Fishrock123 you're deep in timers now, does this fit into any existing context we have? I'm not sure if this has shown up before or not.

Merging regardless because this is unrelated.

orangemocha and others added 3 commits June 25, 2015 13:00
vcbuild.bat calls python configure before setting GYP_MSVS_VERSION,
so SelectVisualStudioVersion (tools\gyp\pylib\gyp\MSVSVersion.py)
defaults to 'auto' and selects VS 2005.

vcbuild sets the environment in the current shell, so this issue
would manifest itself only on the first invocation of the script
in any given shell windows.

Reviewed-By: Julien Gilli <jgilli@fastmail.fm>
PR-URL: nodejs/node-v0.x-archive#20109
PR-URL: nodejs#2036
Reviewed-By: Alexis Campailla <alexis@janeasystems.com>
PR-URL: nodejs#2036
Reviewed-By: Alexis Campailla <alexis@janeasystems.com>
@rvagg rvagg merged commit c87c34c into nodejs:master Jun 25, 2015
@rvagg rvagg deleted the msvs-2015 branch June 25, 2015 03:02
@Fishrock123
Copy link
Contributor

@rvagg Yes, that happens sometimes.

It's a minor bug somewhere very deep in windows libuv that will cause timers to occasionally fire quite early. Or something along those lines anyways. I think @orangemocha knew a bit more.

@benjamingr
Copy link
Member

Hi sorry, I just got around to installing VS2015 on my desktop yesterday. Nice work!

rvagg added a commit to rvagg/io.js that referenced this pull request Jun 25, 2015
PR-URL: nodejs#2036
Reviewed-By: Alexis Campailla <alexis@janeasystems.com>
rvagg added a commit to rvagg/io.js that referenced this pull request Jun 25, 2015
PR-URL: nodejs#2036
Reviewed-By: Alexis Campailla <alexis@janeasystems.com>
@orangemocha
Copy link
Contributor

It's a minor bug somewhere very deep in windows libuv that will cause timers to occasionally fire quite early. Or something along those lines anyways. I think @orangemocha knew a bit more.

Yes, that issue has been around for a while and that test is marked as flaky in joyent\node. nodejs/node-v0.x-archive#8960

We have been working on a fix (libuv/libuv#385), but it's still work in progress.

rvagg added a commit that referenced this pull request Jun 26, 2015
PR-URL: #2036
Reviewed-By: Alexis Campailla <alexis@janeasystems.com>
rvagg added a commit that referenced this pull request Jun 26, 2015
PR-URL: #2036
Reviewed-By: Alexis Campailla <alexis@janeasystems.com>
rvagg added a commit that referenced this pull request Jun 26, 2015
PR-URL: #2036
Reviewed-By: Alexis Campailla <alexis@janeasystems.com>
rvagg added a commit that referenced this pull request Jun 26, 2015
PR-URL: #2036
Reviewed-By: Alexis Campailla <alexis@janeasystems.com>
@rvagg rvagg mentioned this pull request Jun 30, 2015
rvagg added a commit to rvagg/io.js that referenced this pull request Jul 3, 2015
PR-URL: nodejs#2036
Reviewed-By: Alexis Campailla <alexis@janeasystems.com>
rvagg added a commit to rvagg/io.js that referenced this pull request Jul 3, 2015
PR-URL: nodejs#2036
Reviewed-By: Alexis Campailla <alexis@janeasystems.com>
rvagg added a commit that referenced this pull request Jul 3, 2015
PR-URL: #2036
PORT-PR-URL: #2101
PORT-FROM: 4208dc4
Reviewed-By: Alexis Campailla <alexis@janeasystems.com>
rvagg added a commit that referenced this pull request Jul 3, 2015
PR-URL: #2036
PORT-PR-URL: #2101
PORT-FROM: c87c34c
Reviewed-By: Alexis Campailla <alexis@janeasystems.com>
joaocgreis pushed a commit to nodejs/node-v0.x-archive that referenced this pull request Aug 24, 2015
This is a port of nodejs/node@4208dc4 .

Original commit message:

  PR-URL: nodejs/node#2036
  Reviewed-By: Alexis Campailla <alexis@janeasystems.com>

PR-URL: #25857
Reviewed-By: Alexis Campailla <alexis@janeasystems.com>
joaocgreis pushed a commit to JaneaSystems/node that referenced this pull request Sep 12, 2015
This is a port of 4208dc4 .

Original commit message:

  PR-URL: nodejs#2036
  Reviewed-By: Alexis Campailla <alexis@janeasystems.com>

This was ported to v0.10 in nodejs/node-v0.x-archive#25857
rvagg added a commit that referenced this pull request Sep 16, 2015
This is a port of 4208dc4 .

Original commit message:

  PR-URL: #2036
  Reviewed-By: Alexis Campailla <alexis@janeasystems.com>

This was ported to v0.10 in nodejs/node-v0.x-archive#25857

PR-URL: #2843
Reviewed-By: rvagg - Rod Vagg <rod@vagg.org>
Reviewed-By: orangemocha - Alexis Campailla <orangemocha@nodejs.org>
Reviewed-By: bnoordhuis - Ben Noordhuis <info@bnoordhuis.nl>
jBarz pushed a commit to ibmruntimes/node that referenced this pull request Nov 4, 2016
This is a port of 4208dc4 .

Original commit message:

  PR-URL: nodejs/node#2036
  Reviewed-By: Alexis Campailla <alexis@janeasystems.com>

This was ported to v0.10 in nodejs#25857

PR-URL: nodejs/node#2843
Reviewed-By: rvagg - Rod Vagg <rod@vagg.org>
Reviewed-By: orangemocha - Alexis Campailla <orangemocha@nodejs.org>
Reviewed-By: bnoordhuis - Ben Noordhuis <info@bnoordhuis.nl>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build Issues and PRs related to build files or the CI. windows Issues and PRs related to the Windows platform.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants