-
Notifications
You must be signed in to change notification settings - Fork 6.6k
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
[exprtk] Update ExprTk #29665
[exprtk] Update ExprTk #29665
Conversation
There was a problem hiding this 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!
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout 93895b28ea7bc8cda10f156c5d336f3fc070f8b1 -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/e-/exprtk.json b/versions/e-/exprtk.json
index 473d7cc..8ca616b 100644
--- a/versions/e-/exprtk.json
+++ b/versions/e-/exprtk.json
@@ -1,5 +1,10 @@
{
"versions": [
+ {
+ "git-tree": "664a8f5fac8595c858e17ba9fed7192cca8e0ba7",
+ "version-date": "2023-01-01",
+ "port-version": 2
+ },
{
"git-tree": "f643b034afeb28a7e39b6556eb78594aa49181a4",
"version-date": "2022-01-01",
Please get failure logs here. Please ping me if you need any help. |
There was a problem hiding this 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!
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout 93895b28ea7bc8cda10f156c5d336f3fc070f8b1 -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/baseline.json b/versions/baseline.json
index 3086fce..550a2c9 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2302,7 +2302,7 @@
},
"exprtk": {
"baseline": "2023-01-01",
- "port-version": 2
+ "port-version": 0
},
"ezc3d": {
"baseline": "1.4.7",
diff --git a/versions/e-/exprtk.json b/versions/e-/exprtk.json
index 473d7cc..8842ca8 100644
--- a/versions/e-/exprtk.json
+++ b/versions/e-/exprtk.json
@@ -1,5 +1,10 @@
{
"versions": [
+ {
+ "git-tree": "9a56c38bc29871ea06f03153e11df006bb05d3cc",
+ "version-date": "2023-01-01",
+ "port-version": 0
+ },
{
"git-tree": "f643b034afeb28a7e39b6556eb78594aa49181a4",
"version-date": "2022-01-01",
@JonLiu1993 I'm not sure how to handle the following error as it seems to be related to another package and not ExprTk:
Any ideas on how to proceed? |
vtk depends on exprtk, and the update of exprtk makes the port that depends on it cannot find the "2.7" version port when looking for exprtk
|
Do not update version files manually. Instead, run vcpkg x-add-versions
Seems like a bug in vtk. In "CMake/FindExprTk" there is a hard-coded search for a regex starting with "static const char* ", however exprtk changed that to "static char_cptr version" in a recent commit. |
@6ziv - yeah I agree it seems to be a kludge to pull the version... Also VTK seems have its own copy of ExprTk: @spyridon97 would you happen to have any suggestions for this issue? Perhaps VTK could pull ExprTk via vcpkg? |
@ArashPartow I'd suggest patching the vtk port like this attachment. Maybe we can also patch ExprTk (maybe put the original line in comment, so it can still be matched by cmake regex search?), but it seem so strange... |
In VTK we have a third party repo of exprtk https://gitlab.kitware.com/third-party/exprtk, in this repo we ahve the master branch which basically the same thing as https://github.com/ArashPartow/exprtk (at some point when we pulled) and the for/vtk branch in which we add some very small changes as you can see here so that it can be understood as an internal vtk module without conflict https://gitlab.kitware.com/third-party/exprtk/-/commits/for/vtk. @ArashPartow Would you like us to synchronize our master branch with your github branch again and rebase our for/vtk branch based on the updated master branch? |
@spyridon97 Agreed, I think it would be a good idea to update the VTK's ExprTk repo. https://github.com/Kitware/VTK/blob/master/CMake/FindExprTk.cmake#L23-L25
The whole regex approach to getting the version needs to be rethought, at the very least the regex should perhaps be in the form of:
The following PR should resolve the above issue: |
/azp run |
Azure Pipelines successfully started running 1 pipeline(s). |
/azp run |
Azure Pipelines successfully started running 1 pipeline(s). |
Depends on #29955. |
@JonLiu1993 I see, ok can we please have #30058 be merged |
@ArashPartow, thanks for your contribution, don't worry, if ci passes, we will merge as soon as possible after review. |
Pinging @ArashPartow for response. Is work still being done for this PR? |
Depends on #30058. |
Convert this PR to draft since there is no progress. Please ping us if this PR is ready for review again. |
Closing this PR since there is no progress for a few months. Feel free to open a new PR if you are still working on it |
Hi @ArashPartow, I can't reopened this PR, since the Repo had been deleted, please submit a new PR instead. |
this PR is waiting for the following PR to be merged: #29955