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
PCRE2 #2138
PCRE2 #2138
Conversation
da7f980
to
c9e53a2
Compare
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.
Thanks for these changes! FWIW everything here looks good to me, but I think you also need to update the package being installed in Tools/CI-linux-install.sh
and maybe Tools/mkwindows.sh
, if it's still used.
Did you see the Github CI failures related to this change, such as:
|
d73cdc6
to
e04f11e
Compare
@jschueller thanks for taking on this change. Now that Travis tests are working, and it looks like you are figuring out the Appveyor changes, can you stop force pushing. In theory pushes to this branch changing just appveyor.yml should not (unnecessarily) do the very compute intensive GHA build because of: Lines 3 to 8 in d73f933
This is not working, but I think it is because you are force pushing. If you just add additional commits to just appveyor.yml, just the Appveyor CI should run. In my experience, it can take a lot of commits before configuring appveyor.yml correctly. You could also do this in your own github repo if you don't want us to see every small attempt at getting it right and then push the final working version here. If you need help with Appveyor, I can add it to my queue of work. |
I tested the distribution build with these changes and they work okay and the windows build seems to work with pcre2-10.39.tar.bz2. |
yes I wasnt too successful, seems like I have to build pcre from source but didtn manage to build something compatible
|
Am confused! I successfully got a Windows build. What do you want me to have a go at? BTW, I also checked that your changes to pcre-build.sh works on an Ubuntu box (this script builds pcre2 from source, run |
I had pcre built with msvc (with cmake) but then it failed to link when used in swig (a cryptic message about crt libs), |
I see. CMake is a secondary build system and not mandatory to keep working. Best left to those who rely on it to fix it. |
swig's cmake is ok, I just couldnt build an usable pcre on appveyor |
I see, but obtaining and using the dependencies are just as important as building SWIG itself. The instructions in Windows.html are meant to be a set of simple get going instructions including obtaining and using PCRE. Maybe those will help inspire what you need to do for PCRE2. |
7ca5d08
to
e1d26eb
Compare
@wsfulton I think I got it right, the only remaining appveyor failures look like in master |
Looking good. I've put in a fix for mingw on master. I missed it going wrong on 1 Jan when the mingw folk re-organised the their packages. Could you please fix the consequent conflict and push again, then hopefully appveyor testing for the pull request will go green. Note that cygwin Appveyor testing on master are marked as |
All tests passed. Yay! The only thing that really needs doing now is to patch up Windows.html to reflect the kind of changes you have put into Appveyor.yml. It's real shame that nuget does not provide a pcre2 package like it does pcre, otherwise the docs would be much easier to update. |
One last thing, we have Tools/CMake/FindPCRE.cmake and a new file FindPCRE2.cmake. Could you please remove FindPCRE.cmake and move FindPCRE2 into Tools/CMake. Tools/nuget-install.cmd can also be deleted now given since nuget is no longer used and you used appveyor-retry to do the retries. |
ok, done |
Closes #2120