Skip to content

Suggest support expressions#21502

Closed
autoantwort wants to merge 2 commits intomicrosoft:masterfrom
autoantwort:suggest-support-expressions
Closed

Suggest support expressions#21502
autoantwort wants to merge 2 commits intomicrosoft:masterfrom
autoantwort:suggest-support-expressions

Conversation

@autoantwort
Copy link
Contributor

As an alternative to #21489

@JackBoosY JackBoosY added the category:vcpkg-feature The issue is a new capability of the tool that doesn’t already exist and we haven’t committed label Nov 18, 2021
@autoantwort autoantwort force-pushed the suggest-support-expressions branch from b203c5c to 6ecc096 Compare November 18, 2021 02:42
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You have modified or added at least one portfile where deprecated functions are used.

Details

If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake -> vcpkg_cmake_install (from port vcpkg-cmake)
vcpkg_build_cmake -> vcpkg_cmake_build (from port vcpkg-cmake)
vcpkg_configure_cmake -> vcpkg_cmake_configure (Please remove the option PREFER_NINJA) (from port vcpkg-cmake)
vcpkg_fixup_cmake_targets -> vcpkg_cmake_config_fixup (from port vcpkg-cmake-config)

In the ports that use the new function, you have to add the corresponding dependencies:

{
  "name": "vcpkg-cmake",
  "host": true
},
{
  "name": "vcpkg-cmake-config",
  "host": true
}

The following files are affected:

  • ports/avisynthplus/portfile.cmake
