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

next: merge build-related commits from master #2058

Closed
wants to merge 5 commits into from

Commits on Jun 25, 2015

  1. build,win: set env before generating projects

    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
    orangemocha authored and rvagg committed Jun 25, 2015
    Configuration menu
    Copy the full SHA
    a7a4c62 View commit details
    Browse the repository at this point in the history
  2. build: add MSVS 2015 support

    PR-URL: nodejs#2036
    Reviewed-By: Alexis Campailla <alexis@janeasystems.com>
    rvagg committed Jun 25, 2015
    Configuration menu
    Copy the full SHA
    3bbabde View commit details
    Browse the repository at this point in the history
  3. build: fix cherry-pick ooops, fix comment wording

    PR-URL: nodejs#2036
    Reviewed-By: Alexis Campailla <alexis@janeasystems.com>
    rvagg committed Jun 25, 2015
    Configuration menu
    Copy the full SHA
    07d0520 View commit details
    Browse the repository at this point in the history
  4. deps: copy all openssl header files to include dir

    On upgrading openssl, all symlinks in pulic header files are replaced
    with nested include files. The issue was raised that installing them
    leads to lost its references to real header files.
    To avoid this, all public header files are copied into the
    `deps/openssl/openssl/include/openssl/` directory.
    As a result, we have duplicated header files under
    `deps/openssl/openssl/` but copied files are refereed in build as
    specified to include path in openssl.gyp.
    
    Fixes: nodejs#1975
    PR-URL: nodejs#2016
    Reviewed-By: Rod Vagg <rod@vagg.org>
    Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
    Shigeki Ohtsu authored and rvagg committed Jun 25, 2015
    Configuration menu
    Copy the full SHA
    650c8de View commit details
    Browse the repository at this point in the history
  5. build: add tar-headers target for headers-only tar

    to replace the full src download by node-gyp, using the proper format
    instead of the full source format
    
    PR-URL: nodejs#1975
    Reviewed-By: William Blankenship <william.jblankenship@gmail.com>
    Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
    rvagg committed Jun 25, 2015
    Configuration menu
    Copy the full SHA
    69ada22 View commit details
    Browse the repository at this point in the history