Changeset 13263

Timestamp:

2012-10-08T22:54:59+02:00 (12 years ago)

Author:

adrpo

Message:

• more improvements, ssh copy to build.

File:

• installers/windows/OpenModelicaSetup/BuildWindowsRelease.sh (modified) (7 diffs)

installers/windows/OpenModelicaSetup/BuildWindowsRelease.sh

@@ -1 @@
-#!/bin/bash -x
-# script to build the OpenModelica release
+#!/bin/bash -xe
+# script to build the OpenModelica nightly-build
 # Adrian Pop [adrian.pop@liu.se]
 # 2012-10-08
@@ -11 +11 @@
 #  jdk
 
+# get the ssh password via command line
+export SSHUSER=$1
 
 # set the path to our tools
@@ -24 +26 @@
 # update OMDev
 cd /c/OMDev/
-svn up
+svn up . --accept theirs-full
 
 # update OpenModelica
 cd /c/dev/OpenModelica
-svn up
+svn up . --accept theirs-full
 # get the revision
 export REVISION=`svn info | grep "Revision:" | cut -d " " -f 2`
@@ -47 +49 @@
 # update OpenModelicaSetup
 cd /c/dev/OpenModelica/Compiler/OpenModelicaSetup
-svn up
+svn up . --accept theirs-full
 
 # build OpenModelica
+#cd /c/dev/OpenModelica
+#make -f 'Makefile.omdev.mingw' clean
 cd /c/dev/OpenModelica
-make -f Makefile.omdev.mingw clean
-make -f Makefile.omdev.mingw omc
-make -f Makefile.omdev.mingw install-python
+make -f 'Makefile.omdev.mingw' all
+cd /c/dev/OpenModelica
+make -f 'Makefile.omdev.mingw' install-python
 
 # build the .qm files from .ts files for OMEdit
@@ -61 +65 @@
 # build the installer
 cd /c/dev/OpenModelica/Compiler/OpenModelicaSetup
-makensisw /V4 OpenModelicaSetup.nsi
+makensis OpenModelicaSetup.nsi
 # move the installer
 mv OpenModelica.exe ${FILE_PREFIX}.exe
@@ -72 +76 @@
 export DATESTR=`date +"%Y-%m-%d_%H-%M"`
 echo "Automatic build of OpenModelica by testwin.openmodelica.org at date: ${DATESTR} from revision: ${REVISION}" >> ${FILE_PREFIX}-README.txt
+echo " " >> ${FILE_PREFIX}-README.txt
 echo "Read OpenModelica-*-ChangeLog.txt for more info on changes." >> ${FILE_PREFIX}-README.txt
+echo " " >> ${FILE_PREFIX}-README.txt
 echo "See also (match revision ${REVISION} to build jobs):" >> ${FILE_PREFIX}-README.txt
 echo "  https://test.openmodelica.org/hudson/" >> ${FILE_PREFIX}-README.txt
 echo "  http://test.openmodelica.org/~marsj/MSL31/BuildModelRecursive.html" >> ${FILE_PREFIX}-README.txt
 echo "  http://test.openmodelica.org/~marsj/MSL32/BuildModelRecursive.html" >> ${FILE_PREFIX}-README.txt
+echo " " >> ${FILE_PREFIX}-README.txt
 cat >> ${FILE_PREFIX}-README.txt <<DELIMITER
 *Instructions to prepare test information if you find a bug:*
@@ -115 +122 @@
 echo "  https://test.openmodelica.org/hudson/" >> ${FILE_PREFIX}-testsuite-trace.txt
 
+ls -lah ${PREFIX}
+
+cd ${PREFIX}
+# move the last nightly build to the older location
+ssh ${SSHUSER}@build.openmodelica.org <<ENDSSH
+#commands to run on remote host
+cd public_html/omc/builds/windows/nightly-builds/
+mv -f OpenModelica* older/
+ENDSSH
+scp OpenModelica* ${SSHUSER}@build.openmodelica.org:public_html/omc/builds/windows/nightly-builds/