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

Add msys2/mingw CI build for the external libraries #37

Merged
merged 26 commits into from
Jul 29, 2021

Conversation

adrpo
Copy link
Contributor

@adrpo adrpo commented Jun 15, 2021

This PR adds a CI build for the external libraries on mingw. [It previously just added the binaries directly].

Partially fixes #29.

@tbeu
Copy link
Contributor

tbeu commented Jul 13, 2021

Thanks for the PR. As libexpat was updated by (8a68ebd) I'd like to ask you if you could add a Appveyor CI to build the mingw32/64 libs there. Having it as integrated CI would be of greater value than just updating the libs occasionally. Thanks again.

@adrpo
Copy link
Contributor Author

adrpo commented Jul 14, 2021

Sure. I don't have too much experience with Appveyor CI but I'll see what I can do.

@tbeu
Copy link
Contributor

tbeu commented Jul 14, 2021

I think I can provide teh initial setup. Would be good to have it before end of month such that i can update the MoCo paper. Thanks.

@adrpo
Copy link
Contributor Author

adrpo commented Jul 14, 2021

I will try using msys2 package as explained here: https://docs.travis-ci.com/user/reference/windows/#how-do-i-use-msys2.
Will update my PR with it soon.

@tbeu
Copy link
Contributor

tbeu commented Jul 14, 2021

Initial setup might be tricky: Have a look at https://github.com/tbeu/matio/blob/master/.appveyor.yml#L133

@tbeu
Copy link
Contributor

tbeu commented Jul 18, 2021

Please rebase your branch on current master and note that libED_SSVFile was replaced by libED_XML2File with new dependency on libxml2. Thanks.

- attempt to add a msys2/mingw64 CI support for building the libraries
- surely not working properly yet, it needs more mingw64 packages installed
@adrpo adrpo force-pushed the AddMinGWOpenModelicaLibs branch from 295dc12 to 1853949 Compare July 23, 2021 19:29
@adrpo adrpo changed the title Add MinGW OpenModelica libraries Add msys2/mingw CI build for the external libraries Jul 23, 2021
@adrpo
Copy link
Contributor Author

adrpo commented Jul 23, 2021

This needs more work but I will keep working on in.

@adrpo adrpo force-pushed the AddMinGWOpenModelicaLibs branch 5 times, most recently from 4e7e99b to b5a8cc7 Compare July 24, 2021 21:50
- enable just the windows build for now until it works
- put the commands in a file to get proper errors
- add a lot of echo to understand where it goes wrong
- install more packages and both 32bit/64bit ones
@adrpo adrpo force-pushed the AddMinGWOpenModelicaLibs branch from b5a8cc7 to b358576 Compare July 24, 2021 22:13
@adrpo
Copy link
Contributor Author

adrpo commented Jul 24, 2021

At least it builds now, I'll clean it up tomorrow or so and then request a review.

.travis.yml Outdated Show resolved Hide resolved
@tbeu
Copy link
Contributor

tbeu commented Jul 26, 2021

@adrpo I am going to release v3.0.0 latest by Friday (30/7) night. Would be good to have your build script CI merged. Thanks.

@adrpo
Copy link
Contributor Author

adrpo commented Jul 26, 2021

Agreed, will play with it tomorrow.

@tbeu
Copy link
Contributor

tbeu commented Jul 28, 2021

Some issues with paths (tar and upload).

@tbeu
Copy link
Contributor

tbeu commented Jul 28, 2021

Can we put the binaries to Library/win32/gcc810 and Library/win64/gcc810 which would be compliant with MLS 3.4?

@adrpo
Copy link
Contributor Author

adrpo commented Jul 28, 2021

Seems to be OK with the spec: https://specification.modelica.org/maint/3.5/functions.html#annotations-for-external-libraries-and-include-files
I am unsure if we support this layout in OpenModelica but I will check. I know that we support mingw64 and mingw32 at the same level with win32 and win64.

@tbeu
Copy link
Contributor

tbeu commented Jul 28, 2021

I am unsure if we support this layout in OpenModelica but I will check. I know that we support mingw64 and mingw32 at the same level with win32 and win64.

I can try with symlinks.

@adrpo
Copy link
Contributor Author

adrpo commented Jul 29, 2021

I think I found what the problem is, the build is building in a specific directory and the upload script is called from the top level, will fix it.

@adrpo
Copy link
Contributor Author

adrpo commented Jul 29, 2021

You already fixed it, I have some other way of fixing it without the cd, basically using the path to the upload file:
$mingw32 ./upload-to-bitbucket.sh tbeu $BBPASS /tbeu/downloads/downloads ./ExternData/Resources/Library/$PLATFORM/ExternData_$PLATFORM.tar.xz

Should I push my change or just leave yours?

@tbeu
Copy link
Contributor

tbeu commented Jul 29, 2021

Hang on, I am about to fix it.

@adrpo
Copy link
Contributor Author

adrpo commented Jul 29, 2021

Ok. Let me know if you need anything more.

@adrpo
Copy link
Contributor Author

adrpo commented Jul 29, 2021

Note that you cannot do:

$mingw64 cd someplace
$mingw64 copy from someplace

as each command starts from the top again, it has no previous context, so do:

$mingw64 cd someplace && copy from someplace

@tbeu
Copy link
Contributor

tbeu commented Jul 29, 2021

Can we use cmd or ps1 from https://bitbucket.org/swyter/bitbucket-curl-upload-to-repo-downloads/src/default/ for the uploads as it gives syntax errors otherwise?

@tbeu
Copy link
Contributor

tbeu commented Jul 29, 2021

@tbeu
Copy link
Contributor

tbeu commented Jul 29, 2021

Sorry, I cancelled your build as we will run out of credits to soon then.

@adrpo
Copy link
Contributor Author

adrpo commented Jul 29, 2021

No problem. I will check on my computer if is works fine on my local mingw.

@adrpo
Copy link
Contributor Author

adrpo commented Jul 29, 2021

With the latest changes it seems to be working fine on my computer. You can try to run it again tomorrow, sorry I had so many tentative changes, is hard to test properly otherwise.

@overtaker overtaker force-pushed the AddMinGWOpenModelicaLibs branch from 86cfde4 to 01e6925 Compare July 29, 2021 18:39
@overtaker overtaker force-pushed the AddMinGWOpenModelicaLibs branch from 37697ec to 65cecd5 Compare July 29, 2021 20:01
@overtaker overtaker force-pushed the AddMinGWOpenModelicaLibs branch from 65cecd5 to f119903 Compare July 29, 2021 20:07
@tbeu
Copy link
Contributor

tbeu commented Jul 29, 2021

It still gives "error: missing arguments :(" when uploading. I have no more clue,

@overtaker overtaker merged commit 9dd2d93 into modelica-3rdparty:master Jul 29, 2021
@tbeu
Copy link
Contributor

tbeu commented Jul 29, 2021

All merged. Thanks a lot!

@tbeu
Copy link
Contributor

tbeu commented Jul 29, 2021

An this is today's usage statistics:

image

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

Successfully merging this pull request may close these issues.

OpenModelica
3 participants