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.

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

[zeroc-ice] correct windows-static and linux #24169

Merged
merged 5 commits into from
Apr 18, 2022

Conversation

strega-nil-ms
Copy link
Contributor

@strega-nil-ms strega-nil-ms commented Apr 15, 2022

This marks windows & staticcrt unsupported in zeroc-ice, and makes sure the mcpp library is actually installed as mcpp, not mcppd on non-Windows (to allow zeroc-ice to find it)

Tested installing zeroc-ice[*] on arm64-osx

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.

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

Use the version scheme "version" instead of "version-string" in port "mcpp".

After committing all other changes, the version database must be updated
git add -u && git commit
git checkout 2437383eb0ce6e72383a30303392c385b27440f3 -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/baseline.json b/versions/baseline.json
index 37298df..1cf0739 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4430,7 +4430,7 @@
     },
     "mcpp": {
       "baseline": "2.7.2.14",
-      "port-version": 3
+      "port-version": 4
     },
     "mdns": {
       "baseline": "1.4.1",
@@ -7658,7 +7658,7 @@
     },
     "zeroc-ice": {
       "baseline": "3.7.7",
-      "port-version": 0
+      "port-version": 1
     },
     "zeromq": {
       "baseline": "4.3.4",
diff --git a/versions/m-/mcpp.json b/versions/m-/mcpp.json
index 695c914..245d2db 100644
--- a/versions/m-/mcpp.json
+++ b/versions/m-/mcpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "0cdeb8c8241ce51308314911a2bf2b003fb894e7",
+      "version-string": "2.7.2.14",
+      "port-version": 4
+    },
     {
       "git-tree": "beca539b781c4a50d092a4b02e9b2af455f14b40",
       "version-string": "2.7.2.14",
diff --git a/versions/z-/zeroc-ice.json b/versions/z-/zeroc-ice.json
index f0e580b..6b96fc5 100644
--- a/versions/z-/zeroc-ice.json
+++ b/versions/z-/zeroc-ice.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e05ce0ff5ef744114ed88f09f702eccac310f9e3",
+      "version": "3.7.7",
+      "port-version": 1
+    },
     {
       "git-tree": "bdb180069d461c04c1eee1a7937afa63d0ea752b",
       "version": "3.7.7",

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

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/mcpp/portfile.cmake

You have modified or added at least one vcpkg.json where a "license" field is missing.

If you feel able to do so, please consider adding a "license" field to the following files:

  • ports/mcpp/vcpkg.json

Valid values for the license field can be found in the documentation

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.

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/mcpp/portfile.cmake

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.

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/mcpp/portfile.cmake

@bold84
Copy link
Contributor

bold84 commented Apr 16, 2022

@strega-nil This PR fixes the static CRT issue: #24066

@FrankXie05 FrankXie05 added category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist info:internal This PR or Issue was filed by the vcpkg team. labels Apr 18, 2022
@strega-nil-ms strega-nil-ms changed the title [zeroc-ice,mcpp] correct windows-static and linux [zeroc-ice] correct windows-static and linux Apr 18, 2022
Copy link
Member

@BillyONeal BillyONeal left a comment

Choose a reason for hiding this comment

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

The mcppd_fix.patch is complete gibberish to me but the rest looks correct and the changes here look like they would explode in PR build if they were bogus

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.

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

Error: Local changes detected for zeroc-ice but no changes to version or port version.
-- Version: 3.7.7#1
-- Old SHA: 19ff4530f3b42bfdc6d83f2fd3aca166dcb7aae8
-- New SHA: f32e4c338e25d36018095348e632c794b13fc513
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***

@strega-nil-ms strega-nil-ms merged commit 06a5137 into microsoft:master Apr 18, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist info:internal This PR or Issue was filed by the vcpkg team.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants