[teemo] Fix string replace error. by winsoft666 · Pull Request #22244 · microsoft/vcpkg

winsoft666 · 2021-12-29T06:43:27Z

Describe the pull request

What does your PR fix?

Fixes string replace error.
Which triplets are supported/not supported? Have you updated the CI baseline?

<linux, windows / macos>,
Does your PR follow the maintainer guide?

Yes
If you have added/updated a port: Have you run ./vcpkg x-add-version --all and committed the result?

If you are still working on the PR, open it as a Draft: https://github.blog/2019-02-14-introducing-draft-pull-requests/

JackBoosY · 2021-12-29T08:32:46Z

I think we don't need this, do we?

winsoft666 · 2021-12-29T08:46:32Z

I think we don't need this, do we?

The old code can not replace string correctly.
If VCPKG_LIBRARY_LINKAGE is dynamic, it mistakenly replaced #ifdef TEEMO_STATIC with #if $<STREQUAL:dynamic, static>.
What I want is to replace #ifdef TEEMO_STATIC with #if 0.

winsoft666 · 2021-12-29T08:47:18Z

I think we don't need this, do we?

The old code can not replace string correctly. If VCPKG_LIBRARY_LINKAGE is dynamic, it mistakenly replaced #ifdef TEEMO_STATIC with #if $<STREQUAL:dynamic, static>. What I want is to replace #ifdef TEEMO_STATIC with #if 0.

I'm not familiar with cmake grammar.

JackBoosY · 2021-12-29T08:53:39Z

Ah you are the owner, I have some questions:

When building dynamic, should we undefine TEEMO_STATIC?
When building static, should we define TEEMO_STATIC?

winsoft666 · 2021-12-29T09:33:07Z

When building dynamic, we should undefined TEEMO_STATIC in projects that use teemo library;
When building static, we should defined TEEMO_STATIC in projects that use teemo library;

Obviously, define/undefined TEEMO_STATIC in projects that use teemo library is a good method.
However I have not found a way to automatically define/undefined TEEMO_STATIC via VCPKG.

By string substitution, it is only a stopgap measure

JackBoosY · 2021-12-29T10:02:57Z

Does there have any other places to use this macro?

winsoft666 · 2021-12-29T10:05:21Z

Does there have any other places to use this macro?

No

JackBoosY · 2021-12-29T10:26:19Z

Does there have any other places to use this macro?

No

Therefore, I think we can keep this code since there is no other place to use that:

Replace #ifdef TEEMO_STATIC to #if 1 when building static.
Replace #ifdef TEEMO_STATIC to #if 0 when building dynamic.

Do you agree that?

winsoft666 · 2021-12-29T10:41:04Z

Does there have any other places to use this macro?

No

Therefore, I think we can keep this code since there is no other place to use that:

Replace #ifdef TEEMO_STATIC to #if 1 when building static.

Replace #ifdef TEEMO_STATIC to #if 0 when building dynamic.

Do you agree that?

I don't understand what's your meaning, and keep what code?

All of my updated code is designed to do just that:

Replace #ifdef TEEMO_STATIC to #if 1 when building static.
Replace #ifdef TEEMO_STATIC to #if 0 when building dynamic.

The old code has some bug, can not replace correctly.

JackBoosY · 2021-12-29T13:27:34Z

Does there have any other places to use this macro?

No

Therefore, I think we can keep this code since there is no other place to use that:

Replace #ifdef TEEMO_STATIC to #if 1 when building static.

Replace #ifdef TEEMO_STATIC to #if 0 when building dynamic.

Do you agree that?

I don't understand what's your meaning, and keep what code?

All of my updated code is designed to do just that:

Replace #ifdef TEEMO_STATIC to #if 1 when building static.

Replace #ifdef TEEMO_STATIC to #if 0 when building dynamic.

The old code has some bug, can not replace correctly.

The current code already does this. if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") means build static, otherwise build dynamic.
Can you describe the bug you encountered?

dg0yt · 2021-12-29T14:27:09Z

The current code already does this. if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") means build static, otherwise build dynamic.
Can you describe the bug you encountered?

@JackBoosY The current substitution contains a cmake generator expression, but this expression never goes through a generation step, so it doesn't achieve the desired out come.

ports/teemo/portfile.cmake

ports/teemo/vcpkg.json

github-actions

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 05c411da6619971fd033c8a9d20c8cce07d5e42a -- versions
./vcpkg x-add-version --all

Diff

