From c389a210e0ffa82cad0aa28051ed6a0e8e792dac Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Tue, 10 May 2022 13:10:49 +0200 Subject: [PATCH] =?utf8?q?spns=20#29393=20Builder=20son=20propre=20medcoup?= =?utf8?q?ling=20minimal=20=C3=A0=20partir=20du=20d=C3=A9pot=20Salom=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../MEDCOUPLING-micro-master-MPI.pyconf | 47 ++++++++++++ products/MEDCOUPLING.pyconf | 8 +++ products/compil_scripts/qt-5.15.2.bat | 65 +++++++++++++++++ products/compil_scripts/qt-5.15.2.sh | 71 +++++++++++++++++++ 4 files changed, 191 insertions(+) create mode 100644 applications/MEDCOUPLING-micro-master-MPI.pyconf create mode 100644 products/compil_scripts/qt-5.15.2.bat create mode 100755 products/compil_scripts/qt-5.15.2.sh diff --git a/applications/MEDCOUPLING-micro-master-MPI.pyconf b/applications/MEDCOUPLING-micro-master-MPI.pyconf new file mode 100644 index 0000000..177349d --- /dev/null +++ b/applications/MEDCOUPLING-micro-master-MPI.pyconf @@ -0,0 +1,47 @@ +#!/usr/bin/env python +#-*- coding:utf-8 -*- + +APPLICATION : +{ + name : 'medcoupling-micro-master-mpi' + workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name + '-' + $VARS.dist + tag : 'master' + base : 'no' + debug : 'no' + environ : + { + build : + { + CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION" + } + } + products : + { + cmake : 'native' + Python : 'native' + medfile : {tag: '4.1.1' , hpc: 'yes'} + hdf5 : {tag: '1.10.3', hpc: 'yes'} + openmpi : 'native' + CONFIGURATION + MEDCOUPLING : {tag:'master', base: 'no', section: 'version_micro', hpc: 'yes'} + } + test_base : + { + } + properties : + { + repo_dev : "yes" + pip : 'yes' + pip_install_dir : 'python' + single_install_dir : "no" + } +} +__overwrite__ : +[ + { + __condition__ : "VARS.dist in ['CO7']" + 'APPLICATION.products.cmake': '3.12.1' + 'APPLICATION.products.Python': '3.6.5' + 'APPLICATION.products.openmpi': '4.0.7' + } +] diff --git a/products/MEDCOUPLING.pyconf b/products/MEDCOUPLING.pyconf index dbc79c2..f2d5b78 100644 --- a/products/MEDCOUPLING.pyconf +++ b/products/MEDCOUPLING.pyconf @@ -117,6 +117,14 @@ default_MPI_STD: opt_depend : ["ParMetis"] } +version_micro: +{ + cmake_options : "-DMEDCOUPLING_MICROMED=OFF -DMEDCOUPLING_ENABLE_PYTHON=OFF -DMEDCOUPLING_ENABLE_PARTITIONER=OFF -DMEDCOUPLING_ENABLE_RENUMBER=OFF -DMEDCOUPLING_WITH_FILE_EXAMPLES=OFF -DMEDCOUPLING_USE_MPI=ON -DSALOME_USE_MPI=ON -DMEDCOUPLING_BUILD_TESTS=OFF -DMEDCOUPLING_BUILD_DOC=OFF -DMEDCOUPLING_BUILD_STATIC=OFF -DMEDCOUPLING_USE_64BIT_IDS=ON -DMEDCOUPLING_PARTITIONER_METIS=OFF -DMEDCOUPLING_PARTITIONER_SCOTCH=OFF -DMEDCOUPLING_PARTITIONER_PARMETIS=OFF -DMEDCOUPLING_PARTITIONER_PTSCOTCH=OFF" + depend : ["CONFIGURATION", "medfile", "hdf5", "openmpi"] + build_depend: ["cmake" ] + opt_depend : [] +} + default_32BIT_IDS: { cmake_options : "-DMEDCOUPLING_ENABLE_PYTHON=ON -DMEDCOUPLING_ENABLE_PARTITIONER=ON -DMEDCOUPLING_ENABLE_RENUMBER=ON -DMEDCOUPLING_PARTITIONER_METIS=ON -DMEDCOUPLING_PARTITIONER_SCOTCH=ON -DMEDCOUPLING_PARTITIONER_PARMETIS=OFF -DMEDCOUPLING_MICROMED=OFF -DMEDCOUPLING_USE_MPI=OFF" diff --git a/products/compil_scripts/qt-5.15.2.bat b/products/compil_scripts/qt-5.15.2.bat new file mode 100644 index 0000000..0626f75 --- /dev/null +++ b/products/compil_scripts/qt-5.15.2.bat @@ -0,0 +1,65 @@ +@echo off + +echo ########################################################################## +echo Qt %VERSION% +echo ########################################################################## + +IF NOT DEFINED SAT_DEBUG ( + SET SAT_DEBUG=0 +) + +SET PRODUCT_BUILD_TYPE=-release +if %SAT_DEBUG% == 1 ( + set PRODUCT_BUILD_TYPE=-debug-and-release +) + +if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL% +REM clean BUILD directory +if exist "%BUILD_DIR%" rmdir /Q /S %BUILD_DIR% +mkdir %BUILD_DIR% + +cd %SOURCE_DIR% + +REM Configure +echo. +echo -------------------------------------------------------------------------- +echo *** configure +echo -------------------------------------------------------------------------- +set QT_OPTIONS=-platform win32-msvc2017 +set QT_OPTIONS=%QT_OPTIONS% -opensource -confirm-license %PRODUCT_BUILD_TYPE% +set QT_OPTIONS=%QT_OPTIONS% -no-angle -opengl desktop -nomake examples -nomake tests +set QT_OPTIONS=%QT_OPTIONS% -skip qtwebengine -skip wayland -skip qtgamepad -no-openssl +set QT_OPTIONS=%QT_OPTIONS% -mp +set QT_OPTIONS=%QT_OPTIONS% -prefix %PRODUCT_INSTALL% + +echo **** call %SOURCE_DIR%\configure %QT_OPTIONS% +call %SOURCE_DIR%\configure.bat %QT_OPTIONS% +if NOT %ERRORLEVEL% == 0 ( + echo "ERROR on configure" + exit 1 +) + +nmake +if NOT %ERRORLEVEL% == 0 ( + exit 2 +) + +REM Installation +echo. +echo -------------------------------------------------------------------------- +echo *** nmake install +echo -------------------------------------------------------------------------- + +nmake install +if NOT %ERRORLEVEL% == 0 ( + echo "ERROR on nmake install" + exit 3 +) + +echo "*** Adding qt.conf file in order to be able to compile using the moved Qt installation" +echo [Paths] > %PRODUCT_INSTALL%\bin\qt.conf +echo Prefix=../ >> %PRODUCT_INSTALL%\bin\qt.conf + +echo. +echo ########## END + diff --git a/products/compil_scripts/qt-5.15.2.sh b/products/compil_scripts/qt-5.15.2.sh new file mode 100755 index 0000000..70d8bae --- /dev/null +++ b/products/compil_scripts/qt-5.15.2.sh @@ -0,0 +1,71 @@ +#!/bin/bash + +echo "##########################################################################" +echo "Qt" $VERSION +echo "##########################################################################" + +LINUX_DISTRIBUTION="$DIST_NAME$DIST_VERSION" +case $LINUX_DISTRIBUTION in + FD32|DB11) + export QMAKE_CXXFLAGS="-std=c++11" + ;; + *) + ;; +esac + +if [ -n "$SAT_DEBUG" ] +then + BUILD_TYPE="-debug" +else + BUILD_TYPE="-release" +fi + +# clean build directory +rm -rf $BUILD_DIR && mkdir -p $BUILD_DIR && cd $BUILD_DIR + +# For -qt-harfbuzz option, see spns #9694 +echo +echo "*** configure -prefix $PRODUCT_INSTALL $BUILD_TYPE -opensource -nomake tests -nomake examples -no-rpath -verbose -no-separate-debug-info -confirm-license -qt-libpng -qt-xcb -no-eglfs -dbus-runtime -skip qtwebengine -skip wayland -skip qtgamepad -system-freetype -qt-harfbuzz -no-openssl -no-glib -no-jasper" + +$SOURCE_DIR/configure -prefix $PRODUCT_INSTALL $BUILD_TYPE -opensource -nomake tests -nomake examples -no-rpath \ + -verbose -no-separate-debug-info -confirm-license -qt-libpng -qt-xcb -no-eglfs -dbus-runtime -skip qtwebengine \ + -skip wayland -skip qtgamepad -system-freetype -qt-harfbuzz \ + -no-openssl -no-glib -no-jasper + +if [ $? -ne 0 ] +then + echo "ERROR on configure" + exit 2 +fi + +echo +echo "*** make" $MAKE_OPTIONS +make $MAKE_OPTIONS +if [ $? -ne 0 ] +then + echo "ERROR on make" + exit 3 +fi + +echo +echo "*** make install" +make install +if [ $? -ne 0 ] +then + echo "ERROR on make install" + exit 4 +fi + +# make clean pour nettoyer les sources +echo +echo "*** make clean" +make clean +if [ $? -ne 0 ] +then + echo "ERROR on make clean" + exit 5 +fi + +echo +echo "########## END" + -- 2.39.2