diff --git a/INSTALL.txt b/INSTALL.txt
index c7bd4b8b9896259b24bb178afdcb010b0d2688a8..b94dd9c147f9ded3d33431ac940d002b4b3badda 100644
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -1,6 +1,6 @@
OMDev=OpenModelica Development Environment-MSYS2+MINGW32/MINGW64
----------------------------------------------------------------
-Adrian.Pop@liu.se, 2010-10-24, last update: 2016-09-16
+Adrian.Pop@liu.se, 2010-10-24, last update: 2020-10-28
----------------------------------------------------------------
Checkout the OMDev package:
@@ -25,15 +25,15 @@ Open windows command prompt (cmd) and run path_to_your_omdev\SETUP_OMDEV_Qt5.bat
MINGW32 or MINGW64
==================
To build 32 bit OMC you run:
-path_to_your_omdev\tools\msys\mingw32_shell.bat
+path_to_your_omdev\tools\msys\mingw32.exe
To build 64 bit OMC you run:
-path_to_your_omdev\tools\msys\mingw64_shell.bat
+path_to_your_omdev\tools\msys\mingw64.exe
ENVIRONMENT VARIABLE SETTINGS
=============================
- define a Windows environment variable called OMDEV
that points to c:\path\to\your\omdev
-- note that msys_shell.bat mingw32_shell.bat mingw64_shell.bat
+- note that msys2.exe mingw32.exe mingw64.exe
+ does not use Windows PATH varible. If you want to use the
Windows path variable define an environment varible called
MSYS2_PATH_TYPE=inherit
@@ -46,9 +46,9 @@ ENVIRONMENT VARIABLE SETTINGS
- if you want to use the msys shell from Windows command line
make sure you set MSYSTEM to one of MSYS, MINGW32, MINGW64
if you do:
- set MSYSTEM=MINGW32 you get the 32 bit GCC (mingw32_shell.bat)
- set MSYSTEM=MINGW64 you get the 64 bit GCC (mingw64_shell.bat)
- set MSYSTEM=MSYS use for updating MSYS (msys2_shell.bat)
+ set MSYSTEM=MINGW32 you get the 32 bit GCC/Clang (or via mingw32.exe)
+ set MSYSTEM=MINGW64 you get the 64 bit GCC/Clang (or via mingw64.exe)
+ set MSYSTEM=MSYS use for updating MSYS (or via msys2.exe)
Subversion and Eclipse:
=======================
@@ -60,21 +60,21 @@ MSYS setting (optional)
=======================
If you want to use msys shell make a
shortcut on your desktop to:
-path_to_your_omdev\tools\msys\msys2_shell.bat
+path_to_your_omdev\tools\msys\msys2.exe
and say it to run in:
path_to_your_omdev\tools\msys\
QT DEBUG DLLS (optional)
========================
We don't ship the debug dlls for qt5, you can reinstall the qt packages to get them.
-Start msys2 shell: path_to_your_omdev\tools\msys\msys2_shell.bat
+Start msys2 shell: path_to_your_omdev\tools\msys\msys2.exe
Type command:
> pacman -S mingw-w64-i686-qt5 mingw-w64-x86_64-qt5
OpenSceneGraph DEBUG DLLS (optional)
====================================
We don't ship the debug dlls for OSG, you can install them with the following command.
-Start msys2 shell: path_to_your_omdev\tools\msys\msys2_shell.bat
+Start msys2 shell: path_to_your_omdev\tools\msys\msys2.exe
Type command:
> pacman -S mingw-w64-i686-OpenSceneGraph-debug mingw-w64-x86_64-OpenSceneGraph-debug
diff --git a/README.txt b/README.txt
index 45c7a70ab48a361193151a75983a6065bdddbb07..d840874a5483f78bd2827ce9960356b6768b04f3 100644
--- a/README.txt
+++ b/README.txt
@@ -1,105 +1,128 @@
-OMDev=OpenModelica Development Environment
--------------------------------------------
-Adrian.Pop@liu.se, 2012-02-15, last update 2016-05-12
-
-In Subversion here:
-https://openmodelica.org/svn/OpenModelicaExternal/trunk/tools/windows/OMDev
-
-OMDev=a set of tools packaged togheter so no
- installation is necessary and everything
- works as expected.
-This is a specific release based on msys2/mingw32/mingw64
-
-
-Quick course on msys2
----------------------
-Adrian.Pop@liu.se
-2016-03-11
-
-More information here:
-http://sourceforge.net/p/msys2/wiki/MSYS2%20installation/
-
-Install msys2 from:
- http://msys2.github.io/
-into OMDev\tools\msys
-start the msys2_shell.bat and sync the local package database, and update the msys2 system:
- > pacman -Syuu
- RESTART the msys2 shell if you are told to do so!
-do a full system upgrade write:
- > pacman -Syuu
-install some usual packages:
- > pacman -S zip unzip tar make diffutils patch
-install needed configuration and build tools:
- > pacman -S autoconf automake m4 pkg-config libtool
-install mingw64 and mingw32:
- > pacman -S mingw-w64-x86_64-toolchain mingw-w64-i686-toolchain
-install opencl headers
- > pacman -S mingw32/mingw-w64-i686-opencl-headers mingw64/mingw-w64-x86_64-opencl-headers
-install wget
- > pacman -S wget
-install lapack: openblas
- > pacman -S mingw32/mingw-w64-i686-openblas mingw64/mingw-w64-x86_64-openblas
-install bison needed for lpsolve compilation
- > pacman -S bison
-install binutils for -lbfd and -liberty
- > pacman -S mingw-w64-{i686,x86_64}-{gcc,binutils}
-
-for modelica3d
-install dbus
- > pacman -S mingw32/mingw-w64-i686-dbus mingw32/mingw-w64-i686-dbus-glib
- > pacman -S mingw64/mingw-w64-x86_64-dbus mingw64/mingw-w64-x86_64-dbus-glib
-install gtk2
- > pacman -S mingw32/mingw-w64-i686-gtk2 mingw64/mingw-w64-x86_64-gtk2
-install OSG open scene graph
- > pacman -S mingw32/mingw-w64-i686-OpenSceneGraph mingw64/mingw-w64-x86_64-OpenSceneGraph
-install cmake mingw32 and mingw64
- > pacman -S mingw32/mingw-w64-i686-cmake mingw64/mingw-w64-x86_64-cmake
- > pacman -S mingw32/mingw-w64-i686-extra-cmake-modules mingw64/mingw-w64-x86_64-extra-cmake-modules
-install qt-creator
- > pacman -S mingw32/mingw-w64-i686-qt-creator mingw64/mingw-w64-x86_64-qt-creator
-
-To make things move fast in msys2 one has to generate the group and passwd files on the host:
-> mkpasswd -l -c > /etc/passwd
-> mkgroup -l -c > /etc/group
-In /etc/nsswitch.conf one needs to change to:
-passwd: files #db
-group: files #db
-
-if you move the OMDev directory around then you need to path the qt files using:
-> cd $OMDEV/tools/msys/mingw64/bin
-> qtbinpatcher --nobackup
-> cd $OMDEV/tools/msys/mingw32/bin
-> qtbinpatcher --nobackup
-
-See all installed packages
-Start $OMDev\tools\msys\msys2_shell.bat
-> pacman -Qet
-list the files in a package
-> pacman -Ql mingw-w64-i686-openblas
-find which package a file belongs to:
-> pkgfile file
-
-
-To get the debug DLLs for qt5 and the qt5 examples reinstall the qt5 packages:
-Start $OMDev\tools\msys\msys2_shell.bat
-See which are the installed qt packages:
- > pacman -Ss qt5 | grep installed
- mingw32/mingw-w64-i686-qt5 5.5.1-4 (mingw-w64-i686-qt mingw-w64-i686-qt5) [installed]
- mingw64/mingw-w64-x86_64-qt5 5.5.1-4 (mingw-w64-x86_64-qt mingw-w64-x86_64-qt5) [installed]
- > pacman -S mingw-w64-i686-qt5 5.5.1-4 mingw-w64-x86_64-qt5 5.5.1-4
-To clean the examples and the debug dlls do:
- > $OMDEV/util/msys2-clean.sh
-To clear the pacman cache:
- > pacman -Scc
-
-if you have issues with pacman you can reinit it via:
- > pacman-key --init
- > pacman-key --populate
-
-if you get things like:
-0 [main] make 15324 child_info_fork::abort:
-X:\msys\usr\bin\msys-unistring-2.dll:
-Loaded to different address: parent(0x840000) != child(0x440000)
-exit the msys2 shell and run autorebase.bat
-
-
+OMDev=OpenModelica Development Environment
+-------------------------------------------
+Adrian.Pop@liu.se, 2012-02-15, last update 2020-10-28
+
+Checkout the OMDev package:
+- Install git for windows https://git-scm.com/downloads
+- make sure we git clone with the correct line endings, run in a terminal:
+ git config --global core.eol lf
+ git config --global core.autocrlf input
+- get OMDev from git
+ git clone https://openmodelica.org/git/OMDev.git
+
+OMDev=a set of tools packaged togheter so no
+ installation is necessary and everything
+ works as expected.
+This is a specific release based on msys2/mingw32/mingw64
+
+
+Quick course on msys2
+---------------------
+Adrian.Pop@liu.se
+2016-03-11, update on 2020-10-28
+
+More information here:
+http://msys2.org
+
+Install msys2 from:
+ http://msys2.github.io/
+start the msys2 shell and sync the local package database, and update the msys2 system:
+ > pacman -Syuu
+ RESTART the msys2 shell if you are told to do so!
+do a full system upgrade write:
+ > pacman -Syuu
+install some usual packages:
+ > pacman -S zip unzip tar make diffutils patch wget
+install needed configuration and build tools:
+ > pacman -S autoconf automake m4 pkg-config libtool
+install gdb
+ > pacman -S mingw-w64-{i686,x86_64}-gdb
+useful for exe|dll dependency analysis
+pacman -S mingw-w64-{i686,x86_64}-ntldd-git
+
+gcc & g++ & gfortran
+install mingw64 and mingw32:
+ > pacman -S mingw-w64-{i686,x86_64}-toolchain
+
+clang & clang++ & gfortran
+pacman -S mingw-w64-{i686,x86_64}-clang
+pacman -S mingw-w64-{i686,x86_64}-gcc-fortran
+pacman -S mingw-w64-{i686,x86_64}-gcc-libgfortran
+
+install mingw32-make
+ > pacman -S mingw-w64-{i686,x86_64}-make
+install cmake mingw32 and mingw64
+ > pacman -S mingw-w64-{i686,x86_64}-cmake mingw-w64-{i686,x86_64}-extra-cmake-modules
+install opencl headers
+ > pacman -S mingw-w64-{i686,x86_64}-opencl-headers
+install lapack: openblas
+ > pacman -S mingw-w64-{i686,x86_64}-openblas
+install bison needed for lpsolve compilation
+ > pacman -S bison flex
+install binutils for -lbfd and -liberty
+ > pacman -S mingw-w64-{i686,x86_64}-{gcc,binutils}
+result-files and tables
+pacman -S mingw-w64-{i686,x86_64}-hdf5
+
+for omsimulator & cpp runtime
+pacman -S mingw-w64-{i686,x86_64}-boost
+pacman -S mingw-w64-{i686,x86_64}-libxml2
+
+needed for runtimes and omc
+pacman -S mingw-w64-{i686,x86_64}-openmp
+
+package manager, curl
+pacman -S mingw-w64-{i686,x86_64}-gnutls
+
+for modelica3d
+install dbus
+ > pacman -S mingw-w64-{i686,x86_64}-dbus mingw-w64-{i686,x86_64}-dbus-glib
+install gtk2
+ > pacman -S mingw-w64-{i686,x86_64}-gtk2
+
+for 3d visualization in OMEdit
+install OSG open scene graph
+ > pacman -S mingw-w64-{i686,x86_64}-OpenSceneGraph
+install qt-creator (will install all qt)
+ > pacman -S mingw-w64-{i686,x86_64}-qt-creator
+install qtwebkit
+pacman -S mingw-w64-{i686,x86_64}-qtwebkit
+
+To make things move fast in msys2 one has to generate the group and passwd files on the host:
+> mkpasswd -l -c > /etc/passwd
+> mkgroup -l -c > /etc/group
+In /etc/nsswitch.conf one needs to change to:
+passwd: files #db
+group: files #db
+
+if you move the OMDev directory around then you need to path the qt files using:
+> cd $OMDEV/tools/msys/mingw64/bin
+> qtbinpatcher --nobackup
+> cd $OMDEV/tools/msys/mingw32/bin
+> qtbinpatcher --nobackup
+
+See all installed packages
+Start $OMDev\tools\msys\msys2_shell.bat
+> pacman -Qet
+list the files in a package
+> pacman -Ql mingw-w64-i686-openblas
+find which package a file belongs to:
+> pkgfile file
+
+To get the debug DLLs for qt5 and the qt5 examples reinstall the qt5 packages:
+Start $OMDev\tools\msys\msys2_shell.bat
+See which are the installed qt packages:
+ > pacman -Ss qt5 | grep installed
+ mingw32/mingw-w64-i686-qt5 5.15.1-1 (mingw-w64-i686-qt mingw-w64-i686-qt5) [installed]
+ mingw32/mingw-w64-i686-qtwebkit 5.212.0alpha4-5 [installed]
+ mingw64/mingw-w64-x86_64-qt5 5.15.1-1 (mingw-w64-x86_64-qt mingw-w64-x86_64-qt5) [installed]
+ mingw64/mingw-w64-x86_64-qtwebkit 5.212.0alpha4-5 [installed]
+ > pacman -S mingw-w64-i686-qt5 5.15.1-1 mingw-w64-x86_64-qt5 5.15.1-1
+To clean the examples and the debug dlls do:
+ > $OMDEV/util/msys2-clean.sh
+To clear the pacman cache:
+ > pacman -Scc
+
+
+
+