diff --git a/versions/baseline.json b/versions/baseline.json
index 88a9ff8..e89b245 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6710,7 +6710,7 @@
     },
     "teemo": {
       "baseline": "2.5",
-      "port-version": 0
+      "port-version": 1
     },
     "telnetpp": {
       "baseline": "2.1.2",
diff --git a/versions/t-/teemo.json b/versions/t-/teemo.json
index 7be73f0..5227395 100644
--- a/versions/t-/teemo.json
+++ b/versions/t-/teemo.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "5d9a099bba6f647165ff3b64e69dcc300bacfca9",
+      "version": "2.5",
+      "port-version": 1
+    },
     {
       "git-tree": "272a7ccdbd7429e98513b1d4c9c394406fa70d42",
       "version": "2.5",

JackBoosY · 2021-12-30T04:20:52Z

Oh sorry, I mixed up the deleted part and the newly added part.

ports/teemo/vcpkg.json

github-actions

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

All manifest files must be formatted

./vcpkg format-manifest ports/*/vcpkg.json

Diff

diff --git a/ports/teemo/vcpkg.json b/ports/teemo/vcpkg.json
index 02890be..755fcbf 100644
--- a/ports/teemo/vcpkg.json
+++ b/ports/teemo/vcpkg.json
@@ -2,9 +2,9 @@
   "name": "teemo",
   "version": "2.5",
   "port-version": 1,
+  "maintainers": "winsoft666 <winsoft666@outlook.com>",
   "description": "C++ File Download Library, support Multithreading, Breakpoint Transmission, Speed Limit, Real-time Speed.",
   "homepage": "https://github.com/winsoft666/teemo",
-  "maintainers": "winsoft666 <winsoft666@outlook.com>",
   "supports": "!osx & !uwp & !arm",
   "dependencies": [
     {

After committing all other changes, the version database must be updated

git add -u && git commit
git checkout 05c411da6619971fd033c8a9d20c8cce07d5e42a -- versions
./vcpkg x-add-version --all

Diff

diff --git a/versions/t-/teemo.json b/versions/t-/teemo.json
index 5227395..0b5a2ca 100644
--- a/versions/t-/teemo.json
+++ b/versions/t-/teemo.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "5d9a099bba6f647165ff3b64e69dcc300bacfca9",
+      "git-tree": "d92f8edfaa4c8a208cfa6253c6d2ebd8beeaf303",
       "version": "2.5",
       "port-version": 1
     },

versions/t-/teemo.json

JackBoosY · 2021-12-30T04:39:54Z

LGTM.

github-actions

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

All manifest files must be formatted

./vcpkg format-manifest ports/*/vcpkg.json

Diff

diff --git a/ports/teemo/vcpkg.json b/ports/teemo/vcpkg.json
index 02890be..755fcbf 100644
--- a/ports/teemo/vcpkg.json
+++ b/ports/teemo/vcpkg.json
@@ -2,9 +2,9 @@
   "name": "teemo",
   "version": "2.5",
   "port-version": 1,
+  "maintainers": "winsoft666 <winsoft666@outlook.com>",
   "description": "C++ File Download Library, support Multithreading, Breakpoint Transmission, Speed Limit, Real-time Speed.",
   "homepage": "https://github.com/winsoft666/teemo",
-  "maintainers": "winsoft666 <winsoft666@outlook.com>",
   "supports": "!osx & !uwp & !arm",
   "dependencies": [
     {

After committing all other changes, the version database must be updated

git add -u && git commit
git checkout 05c411da6619971fd033c8a9d20c8cce07d5e42a -- versions
./vcpkg x-add-version --all

Diff

diff --git a/versions/t-/teemo.json b/versions/t-/teemo.json
index 6a5f416..0b5a2ca 100644
--- a/versions/t-/teemo.json
+++ b/versions/t-/teemo.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "4d7bc3440769e15a00e84e168257bda517a9f0b2",
+      "git-tree": "d92f8edfaa4c8a208cfa6253c6d2ebd8beeaf303",
       "version": "2.5",
       "port-version": 1
     },

versions/t-/teemo.json

github-actions

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

All manifest files must be formatted

./vcpkg format-manifest ports/*/vcpkg.json

Diff

diff --git a/ports/teemo/vcpkg.json b/ports/teemo/vcpkg.json
index 02890be..755fcbf 100644
--- a/ports/teemo/vcpkg.json
+++ b/ports/teemo/vcpkg.json
@@ -2,9 +2,9 @@
   "name": "teemo",
   "version": "2.5",
   "port-version": 1,
+  "maintainers": "winsoft666 <winsoft666@outlook.com>",
   "description": "C++ File Download Library, support Multithreading, Breakpoint Transmission, Speed Limit, Real-time Speed.",
   "homepage": "https://github.com/winsoft666/teemo",
-  "maintainers": "winsoft666 <winsoft666@outlook.com>",
   "supports": "!osx & !uwp & !arm",
   "dependencies": [
     {

ports/teemo/vcpkg.json

BillyONeal · 2021-12-30T17:52:03Z

Thanks for the fix!

winsoft666 and others added 18 commits November 17, 2021 10:57

[cpp-ipc] Update 1.0.1

d47d407

[cpp-ipc] Update version and ci.baseline

38e35de

[cpp-ipc] Remove cpp-ipc from ci.baseline.txt

43ac403

Merge branch 'microsoft:master' into master

4bc049c

[teemo] Update to v2.3

334d4e6

[teemo] Run vcpkg x-add-version --all

5ad8247

[teemo] Update vcpkg.json

3dd5a49

[teemo] Run vcpkg x-add-version teemo --overwrite-version

e0b6054

Remove excess teemo.json

85a4d71

Merge branch 'microsoft:master' into master

01fbd97

[teemo] Update to v2.4

6e521e2

[teemo] run ./vcpkg x-add-version --all

c7a642b

Merge branch 'microsoft:master' into master

833fd4a

[teemo] Update to v2.5

c4827cd

[teemo] Update versions/t-/teemo.json

ccdb732

Merge branch 'microsoft:master' into master

31607be

[teemo] Fix string replace error.

af1270d

[teemo] Update port version.

40ebbb3

JackBoosY self-assigned this Dec 29, 2021

dg0yt suggested changes Dec 29, 2021

View reviewed changes

ports/teemo/portfile.cmake Show resolved Hide resolved

ports/teemo/vcpkg.json Outdated Show resolved Hide resolved

[teemo] Use port-version instead of appending #2.

12f6657

github-actions bot requested changes Dec 30, 2021

View reviewed changes

[teemo] Run 'vcpkg x-add-version --all'

57d66dc

github-actions bot approved these changes Dec 30, 2021

View reviewed changes

JackBoosY added the category:port-bug The issue is with a library, which is something the port should already support label Dec 30, 2021

JackBoosY suggested changes Dec 30, 2021

View reviewed changes

ports/teemo/vcpkg.json Show resolved Hide resolved

[teemo] Add maintainers.

d07b7e0

github-actions bot requested changes Dec 30, 2021

View reviewed changes

JackBoosY reviewed Dec 30, 2021

View reviewed changes

versions/t-/teemo.json Outdated Show resolved Hide resolved

Update versions/t-/teemo.json

10afe39

JackBoosY approved these changes Dec 30, 2021

View reviewed changes

github-actions bot requested changes Dec 30, 2021

View reviewed changes

JackBoosY reviewed Dec 30, 2021

View reviewed changes

versions/t-/teemo.json Outdated Show resolved Hide resolved

Update versions/t-/teemo.json

8cff129

github-actions bot requested changes Dec 30, 2021

View reviewed changes

JackBoosY reviewed Dec 30, 2021

View reviewed changes

ports/teemo/vcpkg.json Outdated Show resolved Hide resolved

Update ports/teemo/vcpkg.json

4c3212d

github-actions bot approved these changes Dec 30, 2021

View reviewed changes

JackBoosY added the info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. label Dec 30, 2021

winsoft666 added 2 commits December 30, 2021 12:54

[teemo] Format vcpkg.json

0973d50

Merge branch 'master' of github.com:winsoft666/vcpkg

ac9faeb

github-actions bot approved these changes Dec 30, 2021

View reviewed changes

BillyONeal merged commit 4446d54 into microsoft:master Dec 30, 2021

Conversation

winsoft666 commented Dec 29, 2021

What does your PR fix?

Which triplets are supported/not supported? Have you updated the CI baseline?

Does your PR follow the maintainer guide?

If you have added/updated a port: Have you run ./vcpkg x-add-version --all and committed the result?

Uh oh!

JackBoosY commented Dec 29, 2021

Uh oh!

winsoft666 commented Dec 29, 2021

Uh oh!

winsoft666 commented Dec 29, 2021

Uh oh!

JackBoosY commented Dec 29, 2021

Uh oh!

winsoft666 commented Dec 29, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

JackBoosY commented Dec 29, 2021

Uh oh!

winsoft666 commented Dec 29, 2021

Uh oh!

JackBoosY commented Dec 29, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

winsoft666 commented Dec 29, 2021

Uh oh!

JackBoosY commented Dec 29, 2021

Uh oh!

dg0yt commented Dec 29, 2021

Uh oh!

Uh oh!

Uh oh!

github-actions bot left a comment

Choose a reason for hiding this comment

Uh oh!

JackBoosY commented Dec 30, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

github-actions bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

JackBoosY commented Dec 30, 2021

Uh oh!

github-actions bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

BillyONeal commented Dec 30, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

If you have added/updated a port: Have you run `./vcpkg x-add-version --all` and committed the result?

winsoft666 commented Dec 29, 2021 •

edited

Loading

JackBoosY commented Dec 29, 2021 •

edited

Loading

JackBoosY commented Dec 30, 2021 •

edited

Loading