Skip to content

Commit

Permalink
Addressed failing builds (#207)
Browse files Browse the repository at this point in the history
* Conan update

* Conan update

* Conan update

* README.md update

* libcosimc bump

* README.md update

* Conanfile update
  • Loading branch information
davidhjp01 authored Sep 26, 2023
1 parent 6fe14d4 commit c341f86
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-cosim-demo-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
with:
python-version: '3.x'
- name: Install prerequisites
run: pip install conan
run: pip install conan==1.59
- name: Configure libcxx for Linux
run: |
conan profile new default --detect
Expand Down
17 changes: 13 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@ Server
------------

### Required tools
* Conan v1.59 (currently v2 is not supported)
* Go dev tools: [Golang](https://golang.org/dl/) >= 1.11
* Compiler: [MinGW-w64](https://sourceforge.net/projects/mingw-w64/?source=typ_redirect) (Windows), GCC >= 7 (Linux)
* Compiler: [MinGW-w64](https://sourceforge.net/projects/mingw-w64/?source=typ_redirect) (Windows), GCC >= 9 (Linux)
* Package managers: [Conan](https://conan.io/) and [Go Modules](https://github.com/golang/go/wiki/Modules)

Throughout this guide, we will use Conan to manage C++ dependencies. However, you can also install the C++ dependencies manually.
Expand All @@ -25,6 +26,12 @@ Install a current version and specify win32 as thread when requested. Additional
After installing it, you need to add it to the PATH environment variable (add the path where
your MinGW-w64 has been installed to e.g., C:\mingw\mingw64\bin).

Alternatively, MinGW can also be installed via [chocolatey](https://chocolatey.org/install).
Once chocolatey is installed, simply run the following command (as admin) to install MinGW:
```ps
choco install mingw
```

### Step 1: Configure Conan

First, add the OSP Conan repository as a remote and configure the username and
Expand All @@ -39,9 +46,11 @@ You can do this in two ways:
#### Alternative 1: Using Conan

From the cosim-demo-app source directory, get C/C++ dependencies using Conan:

conan install . -u -s build_type=Release -g virtualrunenv
go build
```bash
conan install . -u -s build_type=Release -g virtualrunenv
source activate_run.sh # or run activate_run.bat in windows
go build
```

To run the application on Windows:

Expand Down
9 changes: 6 additions & 3 deletions conanfile.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[generators]

[requires]
libcosimc/0.10.1@osp/stable
libcosimc/0.10.2@osp/stable

[options]
libcosim:proxyfmu=True
Expand All @@ -20,9 +20,10 @@ bin, boost_thread*.dll -> ./dist/bin
bin, cosim*.dll -> ./dist/bin
bin, fmilib_shared.dll -> ./dist/bin
bin, xerces-c*.dll -> ./dist/bin
bin, yaml-cpp.dll -> ./dist/bin
bin, yaml-cpp*.dll -> ./dist/bin
bin, zip.dll -> ./dist/bin
bin, proxyfmu* -> ./dist/bin
bin, fmilibwrapper*.dll -> ./dist/bin

lib, libboost_chrono.so.* -> ./dist/lib
lib, libboost_context.so.* -> ./dist/lib
Expand All @@ -35,8 +36,10 @@ lib, libboost_thread.so* -> ./dist/lib
lib, libcosim*.so -> ./dist/lib
lib, libfmilib_shared.so -> ./dist/lib
lib, libxerces-c*.so -> ./dist/lib
lib, libyaml-cpp.so.* -> ./dist/lib
lib, libyaml-cpp*.so.* -> ./dist/lib
lib, libzip.so* -> ./dist/lib
lib, libfmilibwrapper*.so -> ./dist/lib
lib, libproxyfmu-client*.so -> ./dist/lib

., license* -> ./dist/doc/licenses @ folder=True, ignore_case=True, keep_path=False
., */license* -> ./dist/doc/licenses @ folder=True, ignore_case=True, keep_path=False
Expand Down

0 comments on commit c341f86

Please sign in to comment.