Closed wyldckat closed 3 years ago
In this comment: https://github.com/blueCFD/Core/issues/58#issuecomment-329237034 - it's indicated how I sorted out the backporting of commits back then.
Command for getting the list of actual commits I did without merging needed:
git log --author="Bruno Santos" --oneline d3872b3~1.. | grep -v "Merge branch 'OpenFOAM-5.x'"
See this entry for more details on how to do this automatically: https://github.com/blueCFD/Core/wiki/Loose-development-notes-for-blueCFD-Core's-way-of-doing-things#cherry-pick-changes-from-one-branch-to-the-main-development-branch
Adapted from https://github.com/blueCFD/Core/issues/58#issuecomment-329521073
References:
X:\msys64
Once installed, make sure to start the MSYS2 Shell (Start -> Programs -> MSYS2 -> MSYS2 Shell
) and follow the update steps from here: https://www.msys2.org/wiki/MSYS2-installation/#iii-updating-packages
pacman -Syuu
as many times as needed.Start the MINGW64 Shell and install the following packages:
For essentials:
pacman -S mingw-w64-x86_64-toolchain flex bison mingw64/mingw-w64-x86_64-zlib mingw64/mingw-w64-x86_64-readline mingw64/mingw-w64-x86_64-ncurses mingw64/mingw-w64-x86_64-boost mingw64/mingw-w64-x86_64-gmp mingw64/mingw-w64-x86_64-mpfr mingw64/mingw-w64-x86_64-cgal mingw64/mingw-w64-x86_64-eigen3 tar wget patch make unzip diffutils git
It will ask if all of the members for the group mingw-w64-x86_64-toolchain
are to be installed, to which you can simply press the Enter key to continue.
For 3rd party software:
pacman -S mingw64/mingw-w64-x86_64-cmake mingw64/mingw-w64-x86_64-extra-cmake-modules mingw64/mingw-w64-x86_64-meld3 svn p7zip tree doxygen man mingw64/mingw-w64-x86_64-gnuplot bc
Need to copy the etc/config.d
folder from OpenFOAM 5.x... nevermind as well, moved it to a folder outside of OpenFOAM itself.
Need to get cv2pdb
... er, never mind, our scripts already do this for us.
Unfortunately mingw64/mingw-w64-x86_64-evince
is not working as intended, where 3.36.6-1 was installed, but was not able to open eps files :( So had to remove it once again, by running:
pacman -R $(echo "mingw-w64-x86_64-appstream-glib-0.7.17-3 mingw-w64-x86_64-aspell-0.60.7-1 mingw-w64-x86_64-dbus-1.12.18-1 mingw-w64-x86_64-djvulibre-3.5.27-4 mingw-w64-x86_64-enchant-2.2.8-1
mingw-w64-x86_64-ghostscript-9.50-1 mingw-w64-x86_64-glib-networking-2.64.3-1 mingw-w64-x86_64-graphene-1.10.2-1 mingw-w64-x86_64-gsl-2.6-1 mingw-w64-x86_64-gspell-1.8.3-2
mingw-w64-x86_64-gst-plugins-base-1.16.2-1 mingw-w64-x86_64-gstreamer-1.16.2-1 mingw-w64-x86_64-hunspell-1.7.0-5 mingw-w64-x86_64-iso-codes-4.5.0-1 mingw-w64-x86_64-jbig2dec-0.17-1
mingw-w64-x86_64-lcms2-2.11-1 mingw-w64-x86_64-libgcrypt-1.8.5-1 mingw-w64-x86_64-libgpg-error-1.38-1 mingw-w64-x86_64-libgxps-0.3.1-1 mingw-w64-x86_64-libidn-1.36-1
mingw-w64-x86_64-libogg-1.3.4-3 mingw-w64-x86_64-libpaper-1.1.28-1 mingw-w64-x86_64-libproxy-0.4.15-4 mingw-w64-x86_64-libsoup-2.70.0-1 mingw-w64-x86_64-libspectre-0.2.8-2
mingw-w64-x86_64-libtheora-1.1.1-4 mingw-w64-x86_64-libvoikko-4.3-1 mingw-w64-x86_64-libvorbis-1.3.6-1 mingw-w64-x86_64-libvorbisidec-svn-r19643-1 mingw-w64-x86_64-libxslt-1.1.34-2
mingw-w64-x86_64-libyaml-0.2.5-1 mingw-w64-x86_64-nspr-4.25-1 mingw-w64-x86_64-nss-3.52.1-1 mingw-w64-x86_64-openjpeg2-2.3.1-1 mingw-w64-x86_64-opus-1.3.1-1 mingw-w64-x86_64-orc-0.4.31-1
mingw-w64-x86_64-poppler-0.88.0-2 mingw-w64-x86_64-poppler-data-0.4.9-1 mingw-w64-x86_64-evince-3.36.6-1" | sed -e 's=^ *==' -e 's= =\n=g' | sed -e 's=\(mingw-w64-x86_64-[a-z\-]*\)-.*=\1 =g' -e 's=\(mingw-w64-x86_64-[a-z0-9-]*\)-[0-9]\..*\-1=\1=g')
Ended up having to release it as it was, without fixing the known issues on a few tutorials.
Notes:
Development steps:
Sync up branch
blueCFD-Core-5.x
with upstream OpenFOAM 5.x.Backport from 5.x to dev and sync up branch
blueCFD-Core-dev
with upstreamOpenFOAM-dev
.TODO Progress to OpenFOAM-8 and rebuild our port.
TODO Run the tests with
Alltest
(see #58 for how it is done).TODO Update the installer and revise pending bugs.
TODO Wrap up tasks associated to this milestone that are meant to be packaged into the installer: https://github.com/blueCFD/Core/milestone/6
TODO Release blueCFD-Core 2020-1 to the public.
TODO Revise https://github.com/blueCFD/Core/wiki/Released-patch-files
TODO Revise other relevant wiki pages: https://github.com/blueCFD/Core/wiki/