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.

Sign up for GitHub

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

Jump to bottom

next: merge build-related commits from master #2058

Closed
wants to merge 5 commits into from
Closed

next: merge build-related commits from master #2058

wants to merge 5 commits into from

Conversation

rvagg
Copy link
Member

@rvagg rvagg commented Jun 25, 2015

cherry-picks c0c0d73 4208dc4 c87c34c 8e9089a & 09b2cf4 from master, requesting they be merged in to next. Mostly so we can use the new make tooling for next-nightly and rc builds, also brings in the new headers work so we can be putting header tarballs up as well.

orangemocha and others added 3 commits June 25, 2015 18:57
@orangemocha @rvagg
build,win: set env before generating projects
a7a4c62 
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
@rvagg
build: add MSVS 2015 support
3bbabde 
PR-URL: nodejs#2036
Reviewed-By: Alexis Campailla <alexis@janeasystems.com>
@rvagg
build: fix cherry-pick ooops, fix comment wording
07d0520 
PR-URL: nodejs#2036
Reviewed-By: Alexis Campailla <alexis@janeasystems.com>
@rvagg
Copy link
Member Author

rvagg commented Jun 25, 2015

removed d1a47c987debf5668fd3d22ec2b3f5fa282213df (8e9089a) from the list, it's in the middle of these on master but is unrelated.

Shigeki Ohtsu and others added 2 commits June 25, 2015 19:21
@rvagg
deps: copy all openssl header files to include dir
650c8de 
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>
@rvagg
build: add tar-headers target for headers-only tar
69ada22 
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>
@mscdex mscdex added the meta Issues and PRs related to the general management of the project. label Jun 25, 2015
@bnoordhuis
Copy link
Member

Rubber-stamp LGTM.

@rvagg
Copy link
Member Author

rvagg commented Jun 26, 2015

mergified

@rvagg rvagg closed this Jun 26, 2015
@rvagg rvagg deleted the next-build-makefile branch June 26, 2015 11:26
@rvagg
Copy link
Member Author

rvagg commented Jun 26, 2015

I left out dcbb9e1 build: update build targets for io.js, probably the most important one I was trying to get in, took the initiative to force push an updated version of the commits

@rvagg
Copy link
Member Author

rvagg commented Jun 26, 2015

Binaries are out for a 3.0-pre-rc here: https://iojs.org/download/next-nightly/v2.3.1-next-nightly20150626a6bc75df31/, got a failure on Windows but I think it's temporary and something related to the signing process and a time server it needs to use for that process so I'm rebuilding those. I'd love to get #2066 in before a proper RC for 3.0 but I know that may be controversial for some.

@rvagg
Copy link
Member Author

rvagg commented Jun 26, 2015

meh, again

SignTool Error: The specified timestamp server either could not be reached or
returned an invalid response.
SignTool Error: An error occurred while attempting to sign: Release\iojs.exe

http://stackoverflow.com/questions/2872105/alternative-timestamping-services-for-authenticode

this isn't the first time I've seen this for http://timestamp.globalsign.com/scripts/timestamp.dll, is it time to switch timestamp services or implement some hacky retry logic? @nodejs/platform-windows

@orangemocha
Copy link
Contributor

If retrying for ~10secs solves the issue, I am in favor of the hack.

@aliscco aliscco mentioned this pull request Apr 28, 2023
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
meta Issues and PRs related to the general management of the project.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@rvagg @bnoordhuis @orangemocha @mscdex