If you feel able to do so, please remove `vcpkg_fail_port_install(...)` function calls and replace them with a equivalent [`supports` expressions](https://github.com/microsoft/vcpkg/blob/master/docs/users/manifests.md#supports) in the following `vcpkg.json` files: - `ports/avisynthplus/portfile.cmake`

@JackBoosY JackBoosY added the requires:vcpkg-team-review This PR or issue requires someone on the vcpkg team to take a further look. label Nov 18, 2021
@autoantwort autoantwort force-pushed the suggest-support-expressions branch from 6ecc096 to 7308774 Compare November 18, 2021 02:46
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You have modified or added at least one portfile where deprecated functions are used.

Details

If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake -> vcpkg_cmake_install (from port vcpkg-cmake)
vcpkg_build_cmake -> vcpkg_cmake_build (from port vcpkg-cmake)
vcpkg_configure_cmake -> vcpkg_cmake_configure (Please remove the option PREFER_NINJA) (from port vcpkg-cmake)
vcpkg_fixup_cmake_targets -> vcpkg_cmake_config_fixup (from port vcpkg-cmake-config)

In the ports that use the new function, you have to add the corresponding dependencies:

{
  "name": "vcpkg-cmake",
  "host": true
},
{
  "name": "vcpkg-cmake-config",
  "host": true
}

The following files are affected:

  • ports/avisynthplus/portfile.cmake

If you feel able to do so, please remove vcpkg_fail_port_install(...) function calls and replace them with a equivalent supports expressions in the following vcpkg.json files:

  • ports/avisynthplus/portfile.cmake

@autoantwort autoantwort force-pushed the suggest-support-expressions branch from 7308774 to eceec41 Compare November 18, 2021 02:49
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You have modified or added at least one portfile where deprecated functions are used.

Details

If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake -> vcpkg_cmake_install (from port vcpkg-cmake)
vcpkg_build_cmake -> vcpkg_cmake_build (from port vcpkg-cmake)
vcpkg_configure_cmake -> vcpkg_cmake_configure (Please remove the option PREFER_NINJA) (from port vcpkg-cmake)
vcpkg_fixup_cmake_targets -> vcpkg_cmake_config_fixup (from port vcpkg-cmake-config)

In the ports that use the new function, you have to add the corresponding dependencies:

{
  "name": "vcpkg-cmake",
  "host": true
},
{
  "name": "vcpkg-cmake-config",
  "host": true
}

The following files are affected:

  • ports/avisynthplus/portfile.cmake

If you feel able to do so, please remove vcpkg_fail_port_install(...) function calls and replace them with an equivalent supports expressions in the following vcpkg.json files:

  • ports/avisynthplus/portfile.cmake

@autoantwort autoantwort force-pushed the suggest-support-expressions branch from eceec41 to ae80c89 Compare November 18, 2021 02:50
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You have modified or added at least one portfile where deprecated functions are used.

Details

If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake -> vcpkg_cmake_install (from port vcpkg-cmake)
vcpkg_build_cmake -> vcpkg_cmake_build (from port vcpkg-cmake)
vcpkg_configure_cmake -> vcpkg_cmake_configure (Please remove the option PREFER_NINJA) (from port vcpkg-cmake)
vcpkg_fixup_cmake_targets -> vcpkg_cmake_config_fixup (from port vcpkg-cmake-config)

In the ports that use the new function, you have to add the corresponding dependencies:

{
  "name": "vcpkg-cmake",
  "host": true
},
{
  "name": "vcpkg-cmake-config",
  "host": true
}

The following files are affected:

  • ports/avisynthplus/portfile.cmake

If you feel able to do so, please remove vcpkg_fail_port_install(...) function calls and replace them with an equivalent supports expression in the following vcpkg.json files:

  • ports/avisynthplus/portfile.cmake

@autoantwort autoantwort force-pushed the suggest-support-expressions branch from ae80c89 to 01656e3 Compare November 18, 2021 02:51
@JackBoosY JackBoosY added the category:documentation To resolve the issue, documentation will need to be updated label Nov 18, 2021
@autoantwort
Copy link
Contributor Author

Any news?

@JackBoosY
Copy link
Contributor

Ping @strega-nil-ms for review this PR.

@BillyONeal
Copy link
Member

This one is "easy" enough I think we should consider just bulk fixing them and truly deprecating...

@autoantwort
Copy link
Contributor Author

There are "easy" cases, but there are also ports where there is an existing supports expression and a vcpkg_fail_port_install call, but they differ in semantics. So you have to fix all this ports manually. Currently vcpkg_fail_port_install is used in 293 ports.

@BillyONeal
Copy link
Member

There are "easy" cases, but there are also ports where there is an existing supports expression and a vcpkg_fail_port_install call, but they differ in semantics. So you have to fix all this ports manually. Currently vcpkg_fail_port_install is used in 293 ports.

I'm down to 161 remaining and they've been relatively straightforward...

BillyONeal added a commit to BillyONeal/vcpkg that referenced this pull request Jan 24, 2022
Supports expression simplified because uwp implies windows.

In support of microsoft#21502
BillyONeal added a commit that referenced this pull request Jan 24, 2022
There was no supports expression before so there is ci.baseline.txt impact.

In support of #21502
BillyONeal added a commit that referenced this pull request Jan 24, 2022
There was no supports expression so there was ci.baseline.txt impact.

In support of #21502
BillyONeal added a commit that referenced this pull request Jan 24, 2022
There was no supports expression before so there was ci.baseline.txt impact.

In support of #21502
BillyONeal added a commit that referenced this pull request Jan 24, 2022
There was no previous supports expression; I'm assuming given that the only block was for UWP that a dependency already did that.

In support of #21502
BillyONeal added a commit that referenced this pull request Jan 24, 2022
This used plain ALWAYS which is identical to `message(FATAL_ERROR`.

In support of #21502
BillyONeal added a commit that referenced this pull request Jan 24, 2022
vcpkg.json and portfile.cmake disagreed.

```
vcpkg.json:     !osx & !uwp & (linux | !static)
portfile.cmake: !osx & !uwp & (!windows | !(static | staticcrt))
```

Trying to get portfile.cmake to agree:

```
!osx & !uwp & (!windows | !(static | staticcrt))             given
!osx & !uwp & (!windows | (!static & !staticcrt))            demorgan
```

Considering !osx is earlier, I'm assuming Linux and !Windows are equivalent here:

```
!osx & !uwp & (linux | (!static & !staticcrt))               (above)
```

I'm assuming that portfile.cmake just never considered staticrt and linux, so I'm adding that condition.

In support of #21502
BillyONeal added a commit that referenced this pull request Jan 24, 2022
Separated from the bulk PR because it adds to a feature.

In support of #21502
BillyONeal added a commit that referenced this pull request Jan 24, 2022
The supports expression was missing a block for UWP that was in portfile.cmake. Also updates ci.baseline.txt.

In support of #21502
BillyONeal added a commit that referenced this pull request Jan 24, 2022
There previously was no supports expression.

In support of #21502
BillyONeal added a commit to BillyONeal/vcpkg that referenced this pull request Jan 24, 2022
Separated out because it adds supports to a feature.

In support of microsoft#21502
BillyONeal added a commit to BillyONeal/vcpkg that referenced this pull request Jan 24, 2022
There was no previous supports and there was ci.baseline.txt impact.

In support of microsoft#21502
BillyONeal added a commit to BillyONeal/vcpkg that referenced this pull request Jan 24, 2022
There was no supports expression before, and there is ci.baseline.txt impact.

In support of microsoft#21502
BillyONeal added a commit that referenced this pull request Jan 24, 2022
There was no supports expression before so this did have ci.baseline.txt impact.

In support of #21502
@BillyONeal
Copy link
Member

OK I have submitted PRs to eliminate all the calls; I would prefer to merge those then adopt #21489 (outright deprecation) instead.

strega-nil-ms pushed a commit that referenced this pull request Jan 24, 2022
* [zkpp] Remove vcpkg_fail_port_install.

There was no supports expression before, and there is ci.baseline.txt impact.

In support of #21502

* Fix flipped sense.
strega-nil-ms pushed a commit that referenced this pull request Jan 24, 2022
There was no previous supports and there was ci.baseline.txt impact.

In support of #21502
strega-nil-ms pushed a commit that referenced this pull request Jan 24, 2022
Separated out because it adds supports to a feature.

In support of #21502
strega-nil-ms pushed a commit that referenced this pull request Jan 24, 2022
Separated out because it adds a supports: to a feature.

In support of #21502
strega-nil-ms pushed a commit to BillyONeal/vcpkg that referenced this pull request Jan 24, 2022
There was no supports expression before so there was ci.baseline.txt impact.

In support of microsoft#21502
@BillyONeal
Copy link
Member

There are officially no more vcpkg_fail_port_install calls in master so I think we should do #21489 instead.

@ras0219-msft
Copy link
Contributor

ras0219-msft commented Jan 28, 2022

Agreed with @BillyONeal, closing this in favor of #21489. Thanks for the PR!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

category:documentation To resolve the issue, documentation will need to be updated category:vcpkg-feature The issue is a new capability of the tool that doesn’t already exist and we haven’t committed requires:vcpkg-team-review This PR or issue requires someone on the vcpkg team to take a further look.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants