Fixes #161 PK-Sim portable #235
Conversation
…tings if not found on the system
appveyor-nightly.yml
Outdated
| @@ -45,6 +45,7 @@ before_build: | |||
| after_build: | |||
| - rake "create_setup[%APPVEYOR_BUILD_VERSION%, %CONFIGURATION%, C:/smartxls.zip, 2.6.2.9]" | |||
| - 7z a setup.zip %APPVEYOR_BUILD_FOLDER%\setup\deploy\*.msi | |||
| - rake "create_portable_setup[%APPVEYOR_BUILD_VERSION%, %CONFIGURATION%]" | |||
There was a problem hiding this comment.
new task called on nightly
appveyor-nightly.yml
Outdated
| @@ -57,6 +58,7 @@ notifications: | |||
|
|
|||
| on_finish: | |||
| - ps: Get-ChildItem setup.zip | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name } | |||
| - ps: Get-ChildItem .\setup\portable-setup.zip | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name } | |||
| @@ -59,9 +59,6 @@ | |||
| </File> | |||
| </Component> | |||
|
|
|||
| <Component Id='log4net.config.xml' Guid='A6BF052C-E9BA-4959-82B1-5B61011A06AB'> | |||
There was a problem hiding this comment.
This file should be installed under AppData
src/PKSim.Core/CoreConstants.cs
Outdated
| public static readonly string PK_PARAMETERS_FILE = "OSPSuite.PKParameters.xml"; | ||
| public static readonly string LOG_4_NET_CONFIG_FILE = "log4net.config.xml"; | ||
| public static readonly string PRODUCT_NAME = "PK-Sim"; | ||
| public static readonly string PRODUCT_NAME_WITH_TRADEMARK = "PK-Sim�"; |
There was a problem hiding this comment.
Use the opportunity to rename some constants
| ChartLayoutTemplateFolderPath = createApplicationDataOrLocalPathForFolder(CoreConstants.APP_DATA_CHART_LAYOUT_FOLDER_NAME, CoreConstants.LOCAL_CHART_LAYOUT_FOLDER_NAME); | ||
| TEXTemplateFolderPath = createApplicationDataOrLocalPathForFolder(CoreConstants.APP_DATA_TEX_TEMPLATE_FOLDER_NAME, CoreConstants.LOCAL_TEX_TEMPLATE_FOLDER_NAME); | ||
|
|
||
| PKSimDbPath = createApplicationDataOrLocalPathForFile(CoreConstants.PK_SIM_DB_FILE); |
There was a problem hiding this comment.
Loading those guys either from AppData (first) and then from local
| @@ -14,6 +14,7 @@ public ApplicationSettingsXmlSerializer() | |||
|
|
|||
| public override void PerformMapping() | |||
| { | |||
| Map(x => x.MoBiPath); | |||
There was a problem hiding this comment.
User can now specify the Path of the MoBi executable in the app settings (will be used as fall back option if not found in registry)
There was a problem hiding this comment.
User is required to set this path before using MoBi?
Does the suite come with both apps zipped together as well?
There was a problem hiding this comment.
user is not required to set the path if using the real msi setup. This is just the fallback option when using the zip archive
The suite does not have portable options. For now, portable only available for PKSim and MoBi
There was a problem hiding this comment.
Ok, I thought if they might be zipped together, PKSim could also check a sort of 'parallel' folder for MoBi.
If they aren't distributed that way, then it's not possible.
|
|
||
| //path was specified, update the default path | ||
| if (!string.IsNullOrEmpty(dimensionFilePath)) | ||
| pksimConfiguration.DimensionFilePath = dimensionFilePath; |
There was a problem hiding this comment.
We do not need to set those guys in tests now. They can rely on the portable logic so to speak
| @@ -45,6 +45,7 @@ before_build: | |||
| after_build: | |||
| - rake "create_setup[%APPVEYOR_BUILD_VERSION%, %CONFIGURATION%, C:/smartxls.zip, 2.6.2.9]" | |||
| - 7z a setup.zip %APPVEYOR_BUILD_FOLDER%\setup\deploy\*.msi | |||
| - rake "create_portable_setup[%APPVEYOR_BUILD_VERSION%, %CONFIGURATION%, pksim-portable-setup.zip]" | |||
There was a problem hiding this comment.
there's no actual 'setup' though right?
There was a problem hiding this comment.
if you mean artifact, then yes it is pushed on appveyor
https://ci.appveyor.com/project/open-systems-pharmacology-ci/pk-sim/build/artifacts
There was a problem hiding this comment.
create_setup creates a msi.
create_portable creates a zip
It's symmetrical in that case
There was a problem hiding this comment.
you could call the rake task create_portable instead of create_portable_setup that's all. No setup is really created right?
No description provided.