Yet another try at building both plain and OM installers

gitlab #34

(cherry picked from commit 4bf83b8dc068cf430bf2befb02b9095741993fb2)

diff --git a/releng/JenkinsFiles/Jenkinsfile-sysdyn-setup b/releng/JenkinsFiles/Jenkinsfile-sysdyn-setup
index c7df6ab5999ae17d760bb5d8ae265f32327c63a9..d5254f4a04fe5a931c1bd9edf7573012d1d833af 100644 (file)
--- a/releng/JenkinsFiles/Jenkinsfile-sysdyn-setup
+++ b/releng/JenkinsFiles/Jenkinsfile-sysdyn-setup
@@ -6,10 +6,16 @@ pipeline {
             steps {
                 powershell '''
                     $ProgressPreference = "silentlyContinue"
+
                     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 /NFL /NDL /NP C:/jenkins/jre8/win32.x86_64 releng/inno-setup/sysdyn/jre
                     iscc /Q releng/inno-setup/sysdyn.iss
+
+                    wget "http://www.simantics.org/download/${Env:BRANCH}/sysdyn/products/Simantics-Sysdyn-OM-win32.win32.x86_64.zip" -OutFile sysdyn-om.zip
+                    Expand-Archive ./sysdyn-om.zip -DestinationPath releng/inno-setup/sysdyn-om
+                    robocopy /MIR /NFL /NDL /NP C:/jenkins/jre8/win32.x86_64 releng/inno-setup/sysdyn-om/jre
+                    iscc /Q releng/inno-setup/sysdyn-om.iss
                 '''
                 archiveArtifacts artifacts: 'releng/inno-setup/output/*.exe', fingerprint: false
             }
@@ -18,14 +24,6 @@ pipeline {
             agent { label 'windows' }
             steps {
                 powershell '''
-                    $ProgressPreference = "silentlyContinue"
-                    rm -Recurse releng/inno-setup/sysdyn
-                    rm -Recurse releng/inno-setup/output
-                    wget "http://www.simantics.org/download/${Env:BRANCH}/sysdyn/products/Simantics-Sysdyn-OM-win32.win32.x86_64.zip" -OutFile sysdyn-om.zip
-                    Expand-Archive ./sysdyn-om.zip -DestinationPath releng/inno-setup/sysdyn
-                    robocopy /MIR /NFL /NDL /NP C:/jenkins/jre8/win32.x86_64 releng/inno-setup/sysdyn/jre
-                    iscc /Q 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
             }

diff --git a/releng/inno-setup/sysdyn-om.iss b/releng/inno-setup/sysdyn-om.iss
new file mode 100644 (file)
index 0000000..0edcd96
--- /dev/null
+++ b/releng/inno-setup/sysdyn-om.iss
@@ -0,0 +1,37 @@
+; Sysdyn setup script for Inno Setup Compiler 5.6.1 (u)
+
+[Setup]
+AppName=Simantics System Dynamics with OpenModelica
+AppVersion=1.35.0
+DefaultDirName={sd}\Sysdyn-1.35.0
+DefaultGroupName=Simantics
+Compression=lzma2
+SolidCompression=yes
+OutputBaseFilename=Sysdyn-OM-1.35.0
+AppCopyright=Copyright © 2018 Simantics Team
+DisableDirPage=no
+WizardSmallImageFile=sysdyn.bmp
+OutputDir=output-om
+
+[Files]
+Source: "sysdyn-om/*"; DestDir: "{app}"; Flags: recursesubdirs createallsubdirs
+
+[Icons]
+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.
+
+[Code]
+function NextButtonClick(CurPageID: Integer): Boolean;
+begin
+  Result := True;
+  if (CurPageID = wpSelectDir) then
+  begin
+    if ((Pos(' ', WizardDirValue) > 0) or (Length(WizardDirValue) > 45)) then
+    begin
+      Result := False;
+      MsgBox('The target installation path may not contain space characters or be longer than 45 characters.', mbError, MB_OK);
+    end;
+  end;
+end;