-
Notifications
You must be signed in to change notification settings - Fork 296
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[vcpkg-artifacts] Fix end to end development. (#586)
* [vcpkg-artifacts] Fix end to end development. Thanks to @fearthecowboy for help on this one. I considered ripping out the rush dependency, since it seems like we are only ever going to have one meaningful "project", and the dependency deduplication we need seems to be already done by pnpm (rather than npm), but after talking with @fearthecowboy I've decided to not go there since we still have rush linking the test project in. Unfortunately, there does not appear to be an effiicent way to build the typescript parts out-of-source, since they depend on node_modules which is put into the source tree. This adds a vcpkg.ps1 which does the same "environment hacking" as the in-development ce.ps1, teaches CMakeLists.txt to invoke rush and the typescript compiler as necessary, and teaches vcpkg.exe to use a hard-coded-into-the-binary path to the source tree when that in-development setting is turned on. The previous "always download latest ce bits" behavior is retained for folks who build vcpkg.exe from source and don't want to arrange for node and rush to be available. * format * Add better messages during build. * Guard VCPKG_ARTIFACTS_DEVELOPMENT for a recent enough CMake to not trigger infinite loops. * Fix initial call to rush rebuild needed to make incremental build work afterwards. * Fix generating vcpkg.ps1 on Linux. * Add prerequisites instructions. * Make ps1 executable. * Add dependencies on the node_modules directory. * Use ALL instead of add_dependencies.
- Loading branch information
1 parent
a8bd864
commit 426593e
Showing
8 changed files
with
325 additions
and
18 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,136 @@ | ||
| { | ||
| "configurations": [ | ||
| { | ||
| "name": "x64-Debug", | ||
| "generator": "Ninja", | ||
| "configurationType": "Debug", | ||
| "inheritEnvironments": [ "msvc_x64_x64" ], | ||
| "buildRoot": "${projectDir}\\out\\build\\${name}", | ||
| "installRoot": "${projectDir}\\out\\install\\${name}", | ||
| "cmakeCommandArgs": "", | ||
| "buildCommandArgs": "", | ||
| "ctestCommandArgs": "", | ||
| "variables": [ | ||
| { | ||
| "name": "VCPKG_ARTIFACTS_DEVELOPMENT", | ||
| "value": "True", | ||
| "type": "BOOL" | ||
| }, | ||
| { | ||
| "name": "VCPKG_BUILD_TLS12_DOWNLOADER", | ||
| "value": "True", | ||
| "type": "BOOL" | ||
| }, | ||
| { | ||
| "name": "VCPKG_BUILD_BENCHMARKING", | ||
| "value": "True", | ||
| "type": "BOOL" | ||
| }, | ||
| { | ||
| "name": "VCPKG_BUILD_FUZZING", | ||
| "value": "True", | ||
| "type": "BOOL" | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "name": "x64-Release", | ||
| "generator": "Ninja", | ||
| "configurationType": "RelWithDebInfo", | ||
| "buildRoot": "${projectDir}\\out\\build\\${name}", | ||
| "installRoot": "${projectDir}\\out\\install\\${name}", | ||
| "cmakeCommandArgs": "", | ||
| "buildCommandArgs": "", | ||
| "ctestCommandArgs": "", | ||
| "inheritEnvironments": [ "msvc_x64_x64" ], | ||
| "variables": [ | ||
| { | ||
| "name": "VCPKG_ARTIFACTS_DEVELOPMENT", | ||
| "value": "True", | ||
| "type": "BOOL" | ||
| }, | ||
| { | ||
| "name": "VCPKG_BUILD_TLS12_DOWNLOADER", | ||
| "value": "True", | ||
| "type": "BOOL" | ||
| }, | ||
| { | ||
| "name": "VCPKG_BUILD_BENCHMARKING", | ||
| "value": "True", | ||
| "type": "BOOL" | ||
| }, | ||
| { | ||
| "name": "VCPKG_BUILD_FUZZING", | ||
| "value": "True", | ||
| "type": "BOOL" | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "name": "x86-Debug", | ||
| "generator": "Ninja", | ||
| "configurationType": "Debug", | ||
| "inheritEnvironments": [ "msvc_x86_x64" ], | ||
| "buildRoot": "${projectDir}\\out\\build\\${name}", | ||
| "installRoot": "${projectDir}\\out\\install\\${name}", | ||
| "cmakeCommandArgs": "", | ||
| "buildCommandArgs": "", | ||
| "ctestCommandArgs": "", | ||
| "variables": [ | ||
| { | ||
| "name": "VCPKG_ARTIFACTS_DEVELOPMENT", | ||
| "value": "True", | ||
| "type": "BOOL" | ||
| }, | ||
| { | ||
| "name": "VCPKG_BUILD_TLS12_DOWNLOADER", | ||
| "value": "True", | ||
| "type": "BOOL" | ||
| }, | ||
| { | ||
| "name": "VCPKG_BUILD_BENCHMARKING", | ||
| "value": "True", | ||
| "type": "BOOL" | ||
| }, | ||
| { | ||
| "name": "VCPKG_BUILD_FUZZING", | ||
| "value": "True", | ||
| "type": "BOOL" | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "name": "x86-Release", | ||
| "generator": "Ninja", | ||
| "configurationType": "RelWithDebInfo", | ||
| "buildRoot": "${projectDir}\\out\\build\\${name}", | ||
| "installRoot": "${projectDir}\\out\\install\\${name}", | ||
| "cmakeCommandArgs": "", | ||
| "buildCommandArgs": "", | ||
| "ctestCommandArgs": "", | ||
| "inheritEnvironments": [ "msvc_x86_x64" ], | ||
| "variables": [ | ||
| { | ||
| "name": "VCPKG_ARTIFACTS_DEVELOPMENT", | ||
| "value": "True", | ||
| "type": "BOOL" | ||
| }, | ||
| { | ||
| "name": "VCPKG_BUILD_TLS12_DOWNLOADER", | ||
| "value": "True", | ||
| "type": "BOOL" | ||
| }, | ||
| { | ||
| "name": "VCPKG_BUILD_BENCHMARKING", | ||
| "value": "True", | ||
| "type": "BOOL" | ||
| }, | ||
| { | ||
| "name": "VCPKG_BUILD_FUZZING", | ||
| "value": "True", | ||
| "type": "BOOL" | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.