Skip to content

Commit 08fb0d5

Browse files
Yuri05Yuri05
Yuri05
and
Yuri05
authored
Fixes #116 add script for manual compilation under Linux (#117)
* Fixes #116 add script for manual compilation under Linux Fixes #115 Version of OSPSuite.SimModel.dll not properly set * Fixes #116 add script for manual compilation under Linux Fixes #115 Version of OSPSuite.SimModel.dll not properly set * Fixes #116 add script for manual compilation under Linux Fixes #115 Version of OSPSuite.SimModel.dll not properly set * Fixes #116 add script for manual compilation under Linux Fixes #115 Version of OSPSuite.SimModel.dll not properly set * Fixes #116 add script for manual compilation under Linux Fixes #115 Version of OSPSuite.SimModel.dll not properly set * Fixes #116 add script for manual compilation under Linux Fixes #115 Version of OSPSuite.SimModel.dll not properly set * Fixes #116 add script for manual compilation under Linux Fixes #115 Version of OSPSuite.SimModel.dll not properly set Co-authored-by: Yuri05 <Yuri05@github.com>
1 parent 76e6b93 commit 08fb0d5

6 files changed

Lines changed: 120 additions & 11 deletions

File tree

‎appveyor.yml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,13 @@ environment:
1010

1111
version: '$(major).$(minor).$(release).{build}'
1212

13+
dotnet_csproj:
14+
patch: true
15+
file: '**\*.csproj'
16+
assembly_version: '$(app_version)'
17+
file_version: '$(app_version)'
18+
informational_version: '$(app_version)'
19+
1320
build_script:
1421
# windows
1522
- cmd: msbuild OSPSuite.SimModel.sln /property:Configuration=Debug;Platform=x64 /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
@@ -37,9 +44,10 @@ before_build:
3744
- nuget sources add -name utility -source https://ci.appveyor.com/nuget/ospsuite-utility
3845
- nuget sources add -name funcparser -source https://ci.appveyor.com/nuget/ospsuite-funcparser
3946
- nuget sources add -name cvodes -source https://ci.appveyor.com/nuget/ospsuite-simmodel-solver-cvodes
47+
- nuget sources add -name centos -source https://ci.appveyor.com/nuget/ospsuite-centos
4048
- ps: (get-content src\OSPSuite.SimModelNative\version.h) | foreach-object {$_ -replace "RELEASE 0", "RELEASE $env:RELEASE" -replace "MAJOR 0", "MAJOR $env:MAJOR" -replace "MINOR 0", "MINOR $env:MINOR" -replace "BUILD 0", "BUILD $env:APPVEYOR_BUILD_NUMBER"} | set-content src\OSPSuite.SimModelNative\version.h
4149
- sh: nuget install packages.config -OutputDirectory packages -ExcludeVersion
42-
- dotnet restore --source https://ci.appveyor.com/nuget/ospsuite-simmodel-solver-cvodes --source https://ci.appveyor.com/nuget/ospsuite-funcparser --source https://ci.appveyor.com/nuget/ospsuite-bddhelper --source https://ci.appveyor.com/nuget/ospsuite-utility --source https://www.nuget.org/api/v2/
50+
- dotnet restore --source https://ci.appveyor.com/nuget/ospsuite-centos --source https://ci.appveyor.com/nuget/ospsuite-simmodel-solver-cvodes --source https://ci.appveyor.com/nuget/ospsuite-funcparser --source https://ci.appveyor.com/nuget/ospsuite-bddhelper --source https://ci.appveyor.com/nuget/ospsuite-utility --source https://www.nuget.org/api/v2/
4351
- dotnet add tests/OSPSuite.SimModel.Tests/OSPSuite.SimModel.Tests.csproj package Appveyor.TestLogger --version 2.0.0
4452
# linux: remove all native c++ projects and test application from the solution
4553
- sh: dotnet sln OSPSuite.SimModel.sln remove src/OSPSuite.SimModelNative/OSPSuite.SimModelNative.vcxproj

