From bd0e46546150e02a8e4895c27a138322b729234b Mon Sep 17 00:00:00 2001
From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Mon, 24 Sep 2018 11:52:40 +0300
Subject: [PATCH] Third try for sysdyn setup pipeline

gitlab #34

(cherry picked from commit 0509ec2c29f547e54951a26db2ca7b7cde8a0bda)
---
 releng/JenkinsFiles/Jenkinsfile-sysdyn-setup | 28 +++++++++++++++-----
 releng/inno-setup/sysdyn.iss                 |  4 +--
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/releng/JenkinsFiles/Jenkinsfile-sysdyn-setup b/releng/JenkinsFiles/Jenkinsfile-sysdyn-setup
index a9569ae8..6273c329 100644
--- a/releng/JenkinsFiles/Jenkinsfile-sysdyn-setup
+++ b/releng/JenkinsFiles/Jenkinsfile-sysdyn-setup
@@ -1,20 +1,34 @@
 pipeline {
     agent { label 'windows' }
     stages  {
-        stage ('Build installer') {
+        stage ('Build Sysdyn Without OpenModelica installer') {
             agent { label 'windows' }
             steps {
                 powershell '''
                     $ProgressPreference = "silentlyContinue"
-                    $branch = $Env:BRANCH
-                    wget "http://www.simantics.org/download/$branch/sysdyn/products/Simantics-Sysdyn-win32.win32.x86_64.zip" -UseBasicParsing
-                    Expand-Archive ./Simantics-Sysdyn-win32.win32.x86_64.zip -DestinationPath sysdyn
-                    iscc releng/inno-setup/sysdyn.iss
+                    wget "http://www.simantics.org/download/${Env:BRANCH}/sysdyn/products/Simantics-Sysdyn-win32.win32.x86_64.zip" -OutFile sysdyn.zip
+                    Expand-Archive .\sysdyn.zip -DestinationPath releng\inno-setup\sysdyn
+                    robocopy /MIR C:\jenkins\jre8\win32.x86_64 releng\inno-setup\sysdyn\jre
+                    iscc releng\inno-setup\sysdyn.iss
                 '''
-                archiveArtifacts artifacts: 'output/*.exe', fingerprint: false
+                archiveArtifacts artifacts: 'releng/inno-setup/output/*.exe', fingerprint: false
             }
         }
-        stage ('Publish installer') {
+        stage ('Build Sysdyn with OpenModelica installer') {
+            agent { label 'windows' }
+            steps {
+                powershell '''
+                    $ProgressPreference = "silentlyContinue"
+                    wget "http://www.simantics.org/download/${Env:BRANCH}/sysdyn/products/Simantics-Sysdyn-OM-win32.win32.x86_64.zip" -OutFile sysdyn.zip
+                    Expand-Archive .\sysdyn.zip -DestinationPath releng/inno-setup/sysdyn
+                    robocopy /MIR C:\jenkins\jre8\win32.x86_64 releng\inno-setup\sysdyn\jre
+                    iscc releng\inno-setup\sysdyn.iss
+                    move releng\inno-setup\output\Sysdyn-1.35.0.exe releng\inno-setup\output\Sysdyn-OM-1.35.0.exe
+                '''
+                archiveArtifacts artifacts: 'releng/inno-setup/output/*.exe', fingerprint: false
+            }
+        }
+        stage ('Publish installers') {
             agent { label 'master' }
             steps {
                 sh '''#!/bin/bash
diff --git a/releng/inno-setup/sysdyn.iss b/releng/inno-setup/sysdyn.iss
index bba5a8fa..185e012f 100644
--- a/releng/inno-setup/sysdyn.iss
+++ b/releng/inno-setup/sysdyn.iss
@@ -17,7 +17,7 @@ OutputDir=output
 Source: "sysdyn/*"; DestDir: "{app}"; Flags: recursesubdirs createallsubdirs
 
 [Icons]
-Name: "{group}\Simantics System Dynamics"; Filename: "{app}\Simantics Desktop.exe"
+Name: "{group}\Simantics System Dynamics"; Filename: "{app}\Simantics-Sysdyn.exe"
 
 [Messages]
 SelectDirBrowseLabel=To continue, click Next. If you would like to select a different folder, click Browse.%nThe target path may not contain space characters or be longer than 45 characters.
@@ -34,4 +34,4 @@ begin
       MsgBox('The target installation path may not contain space characters or be longer than 45 characters.', mbError, MB_OK);
     end;
   end;
-end;
\ No newline at end of file
+end;
-- 
2.47.1