From cb727b7a27e74beca33b0d74777c1a2cc7375acc Mon Sep 17 00:00:00 2001
From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Fri, 21 Sep 2018 22:48:17 +0300
Subject: [PATCH] Install openmodelica on top of branded sysdyn product

gitlab #33
---
 releng/JenkinsFiles/Jenkinsfile-sysdyn-om | 31 ++-------------------
 releng/JenkinsFiles/install-om.sh         | 33 +++++++++++++++++++++++
 2 files changed, 35 insertions(+), 29 deletions(-)
 create mode 100755 releng/JenkinsFiles/install-om.sh

diff --git a/releng/JenkinsFiles/Jenkinsfile-sysdyn-om b/releng/JenkinsFiles/Jenkinsfile-sysdyn-om
index 1a416f36..720290ba 100644
--- a/releng/JenkinsFiles/Jenkinsfile-sysdyn-om
+++ b/releng/JenkinsFiles/Jenkinsfile-sysdyn-om
@@ -4,37 +4,10 @@ pipeline {
         stage ('Build and possible publish product to web') {
             steps {
                 sh '''#!/bin/bash
-                    PKG=Simantics-Desktop-win32.win32.x86_64
+                    PKG=Simantics-Sysdyn-win32.win32.x86_64
                     TGT=Simantics-Sysdyn-OM-win32.win32.x86_64
 
-                    echo "Download current desktop product"
-                    wget -nv http://www.simantics.org/download/${BRANCH}/${PKG}.zip
-
-                    echo "Unzip Desktop product"
-                    unzip -q -d ${PKG} ${PKG}.zip
-
-                    echo "Install Sysdyn feature into unzipped product"
-                    /opt/eclipse/eclipse -noSplash \
-                        -application org.eclipse.equinox.p2.director \
-                        -repository https://www.simantics.org/download/${BRANCH}/sysdyn/p2.site/ \
-                        -installIU org.simantics.sysdyn.internal.p2.feature.group \
-                        -tag AddSysdyn \
-                        -destination ${PKG} \
-                        -profile DefaultProfile || exit -1
-
-                    echo "Install OpenModelica"
-                    /opt/eclipse/eclipse -noSplash \
-                        -application org.eclipse.equinox.p2.director \
-                        -repository https://www.simantics.org/download/master/openmodelica/p2.site/ \
-                        -installIU org.simantics.om.feature.group \
-                        -tag AddOpenModelica \
-                        -destination ${PKG} \
-                        -profile DefaultProfile || exit -1
-    
-                    echo "Re-package product"
-                    mv -v ${PKG} ${TGT}
-                    7z a -tzip ${TGT}.zip ${TGT} > /dev/null
-                    rm -rf ${PKG}.zip ${TGT}
+                    bash ./install-om.sh ${BRANCH} ${PKG} ${TGT}
     
                     if [ -n "${PUBLISH_PRODUCT}" ]; then
                         PRODUCT_PUBLISH_DIR=/var/www/http-www.simantics.org/download/${BRANCH}/sysdyn/products
diff --git a/releng/JenkinsFiles/install-om.sh b/releng/JenkinsFiles/install-om.sh
new file mode 100755
index 00000000..99246616
--- /dev/null
+++ b/releng/JenkinsFiles/install-om.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+BRANCH=$1
+PKG=$2
+TGT=$3
+
+echo "Download sysdyn product"
+wget -nv http://www.simantics.org/download/${BRANCH}/sysdyn/products/${PKG}.zip
+
+echo "Unzip sysdyn product"
+unzip -q -d ${PKG} ${PKG}.zip
+
+#echo "Install Sysdyn feature into unzipped product"
+#/opt/eclipse/eclipse -noSplash \
+#    -application org.eclipse.equinox.p2.director \
+#    -repository https://www.simantics.org/download/${BRANCH}/sysdyn/p2.site/ \
+#    -installIU org.simantics.sysdyn.internal.p2.feature.group \
+#    -tag AddSysdyn \
+#    -destination ${PKG} \
+#    -profile DefaultProfile || exit -1
+
+echo "Install OpenModelica"
+/opt/eclipse/eclipse -noSplash \
+    -application org.eclipse.equinox.p2.director \
+    -repository https://www.simantics.org/download/master/openmodelica/p2.site/ \
+    -installIU org.simantics.om.feature.group \
+    -tag AddOpenModelica \
+    -destination ${PKG} \
+    -profile DefaultProfile || exit -1
+    
+echo "Re-package product"
+mv -v ${PKG} ${TGT}
+7z a -tzip ${TGT}.zip ${TGT} > /dev/null
+rm -rf ${PKG}.zip ${TGT}
-- 
2.47.1