[scripts-audit] nmake buildsystem#20987
Merged
strega-nil-ms merged 6 commits intomicrosoft:masterfrom Nov 5, 2021
Merged
Conversation
hoping not to make too many changes, just minor simplifications
Neumann-A
reviewed
Oct 25, 2021
51 tasks
There was a problem hiding this comment.
This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout 2169ab765b49cfc5cd7eddfc8ff3e579326776f8 -- versions
./vcpkg x-add-version --allDiff
diff --git a/versions/baseline.json b/versions/baseline.json
index 08c5a89..a77d586 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2338,7 +2338,7 @@
},
"gdal": {
"baseline": "3.3.2",
- "port-version": 1
+ "port-version": 2
},
"gdcm": {
"baseline": "3.0.7",
diff --git a/versions/g-/gdal.json b/versions/g-/gdal.json
index af74f90..f16bf4c 100644
--- a/versions/g-/gdal.json
+++ b/versions/g-/gdal.json
@@ -1,5 +1,10 @@
{
"versions": [
+ {
+ "git-tree": "70e38b6c708d5daa8299f6f1cc88162d5af913f2",
+ "version-semver": "3.3.2",
+ "port-version": 2
+ },
{
"git-tree": "6e90412cd51170a5ea63a0067005bb3afc3c6c36",
"version-semver": "3.3.2",
dg0yt
reviewed
Oct 26, 2021
Contributor
dg0yt
left a comment
There was a problem hiding this comment.
Wouldn't it make sense to also set ENV{LIB}? Finding libs matching release/debug is needed in most ports.
Contributor
|
FTR I'm about to touch most nmake builds near port gdal, to use pkg-config for dependencies. If you need improvements in argument usage, document what is needed. Or provide a new vcpkg-nmake port to be adopted during port updates. |
Contributor
|
@dg0yt it may make sense, but this is not a behavior changing PR in order to make it easier to merge. |
Contributor
|
I keep looking at the source to verify what variables it passes to nmake via command line or environment. Shouldn't this be in the documentation? (How could I know that there is a INSTALLDIR variable?) |
Contributor
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
BillyONeal
approved these changes
Nov 3, 2021
| if(NOT _bn_LOGFILE_ROOT) | ||
| set(_bn_LOGFILE_ROOT "build") | ||
| if(arg_NO_DEBUG) | ||
| message(WARNING "NO_DEBUG argument to ${CMAKE_CURRENT_FUNCTION} is deprecated") |
Member
There was a problem hiding this comment.
Suggested change
| message(WARNING "NO_DEBUG argument to ${CMAKE_CURRENT_FUNCTION} is deprecated") | |
| message(WARNING "The NO_DEBUG argument to ${CMAKE_CURRENT_FUNCTION} is deprecated") | |
| else() | ||
| set(MAKEFILE_NAME ${_bn_PROJECT_NAME}) | ||
| if(arg_ADD_BIN_TO_PATH) | ||
| message(WARNING "ADD_BIN_TO_PATH argument to ${CMAKE_CURRENT_FUNCTION} is deprecated - it never did anything") |
Member
There was a problem hiding this comment.
Suggested change
| message(WARNING "ADD_BIN_TO_PATH argument to ${CMAKE_CURRENT_FUNCTION} is deprecated - it never did anything") | |
| message(WARNING "ADD_BIN_TO_PATH argument to ${CMAKE_CURRENT_FUNCTION} is deprecated - it had no effect") | |
| endif() | ||
|
|
||
| if(NOT VCPKG_HOST_IS_WINDOWS) | ||
| message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} only support windows.") |
Member
There was a problem hiding this comment.
Suggested change
| message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} only support windows.") | |
| message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} only supports windows") | |
dg0yt
reviewed
Nov 3, 2021
| else() | ||
| set(MAKEFILE_NAME ${_bn_PROJECT_NAME}) | ||
| if(arg_ADD_BIN_TO_PATH) | ||
| message(WARNING "ADD_BIN_TO_PATH argument to ${CMAKE_CURRENT_FUNCTION} is deprecated - it never did anything") |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
These are all simplifications and should not introduce changes in behavior, except for minor or obviously wrong cases (not restoring ENV{CL} after a debug build, for example)