‎buildLinux.sh‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
#! /bin/sh
2+
3+
#call: buildLinux.sh distributionName version
4+
# e.g. buildLinux.sh CentOS7 4.0.0.49
5+
6+
rm -f OSPSuite.SimModel4Linux.sln
7+
8+
git submodule update --init --recursive
9+
nuget sources add -name bddhelper -source https://ci.appveyor.com/nuget/ospsuite-bddhelper
10+
nuget sources add -name utility -source https://ci.appveyor.com/nuget/ospsuite-utility
11+
nuget sources add -name funcparser -source https://ci.appveyor.com/nuget/ospsuite-funcparser
12+
nuget sources add -name cvodes -source https://ci.appveyor.com/nuget/ospsuite-simmodel-solver-cvodes
13+
nuget sources add -name centos -source https://ci.appveyor.com/nuget/ospsuite-centos
14+
15+
rm -rf packages/*$1*
16+
nuget install packages.config -OutputDirectory packages -ExcludeVersion
17+
dotnet restore --source https://ci.appveyor.com/nuget/ospsuite-simmodel-solver-cvodes --source https://ci.appveyor.com/nuget/ospsuite-funcparser --source https://ci.appveyor.com/nuget/ospsuite-bddhelper --source https://ci.appveyor.com/nuget/ospsuite-utility --source https://www.nuget.org/api/v2/
18+
19+
# copy the original solution file because it will be modified for dotnet build
20+
cp -p -f OSPSuite.SimModel.sln OSPSuite.SimModel4Linux.sln
21+
22+
dotnet sln OSPSuite.SimModel4Linux.sln remove src/OSPSuite.SimModelNative/OSPSuite.SimModelNative.vcxproj
23+
dotnet sln OSPSuite.SimModel4Linux.sln remove src/OSPSuite.SysTool/OSPSuite.SysTool.vcxproj
24+
dotnet sln OSPSuite.SimModel4Linux.sln remove src/OSPSuite.XMLWrapper/OSPSuite.XMLWrapper.vcxproj
25+
dotnet sln OSPSuite.SimModel4Linux.sln remove tests/TestAppNetCore/TestAppNetCore.csproj
26+
27+
cmake -BBuild/Release/x64/ -Hsrc/OSPSuite.SimModelNative/ -DCMAKE_BUILD_TYPE=Release -DFuncParserDir=Build/Release/x64/
28+
cp packages/OSPSuite.FuncParser.$1/OSPSuite.FuncParserNative/bin/native/x64/Release/libOSPSuite.FuncParserNative.so Build/Release/x64/
29+
cp packages/OSPSuite.SimModelSolver_CVODES.$1/OSPSuite.SimModelSolver_CVODES/bin/native/x64/Release/libOSPSuite.SimModelSolver_CVODES.so Build/Release/x64/
30+
make -C Build/Release/x64/
31+
dotnet build OSPSuite.SimModel4Linux.sln /property:Configuration=Release;Platform=x64
32+
33+
cmake -BBuild/Debug/x64/ -Hsrc/OSPSuite.SimModelNative/ -DCMAKE_BUILD_TYPE=Debug -DFuncParserDir=Build/Debug/x64/
34+
cp packages/OSPSuite.FuncParser.$1/OSPSuite.FuncParserNative/bin/native/x64/Debug/libOSPSuite.FuncParserNative.so Build/Debug/x64/
35+
cp packages/OSPSuite.SimModelSolver_CVODES.$1/OSPSuite.SimModelSolver_CVODES/bin/native/x64/Debug/libOSPSuite.SimModelSolver_CVODES.so Build/Debug/x64/
36+
make -C Build/Debug/x64/
37+
dotnet build OSPSuite.SimModel4Linux.sln /property:Configuration=Debug;Platform=x64
38+
39+
#optionally: run tests
40+
#export LD_LIBRARY_PATH=Build/Release/x64/:$LD_LIBRARY_PATH
41+
#dotnet test --no-build --no-restore --configuration:Release --verbosity normal
42+
43+
nuget pack src/OSPSuite.SimModel/OSPSuite.SimModel.$1.nuspec -version $2

‎packages.config‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="OSPSuite.SimModelSolver_CVODES" version="4.1.0.7" />
4-
<package id="OSPSuite.SimModelSolver_CVODES.Ubuntu18" version="4.1.0.7" />
5-
<package id="OSPSuite.FuncParser" version="4.0.0.49" />
6-
<package id="OSPSuite.FuncParser.Ubuntu18" version="4.0.0.49" />
3+
<package id="OSPSuite.SimModelSolver_CVODES" version="4.1.0.8" />
4+
<package id="OSPSuite.SimModelSolver_CVODES.Ubuntu18" version="4.1.0.8" />
5+
<package id="OSPSuite.SimModelSolver_CVODES.CentOS7" version="4.1.0.8" />
6+
<package id="OSPSuite.FuncParser" version="4.0.0.50" />
7+
<package id="OSPSuite.FuncParser.Ubuntu18" version="4.0.0.50" />
8+
<package id="OSPSuite.FuncParser.CentOS7" version="4.0.0.50" />
79
</packages>

‎src/OSPSuite.SimModel/OSPSuite.SimModel.CentOS7.nuspec‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
<?xml version="1.0"?>
2+
<package >
3+
<metadata>
4+
<description>Calculation engine for models built with PK-Sim® or MoBi®</description>
5+
<id>OSPSuite.SimModel.CentOS7</id>
6+
<version>$version$</version>
7+
<title>OSPSuite.SimModel</title>
8+
<authors>Open-Systems-Pharmacology</authors>
9+
<owners>Open-Systems-Pharmacology</owners>
10+
<projectUrl>https://github.com/Open-Systems-Pharmacology/OSPSuite.SimModel</projectUrl>
11+
<licenseUrl>https://github.com/Open-Systems-Pharmacology/OSPSuite.SimModel/blob/master/LICENSE</licenseUrl>
12+
<iconUrl>https://raw.githubusercontent.com/Open-Systems-Pharmacology/Suite/master/logo.png</iconUrl>
13+
<requireLicenseAcceptance>false</requireLicenseAcceptance>
14+
<copyright>Copyright © 2020 - Open Systems Pharmacology Community</copyright>
15+
<tags>open-systems-pharmacology</tags>
16+
</metadata>
17+
<files>
18+
<file src="..\..\Build\Debug\x64\libOSPSuite.SimModelNative.so" target="OSPSuite.SimModelNative\bin\native\x64\Debug" />
19+
20+
<file src="..\..\Build\Release\x64\libOSPSuite.SimModelNative.so" target="OSPSuite.SimModelNative\bin\native\x64\Release" />
21+
22+
<file src="bin\Release\netstandard2.0\OSPSuite.SimModel.dll" target="lib\netstandard2.0" />
23+
<file src="bin\Release\netstandard2.0\OSPSuite.SimModel.pdb" target="lib\netstandard2.0" />
24+
25+
<file src="..\OSPSuite.SimModelNative\include\**\*.h" target="OSPSuite.SimModelNative\include" />
26+
<file src="..\OSPSuite.SimModelNative\src\**\*.*" target="OSPSuite.SimModelNative\src" />
27+
<file src="..\OSPSuite.SimModelNative\*.*" target="OSPSuite.SimModelNative" exclude="..\OSPSuite.SimModelNative\*.vcxproj*" />
28+
29+
<file src="..\OSPSuite.SimModelSolverBase\src\OSPSuite.SimModelSolverBase\include\**\*.h" target="OSPSuite.SimModelSolverBase\include" />
30+
<file src="..\OSPSuite.SimModelSolverBase\src\OSPSuite.SimModelSolverBase\src\**\*.*" target="OSPSuite.SimModelSolverBase\src" />
31+
<file src="..\OSPSuite.SimModelSolverBase\src\OSPSuite.SimModelSolverBase\*.*" target="OSPSuite.SimModelSolverBase" exclude="..\OSPSuite.SimModelSolverBase\*.vcxproj*" />
32+
33+
<file src="..\OSPSuite.SysTool\include\**\*.h" target="OSPSuite.SysTool\include" />
34+
<file src="..\OSPSuite.SysTool\src\**\*.*" target="OSPSuite.SysTool\src" />
35+
<file src="..\OSPSuite.SysTool\*.*" target="OSPSuite.SysTool" exclude="..\OSPSuite.SysTool\*.vcxproj*" />
36+
37+
<file src="..\OSPSuite.XMLWrapper\include\**\*.h" target="OSPSuite.XMLWrapper\include" />
38+
<file src="..\OSPSuite.XMLWrapper\src\**\*.*" target="OSPSuite.XMLWrapper\src" />
39+
<file src="..\OSPSuite.XMLWrapper\*.*" target="OSPSuite.XMLWrapper" exclude="..\OSPSuite.SysTool\*.vcxproj*" />
40+
41+
</files>
42+
</package>

‎src/OSPSuite.SimModel/OSPSuite.SimModel.csproj‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,31 @@
22

33
<PropertyGroup>
44
<TargetFramework>netstandard2.0</TargetFramework>
5+
<AssemblyName>OSPSuite.SimModel</AssemblyName>
6+
<Version>1.0.0</Version>
7+
<PackageVersion>1.0.0</PackageVersion>
8+
<AssemblyVersion>1.0.0</AssemblyVersion>
9+
<FileVersion>1.0.0</FileVersion>
10+
<InformationalVersion>1.0.0.0</InformationalVersion>
11+
<PackageProjectUrl>https://github.com/Open-Systems-Pharmacology/OSPSuite.SimModel</PackageProjectUrl>
12+
<PackageIconUrl>https://raw.githubusercontent.com/Open-Systems-Pharmacology/Suite/master/logo.png</PackageIconUrl>
13+
<RepositoryUrl>https://github.com/Open-Systems-Pharmacology/OSPSuite.SimModel</RepositoryUrl>
14+
<PackageTags>open-systems-pharmacology, ospsuite-components</PackageTags>
15+
<Description>Calculation engine for models built with PK-Sim® or MoBi®</Description>
16+
<Authors>Open Systems Pharmacology Community</Authors>
17+
<Company>Open Systems Pharmacology Community</Company>
18+
<Copyright>© Open Systems Pharmacology Community 2020</Copyright>
519
</PropertyGroup>
620

721
<PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">
822
<DefineConstants>_WINDOWS</DefineConstants>
923
</PropertyGroup>
1024

1125
<ItemGroup>
12-
<PackageReference Include="OSPSuite.FuncParser" Version="4.0.0.49" />
13-
<PackageReference Include="OSPSuite.FuncParser.Ubuntu18" Version="4.0.0.49" />
14-
<PackageReference Include="OSPSuite.SimModelSolver_CVODES" Version="4.1.0.7" />
15-
<PackageReference Include="OSPSuite.SimModelSolver_CVODES.Ubuntu18" Version="4.1.0.7" />
26+
<PackageReference Include="OSPSuite.FuncParser" Version="4.0.0.50" />
27+
<PackageReference Include="OSPSuite.FuncParser.Ubuntu18" Version="4.0.0.50" />
28+
<PackageReference Include="OSPSuite.SimModelSolver_CVODES" Version="4.1.0.8" />
29+
<PackageReference Include="OSPSuite.SimModelSolver_CVODES.Ubuntu18" Version="4.1.0.8" />
1630
<PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
1731
</ItemGroup>
1832

‎src/properties/common.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ImportGroup Label="PropertySheets" />
44
<PropertyGroup Label="UserMacros">
5-
<FuncParserVersion>4.0.0.49</FuncParserVersion>
6-
<SolverVersion>4.1.0.7</SolverVersion>
5+
<FuncParserVersion>4.0.0.50</FuncParserVersion>
6+
<SolverVersion>4.1.0.8</SolverVersion>
77
<FuncParserPath>$(SolutionDir)packages\OSPSuite.FuncParser.$(FuncParserVersion)\OSPSuite.FuncParserNative\</FuncParserPath>
88
<SolverPath>$(SolutionDir)packages\OSPSuite.SimModelSolver_CVODES.$(SolverVersion)\OSPSuite.SimModelSolver_CVODES\</SolverPath>
99
</PropertyGroup>

0 commit comments

Comments
 (0)