Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Version 7.4.0
Version 7.4.0
  • Loading branch information
msevestre committed Jan 9, 2019
2 parents f992f38 + 7520434 commit 6016127
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
2 changes: 2 additions & 0 deletions CONTRIBUTING.md
Expand Up @@ -5,6 +5,8 @@ Here are some ways ***you*** can contribute:

* by submitting new ideas or features
* by submitting new models
* by providing use cases for the platform qualification
* by writing tutorials
* by reporting bugs
* by fixing bugs
* by implementing new features (e.g. new algorithms)
Expand Down
9 changes: 3 additions & 6 deletions appveyor.yml
@@ -1,7 +1,4 @@
environment:
app_version: '7.3.0'

version: '%app_version%.{build}'
version: '7.4.0.{build}'

install:
- cmd: set PATH=C:\Ruby22\bin;%PATH%
Expand All @@ -12,9 +9,9 @@ install:
Copy-Item c:\netfx462.exe .
- ps: >-
(new-object net.webclient).DownloadFile('http://go.microsoft.com/fwlink/?LinkId=746571', 'C:\\vc_redist.x86.exe')
(new-object net.webclient).DownloadFile('http://go.microsoft.com/fwlink/?LinkId=746572', 'C:\\vc_redist.x64.exe')
Copy-Item C:\vc_redist.x86.exe .
Copy-Item C:\vc_redist.x64.exe .
- ps: >-
(new-object net.webclient).DownloadFile('https://github.com/Open-Systems-Pharmacology/MiKTeX/releases/download/v2.9.3/MikTex.2.9.3.msi', 'C:\\MikTex.msi')
Expand Down
5 changes: 3 additions & 2 deletions rakefile.rb
Expand Up @@ -29,8 +29,8 @@
VARIABLES[:ProductVersion] = @product_version
VARIABLES[:ProductFullVersion] = @product_full_version

MSI[:pksim] = create_package('pk-sim', 'PK-Sim', 'setup.zip', @product_version, 'hotfix/7.2.1')
MSI[:mobi] = create_package('mobi', 'MoBi', 'setup.zip', @product_version, 'hotfix/7.2.1')
MSI[:pksim] = create_package('pk-sim', 'PK-Sim')
MSI[:mobi] = create_package('mobi', 'MoBi')
MSI[:matlab] = create_package('matlab-toolbox', 'Matlab-Toolbox')
MSI[:r] = create_package('r-toolbox', 'R-Toolbox')
MSI[:validator] = create_package('installationvalidator', 'InstallationValidator')
Expand Down Expand Up @@ -110,6 +110,7 @@ def create_setup(compressed:'yes', output_name:'OSPSuite')

def prepare_msi(msi)
package = MSI[msi]

file = download package
puts file
package[:file_name] = retrieve_package_name(file, package)
Expand Down
6 changes: 3 additions & 3 deletions setup/bundle.wxs
Expand Up @@ -9,7 +9,7 @@
<WixVariable Id="WixStdbaLicenseRtf" Value="EULA.rtf" />
<WixVariable Id="WixStdbaLogo" Value="Banner.png" />

<Variable Name="InstallFolder" Type="string" Value="[ProgramFilesFolder]"/>
<Variable Name="InstallFolder" Type="string" Value="[ProgramFiles64Folder]"/>
<Chain>
<ExePackage
Id="netfx462"
Expand All @@ -23,13 +23,13 @@
/>

<ExePackage
SourceFile="vc_redist.x86.exe"
SourceFile="vc_redist.x64.exe"
InstallCommand='/q '
Vital="yes"
Compressed="$(var.Compressed)"
PerMachine="yes"
Permanent="yes"
DownloadUrl="http://go.microsoft.com/fwlink/?LinkId=746571"
DownloadUrl="http://go.microsoft.com/fwlink/?LinkId=746572"
>
<!-- Ignore "Newer version installed" error -->
<ExitCode Value="1638" Behavior="success"/>
Expand Down

0 comments on commit 6016127

Please sign in to comment.