win, build: generate .sln only when necessary #21284

bzoz · 2018-06-12T13:34:31Z

When generating project files, store flags passed to configure. Next time, if node.sln exists and configure flags match those stored, skip building .sln files.

Adds forceprojgen vcbuild option to force project files regeneration.

Checklist

make -j4 test (UNIX), or vcbuild test (Windows) passes
commit message follows commit guidelines

When generating sln, store flags passed to configure. Next time, if node.sln exists and configure flags match those stored, skip building .sln files. Adds forceprojgen vcbuild option to force .sln regeneration.

nodejs-github-bot · 2018-06-12T13:34:32Z

@bzoz sadly an error occured when I tried to trigger a build :(

bzoz · 2018-06-13T06:15:29Z

CI: https://ci.nodejs.org/job/node-test-pull-request/15433/

refack · 2018-06-13T12:45:12Z

vcbuild.bat

@@ -67,6 +68,7 @@ if /i "%1"=="x86"           set target_arch=x86&goto arg-ok
 if /i "%1"=="x64"           set target_arch=x64&goto arg-ok
 if /i "%1"=="vs2017"        set target_env=vs2017&goto arg-ok
 if /i "%1"=="noprojgen"     set noprojgen=1&goto arg-ok
+if /i "%1"=="forceprojgen"  set forceprojgen=1&goto arg-ok


maybe projgen? so it goes as a pair projgen/noprojgen

refack · 2018-06-13T12:50:12Z

vcbuild.bat

@@ -252,10 +254,24 @@ goto build-doc

 :project-gen
 @rem Skip project generation if requested.
-if defined noprojgen goto msbuild
+SETLOCAL EnableDelayedExpansion


If this is only needed for L262 & L263, could this be moved there? Otherwise I can see this giving someone a headache in the future.

SETLOCAL EnableDelayedExpansion set /p prev_configure_flags=<used_configure_flags if NOT !prev_configure_flags! == !configure_flags! ENDLOCAL & goto run-configure

refack · 2018-06-13T12:51:53Z

vcbuild.bat

 @rem Generate the VS project.
 echo configure %configure_flags%
+echo %configure_flags%> used_configure_flags


Can we rename the tmp file .used_configure_flags. I know this is not *nix, but git will exclude it by default, and Windows will at least group it together with the rest of the settings/temporary files.

refack · 2018-06-13T13:04:51Z

Great idea!
I'm not sure of the semver-ity since this will change the stdout of vcbuild.bat. IMHO It's semver minor, unless someone can indicate otherwise, or knows for sure of some downstream project that uses the output of python configure or vcbuild.bat?

/CC @nodejs/build-files @nodejs/platform-windows @zcbenz

seishun · 2018-06-13T13:12:56Z

What's the cost of always regenerating .sln files?

refack · 2018-06-13T13:23:58Z

What's the cost of always regenerating .sln files?

From my POV:

It overwrites manual edits
Changing the "create time" of the .sln & .vcxproj files forces MSBUILD to recompile
There's the "noise" from the configure run
Time

bzoz · 2018-06-13T16:20:07Z

@refack: updated with your comments, PTAL

Also, project files will always be generated for build-release builds.

refack

💯

refack · 2018-06-13T19:30:30Z

I'm thinking as a follow up PR to move this logic to configure, based on mtime of the .gyp? files.

richardlau · 2018-06-13T19:36:38Z

I'm thinking as a follow up PR to move this logic to configure, based on mtime of the .gyp? files.

I'd much prefer this. With this PR as it stands if you tweak a .gyp file you will need to force project files generation, which isn't documented anywhere.

refack · 2018-06-13T19:59:32Z

I'd much prefer this.

Time....

Also

tweak a .gyp file

Don't!
_{I'm obviously kidding}

refack · 2018-06-13T21:08:19Z

I'm thinking as a follow up PR to move this logic to configure, based on mtime of the .gyp? files.

I'd much prefer this.

A very rough sketch:

diff --git a/vcbuild.bat b/vcbuild.bat
index 717950bee9..a9ff3a423a 100644
--- a/vcbuild.bat
+++ b/vcbuild.bat
@@ -258,20 +258,22 @@ goto build-doc
 if defined noprojgen goto skip-configure
 if defined projgen goto run-configure
 if not exist node.sln goto run-configure
-if not exist .used_configure_flags goto run-configure
-SETLOCAL EnableDelayedExpansion
-set /p prev_configure_flags=<.used_configure_flags
-if NOT !prev_configure_flags! == !configure_flags! ENDLOCAL && goto run-configure
-ENDLOCAL
+if not exist .gyp_configure_stamp goto run-configure
+where /R . /T *.gyp? > .tmp_gyp_configure
+echo %configure_flags% >> .tmp_gyp_configure
+fc .gyp_configure_stamp .tmp_gyp_configure > NUL
+if ERRORLEVEL 1 goto run-configure

 :skip-configure
-echo Reusing solution generated with %prev_configure_flags%
+del .tmp_gyp_configure
+echo Reusing solution generated with '%prev_configure_flags%'
 goto msbuild

 :run-configure
 @rem Generate the VS project.
 echo configure %configure_flags%
-echo %configure_flags%> .used_configure_flags
+where /R . /T *.gyp? > .gyp_configure_stamp
+echo %configure_flags% >> .gyp_configure_stamp
 python configure %configure_flags%
 if errorlevel 1 goto create-msvs-files-failed
 if not exist node.sln goto create-msvs-files-failed

Unfortunately I can't test this ATM

bzoz · 2018-06-14T09:07:30Z

Added a warning message that is displayed after build fails with reused solution files:

Building Node with reused solution failed. To regenerate project files use "vcbuild projgen"

addaleax · 2018-06-14T11:38:09Z

CI: https://ci.nodejs.org/job/node-test-pull-request/15455/

BridgeAR · 2018-06-18T09:13:41Z

Is this ready to land?

bzoz · 2018-06-20T23:16:24Z

@BridgeAR: I would like to try out @refack idea (since it sounds very good) before landing this

bzoz · 2018-06-21T08:30:02Z

@refack idea worked out great, added it to the PR. PTAL.

bzoz · 2018-06-26T08:48:03Z

CI: https://ci.nodejs.org/job/node-test-pull-request/15627/

bzoz · 2018-06-26T17:12:41Z

landed in 4dece04

When generating sln, store flags passed to configure. Next time, if node.sln exists and configure flags match those stored, skip building .sln files. Adds projgen vcbuild option to force .sln regeneration. PR-URL: #21284 Reviewed-By: Refael Ackermann <refack@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>

win, build: generate .sln only when necessary

f47cb20

When generating sln, store flags passed to configure. Next time, if node.sln exists and configure flags match those stored, skip building .sln files. Adds forceprojgen vcbuild option to force .sln regeneration.

nodejs-github-bot added build Issues and PRs related to build files or the CI. meta Issues and PRs related to the general management of the project. windows Issues and PRs related to the Windows platform. labels Jun 12, 2018

refack approved these changes Jun 13, 2018

View reviewed changes

refack added the semver-minor PRs that contain new features and should be released in the next minor version. label Jun 13, 2018

refack removed the meta Issues and PRs related to the general management of the project. label Jun 13, 2018

bzoz added 2 commits June 13, 2018 18:16

fixups

db9dc09

fixup

1838d2b

fixup

7e1f3eb

refack approved these changes Jun 13, 2018

View reviewed changes

Add warning message after compilation fails

88ab8e8

refack mentioned this pull request Jun 16, 2018

build: remove requirement to re-run ./configure #21371

Closed

4 tasks

Rebuild project files if gyp files where modified

6ec5ede

jasnell approved these changes Jun 21, 2018

View reviewed changes

bzoz closed this Jun 26, 2018

targos mentioned this pull request Jul 3, 2018

v10.6.0 proposal #21629

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

win, build: generate .sln only when necessary #21284

win, build: generate .sln only when necessary #21284

bzoz commented Jun 12, 2018

nodejs-github-bot commented Jun 12, 2018

bzoz commented Jun 13, 2018

refack Jun 13, 2018

refack Jun 13, 2018

refack Jun 13, 2018

refack commented Jun 13, 2018

seishun commented Jun 13, 2018

refack commented Jun 13, 2018

bzoz commented Jun 13, 2018

refack left a comment

refack commented Jun 13, 2018

richardlau commented Jun 13, 2018

refack commented Jun 13, 2018 •

edited

Loading

refack commented Jun 13, 2018

bzoz commented Jun 14, 2018

addaleax commented Jun 14, 2018

BridgeAR commented Jun 18, 2018

bzoz commented Jun 20, 2018

bzoz commented Jun 21, 2018

bzoz commented Jun 26, 2018

bzoz commented Jun 26, 2018

win, build: generate .sln only when necessary #21284

win, build: generate .sln only when necessary #21284

Conversation

bzoz commented Jun 12, 2018

Checklist

nodejs-github-bot commented Jun 12, 2018

bzoz commented Jun 13, 2018

refack Jun 13, 2018

Choose a reason for hiding this comment

refack Jun 13, 2018

Choose a reason for hiding this comment

refack Jun 13, 2018

Choose a reason for hiding this comment

refack commented Jun 13, 2018

seishun commented Jun 13, 2018

refack commented Jun 13, 2018

bzoz commented Jun 13, 2018

refack left a comment

Choose a reason for hiding this comment

refack commented Jun 13, 2018

richardlau commented Jun 13, 2018

refack commented Jun 13, 2018 • edited Loading

refack commented Jun 13, 2018

bzoz commented Jun 14, 2018

addaleax commented Jun 14, 2018

BridgeAR commented Jun 18, 2018

bzoz commented Jun 20, 2018

bzoz commented Jun 21, 2018

bzoz commented Jun 26, 2018

bzoz commented Jun 26, 2018

refack commented Jun 13, 2018 •

edited

Loading