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

Update build components of v1.x #2101

Closed
wants to merge 9 commits into from
Closed

Update build components of v1.x #2101

wants to merge 9 commits into from

Conversation

rvagg
Copy link
Member

@rvagg rvagg commented Jul 3, 2015

This gets v1.x working on the current Jenkins setup for tests: https://jenkins-iojs.nodesource.com/job/iojs+any-pr+multi/90/ and it should also be ready for releases.

Also, OpenSSL is upgraded on this branch, I remember @shigeki did that when he did master.

https://gist.github.com/rvagg/ad60803bc1885742780b I think has the commits currently not in v1.x that are in master if anyone would like to browse them and contribute to the @nodejs/lts discussion (not that 1.8.x is LTS, but it's a good proving ground) on the threshold for backports. I haven't looked in detail but I think the only things standing out at me are @indutny's fixes for stream_wrap etc.

jbergstroem and others added 9 commits July 3, 2015 20:51
Since we aleady have a variable with path to the newly built
binary, use that instead of prefixing path. This also allows us
to pass a different path through the environment (NODE=)

PR-URL: nodejs#1955
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Rod Vagg <rod@vagg.org>
Since we will run linting before compiling or testing there's no
need to run it as part of the ci testing.

PR-URL: nodejs#1965
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Revewied-By: Evan Lucas <evanlucas@me.com>
PR-URL: nodejs#2004
Reviewed-By: Rod Vagg <rod@vagg.org>
Reviewed-By: Alexis Campailla <alexis@janeasystems.com>
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>
PR-URL: nodejs#1938
Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Alexis Campailla <alexis@janeasystems.com>
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>
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>
@bnoordhuis
Copy link
Member

Rubber-stamp LGTM.

@rvagg
Copy link
Member Author

rvagg commented Jul 3, 2015

@bnoordhuis
Copy link
Member

commits currently not in v1.x that are in master

The smalloc deprecation commits would be good to back-port but should also pull in the commits around the NODE_DEPRECATED macro.

Other candidates:

  • 85d9983 net: persist net.Socket options before connect
  • 93a44d5 src: fix deferred events not working with -e
  • 280fb01 test: fix deprecation warning in addons test
  • a4dbf45 crypto: update root certificates
  • 8357c50 fs: set encoding on fs.createWriteStream
  • 8c71a92 src: hide InitializeICUDirectory symbol
  • 75930bb tls: prevent use-after-free (plus related commits, like 9180140 _stream_wrap: prevent use after free in TLS. @indutny?)
  • a5bd466 deps: update libuv to version 1.6.1
  • 0f68377 crypto: support FIPS mode of OpenSSL
  • 4b4b176 v8: cherry-pick uclibc build patch from upstream
  • 3beb880 crypto: add cert check to CNNIC Whitelist - NOTE: change in behavior (but for the better), also needs 9e890fe crypto: fix VerifyCallback in case of verify error
  • 061342a net: Defer reading until listeners could be added (@indutny?)
  • 834a365 build: DTrace is enabled by default on darwin
  • 1cd9eeb buffer: prevent abort on bad proto
  • 1a51f00 v8: cherry-pick JitCodeEvent patch from upstream
  • 99cbbc0 tools: update gyp to 25ed9ac
  • 58e914f tools: fix gyp to work on MacOSX without XCode

@mscdex mscdex added the build Issues and PRs related to build files or the CI. label Jul 3, 2015
@Fishrock123
Copy link
Contributor

LGTM, let's discuss other possible commits in another pr / issue, or maybe #1736

jbergstroem added a commit that referenced this pull request Jul 3, 2015
Since we aleady have a variable with path to the newly built
binary, use that instead of prefixing path. This also allows us
to pass a different path through the environment (NODE=)

PR-URL: #1955
PORT-PR-URL: #2101
PORT-FROM: 1ec53c0
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Rod Vagg <rod@vagg.org>
jbergstroem added a commit that referenced this pull request Jul 3, 2015
Since we will run linting before compiling or testing there's no
need to run it as part of the ci testing.

PR-URL: #1965
PORT-PR-URL: #2101
PORT-FROM: 8d8a26e
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Revewied-By: Evan Lucas <evanlucas@me.com>
jbergstroem added a commit that referenced this pull request Jul 3, 2015
PR-URL: #2004
PORT-PR-URL: #2101
PORT-FROM: c5353d7
Reviewed-By: Rod Vagg <rod@vagg.org>
Reviewed-By: Alexis Campailla <alexis@janeasystems.com>
orangemocha added a commit that referenced this pull request Jul 3, 2015
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>
PORT-PR-URL: #2101
PORT-FROM: c0c0d73
PR-URL: nodejs/node-v0.x-archive#20109
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>
rvagg added a commit that referenced this pull request Jul 3, 2015
PR-URL: #1938
PORT-PR-URL: #2101
PORT-FROM: dcbb9e1
Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Alexis Campailla <alexis@janeasystems.com>
shigeki pushed a commit that referenced this pull request Jul 3, 2015
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: #1975
PR-URL: #2016
PORT-PR-URL: #2101
PORT-FROM: 1f371e3
Reviewed-By: Rod Vagg <rod@vagg.org>
Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
rvagg added a commit that referenced this pull request Jul 3, 2015
to replace the full src download by node-gyp, using the proper format
instead of the full source format

PR-URL: #1975
PORT-PR-URL: #2101
PORT-FROM: 628a3ab
Reviewed-By: William Blankenship <william.jblankenship@gmail.com>
Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
@Fishrock123
Copy link
Contributor

Landed in a971255...d8f260d with port metadata, cheers!

@Fishrock123 Fishrock123 closed this Jul 3, 2015
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants