Changeset 25946

Timestamp:

2016-04-06T06:33:21+02:00 (8 years ago)

Author:

adrpo

Message:

• add scripts to build both 32bit and 64bit OpenModelica on Windows

Location:

installers/windows/OpenModelicaSetup

Files:

• BuildWindowsRelease.sh (modified) (8 diffs)
• OpenModelicaSetup32bit.nsi (moved) (moved from installers/windows/OpenModelicaSetup/OpenModelicaSetup.nsi) (5 diffs)
• OpenModelicaSetup64bit.nsi (added)

installers/windows/OpenModelicaSetup/BuildWindowsRelease.sh

@@ -5 +5 @@
 #
 # expects to have these things installed:
-#  python 2.7.x (you need to run easy_install joblib simplejson requests in the cmd line in python\Scripts)
 #  nsis installer
 #  TortoiseSVN command line tools
-#  Qt 4.8.0
 #  jdk
 #  git command line clients (PUT IT LAST IN THE PATH!) http://git-scm.com/downloads
@@ -17 +15 @@
 export SSHUSER=$1
 export MAKETHREADS=$2
-export GIT_BRANCH=$3
+export PLATFORM=$3 # 32bit or 64bit
+export GIT_BRANCH=$4
 
 # set the path to our tools
-export PATH=$PATH:/c/bin/python273:/c/Program\ Files/TortoiseSVN/bin/:/c/bin/jdk/bin:/c/bin/nsis/:/c/bin/QtSDK/Desktop/Qt/4.8.0/mingw/bin:/c/bin/git/bin:
+export PATH=$PATH:/c/Program\ Files/TortoiseSVN/bin/:/c/bin/jdk/bin:/c/bin/nsis/:/c/bin/git/bin:
 
 # set the OPENMODELICAHOME and OPENMODELICALIBRARY
@@ -51 +50 @@
 # Directory prefix
 export OMC_INSTALL_PREFIX="/c/dev/OpenModelica_releases/${REVISION}/"
+# make the file prefix
+export OMC_INSTALL_FILE_PREFIX="${OMC_INSTALL_PREFIX}OpenModelica-${REVISION}-${PLATFORM}"
 
 # test if exists and exit if it does
-if [ -d "${OMC_INSTALL_PREFIX}" ]; then
-  echo "Revision ${OMC_INSTALL_PREFIX} already exists! Exiting ..."
+if [ -f "${OMC_INSTALL_FILE_PREFIX}.exe" ]; then
+  echo "Revision ${OMC_INSTALL_FILE_PREFIX}.exe already exists! Exiting ..."
   exit 0
 fi
@@ -60 +61 @@
 # create the revision directory
 mkdir -p ${OMC_INSTALL_PREFIX}
-# make the file prefix
-export OMC_INSTALL_FILE_PREFIX="${OMC_INSTALL_PREFIX}OpenModelica-${REVISION}"
 
 # update OpenModelicaSetup
@@ -72 +71 @@
 rm -rf build/
 mkdir build/
+make -f 'Makefile.omdev.mingw' ${MAKETHREADS} gitclean || true
 make -f 'Makefile.omdev.mingw' ${MAKETHREADS} clean
 cd /c/dev/OpenModelica
-echo "Building OpenModelica"
-make -f 'Makefile.omdev.mingw' ${MAKETHREADS}
-echo "Building OpenModelica libraries"
-make -f 'Makefile.omdev.mingw' ${MAKETHREADS} omlibrary-all
+echo "Building OpenModelica and OpenModelica libraries"
+make -f 'Makefile.omdev.mingw' ${MAKETHREADS} omc omc-diff omlibrary-all qtclients
 cd /c/dev/OpenModelica
 echo "Installing Python scripting"
 rm -rf OMPython
 git clone https://github.com/OpenModelica/OMPython -q -b master /c/dev/OpenModelica/OMPython
-make -f 'Makefile.omdev.mingw' ${MAKETHREADS} install-python
-#build OMClients
-echo "Cleaning OMClients"
-make -f 'Makefile.omdev.mingw' ${MAKETHREADS} clean-qtclients
-echo "Building OMClients"
-make -f 'Makefile.omdev.mingw' -j2 qtclients
+make -k -f 'Makefile.omdev.mingw' ${MAKETHREADS} install-python
 cd /c/dev/OpenModelica
 echo "Building MSVC compiled runtime"
-make -f 'Makefile.omdev.mingw' simulationruntimecmsvc
+make -f 'Makefile.omdev.mingw' ${MAKETHREADS} simulationruntimecmsvc
 echo "Building MSVC CPP runtime"
-make -f 'Makefile.omdev.mingw' BUILDTYPE=Release runtimeCPPmsvcinstall
+make -f 'Makefile.omdev.mingw' ${MAKETHREADS} BUILDTYPE=Release runtimeCPPmsvcinstall
 echo "Building CPP runtime"
-make -f 'Makefile.omdev.mingw' BUILDTYPE=Release runtimeCPPinstall
+make -f 'Makefile.omdev.mingw' ${MAKETHREADS} BUILDTYPE=Release runtimeCPPinstall
 
 # wget the html & pdf versions of OpenModelica users guide
@@ -109 +102 @@
 # build the installer
 cd /c/dev/OpenModelica/OpenModelicaSetup
-makensis OpenModelicaSetup.nsi > trace.txt 2>&1
+makensis OpenModelicaSetup${PLATFORM}.nsi > trace.txt 2>&1
 cat trace.txt
 # move the installer
-mv OpenModelica.exe ${OMC_INSTALL_FILE_PREFIX}.exe
+mv OpenModelica${PLATFORM}.exe ${OMC_INSTALL_FILE_PREFIX}.exe
 
 # gather the svn log
@@ -126 +119 @@
 echo "See also (match revision ${REVISION} to build jobs):" >> ${OMC_INSTALL_FILE_PREFIX}-README.txt
 echo "  https://test.openmodelica.org/hudson/" >> ${OMC_INSTALL_FILE_PREFIX}-README.txt
-echo "  http://test.openmodelica.org/~marsj/MSL31/BuildModelRecursive.html" >> ${OMC_INSTALL_FILE_PREFIX}-README.txt
 echo "  http://test.openmodelica.org/~marsj/MSL32/BuildModelRecursive.html" >> ${OMC_INSTALL_FILE_PREFIX}-README.txt
 echo " " >> ${OMC_INSTALL_FILE_PREFIX}-README.txt
@@ -180 +172 @@
 ssh ${SSHUSER}@build.openmodelica.org <<ENDSSH
 #commands to run on remote host
-cd public_html/omc/builds/windows/nightly-builds/
+cd public_html/omc/builds/windows/nightly-builds/${PLATFORM}/
 mv -f OpenModelica* older/
 ENDSSH
-scp OpenModelica* ${SSHUSER}@build.openmodelica.org:public_html/omc/builds/windows/nightly-builds/
+scp OpenModelica* ${SSHUSER}@build.openmodelica.org:public_html/omc/builds/windows/nightly-builds/${PLATFORM}/
 echo "All done!"

installers/windows/OpenModelicaSetup/OpenModelicaSetup32bit.nsi

@@ -2 +2 @@
 # 2011-jul-29 21:01:29
 
-Name OpenModelica1.10.0-dev
+Name OpenModelica1.10.0-dev-32bit
 
 # General Symbol Definitions
 !define REGKEY "SOFTWARE\OpenModelica"
-!define VERSION 1.10.0-dev
+!define VERSION 1.10.0-dev-32bit
 !define COMPANY "Open Source Modelica Consortium (OSMC) and Linköping University (LiU)."
 !define URL "http://www.openmodelica.org/"
@@ -103 +103 @@
   SetOutPath "$INSTDIR\bin"
   File "..\build\bin\*"
-  File /r /x "*.svn" /x "qsvgicon4.dll" "$%OMDEV%\tools\OMTools\dll\*"
-  File "$%OMDEV%\lib\omniORB-4.1.6-mingw\bin\x86_win32\omniORB416_rt.dll"
-  File "$%OMDEV%\lib\omniORB-4.1.6-mingw\bin\x86_win32\omniDynamic416_rt.dll"
-  File "$%OMDEV%\lib\omniORB-4.1.6-mingw\bin\x86_win32\omnithread34_rt.dll"
   File "..\OMCompiler\OSMC-License.txt"
   # Copy the openssl binaries
@@ -112 +108 @@
   File "bin\libssl32.dll"
   File "bin\ssleay32.dll"
-  # Create bin\iconengines directory and copy files in it
-  SetOutPath "$INSTDIR\bin\iconengines"
-  File "$%OMDEV%\tools\OMTools\dll\qsvgicon4.dll"
+  # Create bin\plugings\* directories
+  File /r /x "*.svn" "$%OMDEV%\tools\msys\mingw32\share\qt5\plugins\*"
   # Create icons directory and copy files in it
   SetOutPath "$INSTDIR\icons"
@@ -129 +124 @@
   SetOutPath "$INSTDIR\lib"
   File /r /x "*.svn" /x "*.git" "..\build\lib\*"
-  # Create MinGW directory and copy files in it
-  SetOutPath "$INSTDIR\MinGW"
-  File /r /x "*.svn" "$%OMDEV%\tools\MinGW\*"
   # Create msys directory and copy files in it
-  SetOutPath "$INSTDIR\msys"
-  File /r /x "*.svn" "$%OMDEV%\tools\msys\*"
+  SetOutPath "$INSTDIR\tools\msys"
+  File /r /x "group" /x "passwd" /x "mingw64" /x "pacman.log" "$%OMDEV%\tools\msys\*"
   # Create share directory and copy files in it
   SetOutPath "$INSTDIR\share"
@@ -181 +173 @@
 
 Section -post SEC0001
-  # create the file with InstallMode
-  FileOpen $4 "$INSTDIR\msys\etc\fstab" w
-  FileWrite $4 "$INSTDIR\MinGW   /mingw"
-  FileClose $4
+  # generate group and passwd files for this machine!
+  Exec '"$INSTDIR\tools\msys\usr\bin\mkpasswd.exe" -l -c > $INSTDIR\tools\msys\etc\passwd'
+  Exec '"$INSTDIR\tools\msys\usr\bin\mkgroup.exe" -l -c > $INSTDIR\tools\msys\etc\group'
   # do post installation actions
   WriteRegStr SHCTX "${REGKEY}" Path $INSTDIR