From e39b749a1233656ba483c78a7b44cf7429da5068 Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Fri, 18 Oct 2024 09:54:34 +0200 Subject: [PATCH] spns #43020: Windows build --- applications/SALOME-master-windows.pyconf | 10 + products/compil_scripts/cgal-v5.6.1.bat | 136 ++++++++++++ products/compil_scripts/cork-5987de5.bat | 21 ++ products/compil_scripts/cork.bat | 51 +++++ products/compil_scripts/irmb.bat | 79 +++++++ products/compil_scripts/libigl-v2.5.0.bat | 98 +++++++++ products/compil_scripts/mcut.bat | 80 +++++++ products/compil_scripts/meshbooleanplugin.bat | 79 +++++++ products/compil_scripts/mpir.bat | 63 ++++++ products/compil_scripts/pyqwt-0.12.1.bat | 31 +++ products/compil_scripts/pyqwt-0.12.7.bat | 31 +++ products/compil_scripts/qtpy-2.4.1.bat | 31 +++ products/compil_scripts/wheel-0.44.0.bat | 31 +++ products/cork.pyconf | 18 +- products/env_scripts/mpir.py | 12 ++ products/env_scripts/wheel.py | 18 ++ products/libigl.pyconf | 9 + products/mcut.pyconf | 9 +- products/meshbooleanplugin.pyconf | 5 + products/mpir.pyconf | 45 ++++ .../cork-5987de5_mingw-w64-x86_64.patch | 101 +++++++++ products/patches/cork-5987de5_msvc.patch | 197 ++++++++++++++++++ products/pyqwt.pyconf | 16 +- products/qtpy.pyconf | 16 +- products/wheel.pyconf | 39 ++++ 25 files changed, 1190 insertions(+), 36 deletions(-) create mode 100644 products/compil_scripts/cgal-v5.6.1.bat create mode 100644 products/compil_scripts/cork-5987de5.bat create mode 100644 products/compil_scripts/cork.bat create mode 100644 products/compil_scripts/irmb.bat create mode 100644 products/compil_scripts/libigl-v2.5.0.bat create mode 100644 products/compil_scripts/mcut.bat create mode 100644 products/compil_scripts/meshbooleanplugin.bat create mode 100644 products/compil_scripts/mpir.bat create mode 100644 products/compil_scripts/pyqwt-0.12.1.bat create mode 100644 products/compil_scripts/pyqwt-0.12.7.bat create mode 100644 products/compil_scripts/qtpy-2.4.1.bat create mode 100644 products/compil_scripts/wheel-0.44.0.bat create mode 100644 products/env_scripts/mpir.py create mode 100644 products/env_scripts/wheel.py create mode 100644 products/mpir.pyconf create mode 100644 products/patches/cork-5987de5_mingw-w64-x86_64.patch create mode 100644 products/patches/cork-5987de5_msvc.patch create mode 100644 products/wheel.pyconf diff --git a/applications/SALOME-master-windows.pyconf b/applications/SALOME-master-windows.pyconf index 24aca7e..0059666 100644 --- a/applications/SALOME-master-windows.pyconf +++ b/applications/SALOME-master-windows.pyconf @@ -48,12 +48,14 @@ APPLICATION : CAS : {tag:'CR780-SALOME-PATCH', section:'version_CR780_SALOME_PATCH_win', base: 'no'} certifi : '2019.6.16' cftime : '1.6.3' + cgal : 'v5.6.1' cgns : '4.2.0' chardet : '3.0.4' click : '7.0' cmake : '3.24.2' cminpack: '1.3.6' colorama: '0.4.1' + cork : '5987de5' cppunit : '1.13.2' cycler : '0.10.0' Cython : '0.29.37' @@ -78,10 +80,12 @@ APPLICATION : idna : '2.8' imagesize : '1.1.0' iniconfig : '2.0.0' + #irmb : '67d77b4' ispc : '1.15.0' Jinja2 : '2.10.1' kiwisolver : '1.4.5' lapack : '3.8.0' + libigl : 'v2.5.0' libjpeg: '9c' libpng: '1.5.10' libxml2 : '2.9.1' @@ -90,13 +94,16 @@ APPLICATION : markdown_it_py : '3.0.0' markupsafe : '1.1.1' matplotlib : '3.3.4' + mcut : 'b5b0ec6' medfile : '4.1.1' mesa : '19.2.3' + meshbooleanplugin : 'main' MeshGems : '2.15-1' meshio: '5.3.5' metis : '5.1.0' mmg : '5.6.0' mmgplugin: 'main' + mpir: '855491e' msvc : '2017' netcdf : '4.6.2' netCDF4: '1.6.5' @@ -129,10 +136,12 @@ APPLICATION : Pygments : '2.13.0' pyparsing : '2.4.0' PyQt : '5.15.3' + pyqwt: {tag : '0.12.1', base : 'no', section : 'version_0_12_1_no_pip'} pyreadline : '3.4.1' Python : '3.9.14' pytz : '2020.1' qt : '5.15.2' + qtpy : {tag : '2.4.1', base : 'no', section : 'version_2_4_1_no_pip'} qwt : '6.1.6' requests : '2.22.0' rich : '13.7.1' @@ -161,6 +170,7 @@ APPLICATION : tomli : '2.0.1' tcltk : '8.6.9' urllib3 : '1.25.3' + wheel : {tag : '0.44.0', base : 'no', section : 'version_0_44_0_no_pip'} zlib : '1.2.5' # SALOME MODULES : diff --git a/products/compil_scripts/cgal-v5.6.1.bat b/products/compil_scripts/cgal-v5.6.1.bat new file mode 100644 index 0000000..31531b7 --- /dev/null +++ b/products/compil_scripts/cgal-v5.6.1.bat @@ -0,0 +1,136 @@ +@echo off + +echo ########################################################################## +echo cgal %VERSION% +echo ########################################################################## + +IF NOT DEFINED SAT_DEBUG ( + SET SAT_DEBUG=0 +) + +IF NOT DEFINED CMAKE_GENERATOR ( + SET CMAKE_GENERATOR="Visual Studio 15 2017" +) + +SET PRODUCT_BUILD_TYPE=release +IF DEFINED SAT_CMAKE_BUILD_TYPE ( + SET PRODUCT_BUILD_TYPE=%SAT_CMAKE_BUILD_TYPE% +) + +if %SAT_DEBUG% == 1 ( + set PRODUCT_BUILD_TYPE=debug +) + +if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL% + +REM clean BUILD directory +if exist "%BUILD_DIR%" rmdir /Q /S %BUILD_DIR% +mkdir %BUILD_DIR% + +SET CGAL_DISABLE_GMP=1 +cd %BUILD_DIR% +set CMAKE_OPTIONS= +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_PREFIX:STRING=%PRODUCT_INSTALL:\=/% +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE=%PRODUCT_BUILD_TYPE% +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -A x64 +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_LIBDIR:STRING=lib +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DWITH_examples=ON +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DWITH_tests=ON +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DWITH_demos=ON +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCGAL_ENABLE_TESTING=ON +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCGAL_USE_GMP=OFF + +set MSBUILDDISABLENODEREUSE=1 + +echo. +echo ********************************************************************* +echo *** %CMAKE_ROOT%\bin\cmake %CMAKE_OPTIONS% +echo ********************************************************************* +echo. + +%CMAKE_ROOT%\bin\cmake %CMAKE_OPTIONS% %SOURCE_DIR% +if NOT %ERRORLEVEL% == 0 ( + echo ERROR on cmake + exit 1 +) + +echo. +echo ********************************************************************* +echo *** msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 ALL_BUILD.vcxproj +echo ********************************************************************* +echo. + +msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 ALL_BUILD.vcxproj +if NOT %ERRORLEVEL% == 0 ( + echo ERROR on msbuild ALL_BUILD.vcxproj + exit 2 +) + +echo. +echo ********************************************************************* +echo *** installation... +echo ********************************************************************* +echo. + +msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 INSTALL.vcxproj +if NOT %ERRORLEVEL% == 0 ( + echo ERROR on msbuild INSTALL.vcxproj + exit 3 +) + +echo ******************************************************************** +echo Building cgal_test +echo ******************************************************************** + +REM clean BUILD directory +mkdir %BUILD_DIR%\cgal_test +cd %BUILD_DIR%\cgal_test + +set CMAKE_OPTIONS= +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_PREFIX:STRING=%PRODUCT_INSTALL:\=/% +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE=%PRODUCT_BUILD_TYPE% +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -A x64 +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCGAL_DIR=%PRODUCT_INSTALL:\=/%/lib/cmake +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DEXECUTABLE_OUTPUT_PATH=%PRODUCT_INSTALL:\=/%/bin +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCGAL_DISABLE_GMP=OFF + +echo. +echo ********************************************************************* +echo *** %CMAKE_ROOT%\bin\cmake %CMAKE_OPTIONS% +echo ********************************************************************* +echo. + +%CMAKE_ROOT%\bin\cmake %CMAKE_OPTIONS% %SOURCE_DIR%\cgal_test +if NOT %ERRORLEVEL% == 0 ( + echo ERROR on cmake cgal_test + exit 1 +) + +echo. +echo ********************************************************************* +echo *** msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 ALL_BUILD.vcxproj +echo ********************************************************************* +echo. + +msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 ALL_BUILD.vcxproj +if NOT %ERRORLEVEL% == 0 ( + echo ERROR on msbuild ALL_BUILD.vcxproj + exit 2 +) + +echo. +echo ********************************************************************* +echo *** installation... +echo ********************************************************************* +echo. + +msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 INSTALL.vcxproj +if NOT %ERRORLEVEL% == 0 ( + echo ERROR on msbuild INSTALL.vcxproj + exit 3 +) + +echo +echo ########## END diff --git a/products/compil_scripts/cork-5987de5.bat b/products/compil_scripts/cork-5987de5.bat new file mode 100644 index 0000000..a57f6e8 --- /dev/null +++ b/products/compil_scripts/cork-5987de5.bat @@ -0,0 +1,21 @@ +@echo off + +echo ########################################################################## +echo Cork %VERSION% +echo ########################################################################## + +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% +xcopy * %PRODUCT_INSTALL% /E /I /Q +if NOT %ERRORLEVEL% == 0 ( + echo ERROR on xcopy + exit 1 +) + +echo. +echo ########## END diff --git a/products/compil_scripts/cork.bat b/products/compil_scripts/cork.bat new file mode 100644 index 0000000..50c5625 --- /dev/null +++ b/products/compil_scripts/cork.bat @@ -0,0 +1,51 @@ +@echo off + +echo ########################################################################## +echo cork %VERSION% +echo ########################################################################## + +IF NOT DEFINED SAT_DEBUG ( + SET SAT_DEBUG=0 +) + +IF NOT DEFINED CMAKE_GENERATOR ( + SET CMAKE_GENERATOR="Visual Studio 15 2017" +) + +SET PRODUCT_BUILD_TYPE=release +IF DEFINED SAT_CMAKE_BUILD_TYPE ( + SET PRODUCT_BUILD_TYPE=%SAT_CMAKE_BUILD_TYPE% +) + +if %SAT_DEBUG% == 1 ( + set PRODUCT_BUILD_TYPE=debug +) + +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% +xcopy * %BUILD_DIR%\ /E /I /Q +cd %BUILD_DIR%\\win\wincork +REM Upgrade to current version of MSVC +echo. +echo *** devenv wincork.vcxproj /upgrade +devenv wincork.vcxproj /upgrade +if NOT %ERRORLEVEL% == 0 ( + echo ERROR on devenv + exit 1 +) + +echo. +echo ********************************************************************* +echo *** msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 wincork.vcxproj +echo ********************************************************************* +echo. + +msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 wincork.vcxproj +if NOT %ERRORLEVEL% == 0 ( + echo ERROR on msbuild wincork.vcxproj + exit 2 +) diff --git a/products/compil_scripts/irmb.bat b/products/compil_scripts/irmb.bat new file mode 100644 index 0000000..283e670 --- /dev/null +++ b/products/compil_scripts/irmb.bat @@ -0,0 +1,79 @@ +@echo off + +echo ########################################################################## +echo irmb %VERSION% +echo ########################################################################## + +IF NOT DEFINED SAT_DEBUG ( + SET SAT_DEBUG=0 +) + +IF NOT DEFINED CMAKE_GENERATOR ( + SET CMAKE_GENERATOR="Visual Studio 15 2017" +) + +SET PRODUCT_BUILD_TYPE=release +IF DEFINED SAT_CMAKE_BUILD_TYPE ( + SET PRODUCT_BUILD_TYPE=%SAT_CMAKE_BUILD_TYPE% +) + +if %SAT_DEBUG% == 1 ( + set PRODUCT_BUILD_TYPE=debug +) + +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 %BUILD_DIR% +set CMAKE_OPTIONS= +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_PREFIX:STRING=%PRODUCT_INSTALL:\=/% +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE=%PRODUCT_BUILD_TYPE% +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -A x64 +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_LIBDIR:STRING=lib + +set MSBUILDDISABLENODEREUSE=1 + +echo. +echo ********************************************************************* +echo *** %CMAKE_ROOT%\bin\cmake %CMAKE_OPTIONS% +echo ********************************************************************* +echo. + +%CMAKE_ROOT%\bin\cmake %CMAKE_OPTIONS% %SOURCE_DIR% +if NOT %ERRORLEVEL% == 0 ( + echo ERROR on cmake + exit 1 +) + +echo. +echo ********************************************************************* +echo *** msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 ALL_BUILD.vcxproj +echo ********************************************************************* +echo. + +msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 ALL_BUILD.vcxproj +if NOT %ERRORLEVEL% == 0 ( + echo ERROR on msbuild ALL_BUILD.vcxproj + exit 2 +) + +echo. +echo ********************************************************************* +echo *** installation... +echo ********************************************************************* +echo. + +msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 INSTALL.vcxproj +if NOT %ERRORLEVEL% == 0 ( + echo ERROR on msbuild INSTALL.vcxproj + exit 3 +) + +set MSBUILDDISABLENODEREUSE=1 + +echo +echo ########## END diff --git a/products/compil_scripts/libigl-v2.5.0.bat b/products/compil_scripts/libigl-v2.5.0.bat new file mode 100644 index 0000000..855b1b3 --- /dev/null +++ b/products/compil_scripts/libigl-v2.5.0.bat @@ -0,0 +1,98 @@ +@echo off + +echo ########################################################################## +echo libigl %VERSION% +echo ########################################################################## + +IF NOT DEFINED SAT_DEBUG ( + SET SAT_DEBUG=0 +) + +IF NOT DEFINED CMAKE_GENERATOR ( + SET CMAKE_GENERATOR="Visual Studio 15 2017" +) + +SET PRODUCT_BUILD_TYPE=release +IF DEFINED SAT_CMAKE_BUILD_TYPE ( + SET PRODUCT_BUILD_TYPE=%SAT_CMAKE_BUILD_TYPE% +) + +if %SAT_DEBUG% == 1 ( + set PRODUCT_BUILD_TYPE=debug +) + +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 %BUILD_DIR% +set CMAKE_OPTIONS= +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_PREFIX:STRING=%PRODUCT_INSTALL:\=/% +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE=%PRODUCT_BUILD_TYPE% +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -A x64 +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_LIBDIR:STRING=lib +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DLIBIGL_PARENT_DIR=ON +SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCGAL_DIR=%CGAL_DIR:\=/% + +REM Boost settings +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBOOST_ROOT:PATH=%BOOST_ROOT_DIR:\=/% +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBoost_ADDITIONAL_VERSIONS="%BOOST_VERSION% %BOOST_VERSION_MajorMinor%" +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBOOST_INCLUDEDIR=%Boost_INCLUDE_DIR:\=/% +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBoost_INCLUDE_DIR=%Boost_INCLUDE_DIR:\=/% +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBoost_NO_BOOST_CMAKE:BOOL=ON +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBoost_NO_SYSTEM_PATHS:BOOL=ON + +REM libxml2 settings +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_MODULE_USE_EXTERNAL_VTK_libxml2:BOOL=ON +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DLIBXML2_INCLUDE_DIR:STRING=%LIBXML2_ROOT_DIR:\=/%/include +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DLIBXML2_LIBRARIES:STRING=%LIBXML2_ROOT_DIR:\=/%/lib/libxml2.lib +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DLIBXML2_XMLLINT_EXECUTABLE=%LIBXML2_ROOT_DIR:\=/%/bin/xmllint.exe + +set MSBUILDDISABLENODEREUSE=1 + +echo. +echo ********************************************************************* +echo *** %CMAKE_ROOT%\bin\cmake %CMAKE_OPTIONS% +echo ********************************************************************* +echo. + +%CMAKE_ROOT%\bin\cmake %CMAKE_OPTIONS% %SOURCE_DIR% +if NOT %ERRORLEVEL% == 0 ( + echo ERROR on cmake + exit 1 +) + +echo. +echo ********************************************************************* +echo *** msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 609_Boolean.vcxproj +echo ********************************************************************* +echo. + +cd %BUILD_DIR%\tutorial +msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 609_Boolean.vcxproj +if NOT %ERRORLEVEL% == 0 ( + echo ERROR on msbuild 609_Boolean.vcxproj + exit 2 +) + +echo. +echo ********************************************************************* +echo *** installation... +echo ********************************************************************* +echo. + +mkdir %PRODUCT_INSTALL%\bin + +copy /Y /B %BUILD_DIR%\bin\%PRODUCT_BUILD_TYPE%\* %PRODUCT_INSTALL%\bin\ +if NOT %ERRORLEVEL% == 0 ( + echo ERROR on msbuild INSTALL.vcxproj + exit 3 +) + +set MSBUILDDISABLENODEREUSE=1 + +echo +echo ########## END diff --git a/products/compil_scripts/mcut.bat b/products/compil_scripts/mcut.bat new file mode 100644 index 0000000..ab66a59 --- /dev/null +++ b/products/compil_scripts/mcut.bat @@ -0,0 +1,80 @@ +@echo off + +echo ########################################################################## +echo mcut %VERSION% +echo ########################################################################## + +IF NOT DEFINED SAT_DEBUG ( + SET SAT_DEBUG=0 +) + +IF NOT DEFINED CMAKE_GENERATOR ( + SET CMAKE_GENERATOR="Visual Studio 15 2017" +) + +SET PRODUCT_BUILD_TYPE=release +IF DEFINED SAT_CMAKE_BUILD_TYPE ( + SET PRODUCT_BUILD_TYPE=%SAT_CMAKE_BUILD_TYPE% +) + +if %SAT_DEBUG% == 1 ( + set PRODUCT_BUILD_TYPE=debug +) + +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 %BUILD_DIR% +set CMAKE_OPTIONS= +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_PREFIX:STRING=%PRODUCT_INSTALL:\=/% +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE=%PRODUCT_BUILD_TYPE% +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -A x64 +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_LIBDIR:STRING=lib +SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DLIBIGL_INCLUDE_DIR=%LIBIGL_INCLUDE_DIR:\=/% + + +echo. +echo ********************************************************************* +echo *** %CMAKE_ROOT%\bin\cmake %CMAKE_OPTIONS% +echo ********************************************************************* +echo. + +%CMAKE_ROOT%\bin\cmake %CMAKE_OPTIONS% %SOURCE_DIR% +if NOT %ERRORLEVEL% == 0 ( + echo ERROR on cmake + exit 1 +) + +set MSBUILDDISABLENODEREUSE=1 + + +echo. +echo ********************************************************************* +echo *** msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 ALL_BUILD.vcxproj +echo ********************************************************************* +echo. + +msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 ALL_BUILD.vcxproj +if NOT %ERRORLEVEL% == 0 ( + echo ERROR on msbuild ALL_BUILD.vcxproj + exit 2 +) + +echo. +echo ********************************************************************* +echo *** installation... +echo ********************************************************************* +echo. + +msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 INSTALL.vcxproj +if NOT %ERRORLEVEL% == 0 ( + echo ERROR on msbuild INSTALL.vcxproj + exit 3 +) + +echo +echo ########## END diff --git a/products/compil_scripts/meshbooleanplugin.bat b/products/compil_scripts/meshbooleanplugin.bat new file mode 100644 index 0000000..790ef60 --- /dev/null +++ b/products/compil_scripts/meshbooleanplugin.bat @@ -0,0 +1,79 @@ +@echo off + +echo ########################################################################## +echo Meshbooleanplugin %VERSION% +echo ########################################################################## + +IF NOT DEFINED SAT_DEBUG ( + SET SAT_DEBUG=0 +) + +IF NOT DEFINED CMAKE_GENERATOR ( + SET CMAKE_GENERATOR="Visual Studio 15 2017" +) + +SET PRODUCT_BUILD_TYPE=release +IF DEFINED SAT_CMAKE_BUILD_TYPE ( + SET PRODUCT_BUILD_TYPE=%SAT_CMAKE_BUILD_TYPE% +) + +if %SAT_DEBUG% == 1 ( + set PRODUCT_BUILD_TYPE=debug +) + +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 %BUILD_DIR% +set CMAKE_OPTIONS= +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_PREFIX:STRING=%PRODUCT_INSTALL:\=/% +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE=%PRODUCT_BUILD_TYPE% +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -A x64 +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_LIBDIR:STRING=lib +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DUSE_SAT=ON + +echo. +echo ********************************************************************* +echo *** %CMAKE_ROOT%\bin\cmake %CMAKE_OPTIONS% +echo ********************************************************************* +echo. + +%CMAKE_ROOT%\bin\cmake %CMAKE_OPTIONS% %SOURCE_DIR% +if NOT %ERRORLEVEL% == 0 ( + echo ERROR on cmake + exit 1 +) + +echo. +echo ********************************************************************* +echo *** msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 ALL_BUILD.vcxproj +echo ********************************************************************* +echo. + +msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 ALL_BUILD.vcxproj +if NOT %ERRORLEVEL% == 0 ( + echo ERROR on msbuild ALL_BUILD.vcxproj + exit 2 +) + +echo. +echo ********************************************************************* +echo *** installation... +echo ********************************************************************* +echo. + +msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 INSTALL.vcxproj +if NOT %ERRORLEVEL% == 0 ( + echo ERROR on msbuild INSTALL.vcxproj + exit 3 +) + +cd %PRODUCT_INSTALL%\plugins\meshbooleanplugin +powershell -Command "(Get-Content MyPlugDialog_ui.py).replace('from qwt_plot import QwtPlot', 'from qwt import QwtPlot') |Set-Content MyPlugDialog_ui.py" +if NOT %ERRORLEVEL% == 0 ( + echo ERROR on patching plugin... + exit 4 +) diff --git a/products/compil_scripts/mpir.bat b/products/compil_scripts/mpir.bat new file mode 100644 index 0000000..d37a757 --- /dev/null +++ b/products/compil_scripts/mpir.bat @@ -0,0 +1,63 @@ +@echo off + +echo ########################################################################## +echo mpir %VERSION% +echo ########################################################################## + +IF NOT DEFINED SAT_DEBUG ( + SET SAT_DEBUG=0 +) + +IF NOT DEFINED CMAKE_GENERATOR ( + SET CMAKE_GENERATOR="Visual Studio 15 2017" +) + +SET PRODUCT_BUILD_TYPE=release +IF DEFINED SAT_CMAKE_BUILD_TYPE ( + SET PRODUCT_BUILD_TYPE=%SAT_CMAKE_BUILD_TYPE% +) + +if %SAT_DEBUG% == 1 ( + set PRODUCT_BUILD_TYPE=debug +) + +if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL% +if NOT exist "%PRODUCT_INSTALL%\include" mkdir %PRODUCT_INSTALL%\include +if NOT exist "%PRODUCT_INSTALL%\lib" mkdir %PRODUCT_INSTALL%\lib + +REM clean BUILD directory +if exist "%BUILD_DIR%" rmdir /Q /S %BUILD_DIR% +mkdir %BUILD_DIR% +cd %SOURCE_DIR% +xcopy * %BUILD_DIR%\ /E /I /Q + +cd %BUILD_DIR%\build.vc15\lib_mpir_gc + +REM Upgrade to current version of MSVC +echo. +echo *** devenv lib_mpir_gc.vcxproj /upgrade +devenv lib_mpir_gc.vcxproj /upgrade +if NOT %ERRORLEVEL% == 0 ( + echo ERROR on devenv + exit 1 +) + +echo. +echo ********************************************************************* +echo *** msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 lib_mpir_gc.vcxproj +echo ********************************************************************* +echo. + +msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 lib_mpir_gc.vcxproj +if NOT %ERRORLEVEL% == 0 ( + echo ERROR on msbuild lib_mpir_gc.vcxproj + exit 2 +) + +copy /Y x64\%PRODUCT_BUILD_TYPE%\mpir.h %PRODUCT_INSTALL%\include\mpir.h +copy /Y x64\%PRODUCT_BUILD_TYPE%\mpirxx.h %PRODUCT_INSTALL%\include\mpirxx.h +copy /Y /B x64\%PRODUCT_BUILD_TYPE%\mpir_a.lib %PRODUCT_INSTALL%\lib\mpir.lib +if NOT %ERRORLEVEL% == 0 ( + echo ERROR on copy mpir.lib + exit 2 +) diff --git a/products/compil_scripts/pyqwt-0.12.1.bat b/products/compil_scripts/pyqwt-0.12.1.bat new file mode 100644 index 0000000..6e2803f --- /dev/null +++ b/products/compil_scripts/pyqwt-0.12.1.bat @@ -0,0 +1,31 @@ +@echo off + +echo ########################################################################## +echo pyqwt %VERSION% +echo ########################################################################## + +if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL% + +REM clean BUILD directory +if exist "%BUILD_DIR%" rmdir /Q /S %BUILD_DIR% +mkdir %BUILD_DIR%\cache\pip + +cd %SOURCE_DIR% +xcopy * %BUILD_DIR%\ /E /I /Q +cd %BUILD_DIR% + +REM Ensure that meshio is not present. +%PYTHON_ROOT_DIR%\python.exe -m pip uninstall -y pyqwt + +%PYTHON_ROOT_DIR%\python.exe -m pip install . --cache-dir=%BUILD_DIR%\cache\pip --no-deps --no-build-isolation +if NOT %ERRORLEVEL% == 0 ( + echo ERROR on python -m pip install + exit 3 +) + +echo. +echo Product %PRODUCT_NAME% version: %VERSION%> %PRODUCT_INSTALL%\README.txt +echo Installation folder: %PYTHON_ROOT_DIR%>> %PRODUCT_INSTALL%\README.txt + +echo. +echo ########## END diff --git a/products/compil_scripts/pyqwt-0.12.7.bat b/products/compil_scripts/pyqwt-0.12.7.bat new file mode 100644 index 0000000..7f35023 --- /dev/null +++ b/products/compil_scripts/pyqwt-0.12.7.bat @@ -0,0 +1,31 @@ +@echo off + +echo ########################################################################## +echo pyqwt %VERSION% +echo ########################################################################## + +if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL% + +REM clean BUILD directory +if exist "%BUILD_DIR%" rmdir /Q /S %BUILD_DIR% +mkdir %BUILD_DIR%\cache\pip + +cd %SOURCE_DIR% +xcopy * %BUILD_DIR%\ /E /I /Q +cd %BUILD_DIR% + +REM Ensure that meshio is not present. +%PYTHON_ROOT_DIR%\python.exe -m pip uninstall -y pyqwt + +%PYTHON_ROOT_DIR%\python.exe setup.py install +if NOT %ERRORLEVEL% == 0 ( + echo ERROR on python setup.py + exit 3 +) + +echo. +echo Product %PRODUCT_NAME% version: %VERSION%> %PRODUCT_INSTALL%\README.txt +echo Installation folder: %PYTHON_ROOT_DIR%>> %PRODUCT_INSTALL%\README.txt + +echo. +echo ########## END diff --git a/products/compil_scripts/qtpy-2.4.1.bat b/products/compil_scripts/qtpy-2.4.1.bat new file mode 100644 index 0000000..3f3270b --- /dev/null +++ b/products/compil_scripts/qtpy-2.4.1.bat @@ -0,0 +1,31 @@ +@echo off + +echo ########################################################################## +echo qtpy %VERSION% +echo ########################################################################## + +if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL% + +REM clean BUILD directory +if exist "%BUILD_DIR%" rmdir /Q /S %BUILD_DIR% +mkdir %BUILD_DIR%\cache\pip + +cd %SOURCE_DIR% +xcopy * %BUILD_DIR%\ /E /I /Q +cd %BUILD_DIR% + +REM Ensure that meshio is not present. +%PYTHON_ROOT_DIR%\python.exe -m pip uninstall -y qtpy + +%PYTHON_ROOT_DIR%\python.exe setup.py install +if NOT %ERRORLEVEL% == 0 ( + echo ERROR on python setup.py + exit 3 +) + +echo. +echo Product %PRODUCT_NAME% version: %VERSION%> %PRODUCT_INSTALL%\README.txt +echo Installation folder: %PYTHON_ROOT_DIR%>> %PRODUCT_INSTALL%\README.txt + +echo. +echo ########## END diff --git a/products/compil_scripts/wheel-0.44.0.bat b/products/compil_scripts/wheel-0.44.0.bat new file mode 100644 index 0000000..636f830 --- /dev/null +++ b/products/compil_scripts/wheel-0.44.0.bat @@ -0,0 +1,31 @@ +@echo off + +echo ########################################################################## +echo wheel %VERSION% +echo ########################################################################## + +if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL% + +REM clean BUILD directory +if exist "%BUILD_DIR%" rmdir /Q /S %BUILD_DIR% +mkdir %BUILD_DIR%\cache\pip + +cd %SOURCE_DIR% +xcopy * %BUILD_DIR%\ /E /I /Q +cd %BUILD_DIR% + +REM Ensure that meshio is not present. +%PYTHON_ROOT_DIR%\python.exe -m pip uninstall -y wheel + +%PYTHON_ROOT_DIR%\python.exe setup.py install +if NOT %ERRORLEVEL% == 0 ( + echo ERROR on python setup.py + exit 3 +) + +echo. +echo Product %PRODUCT_NAME% version: %VERSION%> %PRODUCT_INSTALL%\README.txt +echo Installation folder: %PYTHON_ROOT_DIR%>> %PRODUCT_INSTALL%\README.txt + +echo. +echo ########## END diff --git a/products/cork.pyconf b/products/cork.pyconf index 0b3e5f0..0f801a1 100644 --- a/products/cork.pyconf +++ b/products/cork.pyconf @@ -27,7 +27,8 @@ default : "mmg", "PyQt", "Python", - "numpy" + "numpy", + "mpir" ] build_depend : ["cmake", "cppunit"] opt_depend : [ @@ -46,5 +47,18 @@ default : version_5987de5: { - patches : ['cork-5987de5_off.patch'] + patches : ['cork-5987de5_off.patch'] +} + +version_5987de5_win: +{ + patches : ['cork-5987de5_off.patch', 'cork-5987de5_msvc.patch'] +} + +version_5987de5_msys : +{ + get_source : "archive" + patches : [] + archive_info : {archive_name : "cork-5987de5-mingw-w64-x86_64.tar.gz"} + compil_script : "cork-5987de5.bat" } diff --git a/products/env_scripts/mpir.py b/products/env_scripts/mpir.py new file mode 100644 index 0000000..803f738 --- /dev/null +++ b/products/env_scripts/mpir.py @@ -0,0 +1,12 @@ +#!/usr/bin/env python +#-*- coding:utf-8 -*- + +import os.path +import platform + +def set_env(env, prereq_dir, version): + env.set('MPIR_ROOT_DIR', prereq_dir) + env.set('MPIR_VERSION', version) + +def set_nativ_env(env): + pass diff --git a/products/env_scripts/wheel.py b/products/env_scripts/wheel.py new file mode 100644 index 0000000..56e4a79 --- /dev/null +++ b/products/env_scripts/wheel.py @@ -0,0 +1,18 @@ +#!/usr/bin/env python +#-*- coding:utf-8 -*- + +import os.path +import platform + +def set_env(env, prereq_dir, version): + pyver = 'python' + env.get('PYTHON_VERSION') + env.set('WHEEL_ROOT_DIR',prereq_dir) + env.set("WHEEL_VERSION",version) + if not platform.system() == "Windows" : + env.prepend('PATH', os.path.join(prereq_dir, 'bin')) + env.prepend('PYTHONPATH', os.path.join(prereq_dir, 'lib', pyver, 'site-packages')) + else: + pass + +def set_nativ_env(env): + pass diff --git a/products/libigl.pyconf b/products/libigl.pyconf index 527acf7..7d62753 100644 --- a/products/libigl.pyconf +++ b/products/libigl.pyconf @@ -46,4 +46,13 @@ version_v2_5_0: build_source : "script" compil_script : "libigl-v2.5.0" + $VARS.scriptExtension patches: ['libigl-v2.5.0-p01_609_Boolean.patch'] + depend : ["SMESH", + "mmg", + "PyQt", + "Python", + "numpy", + "boost", + "libxml2", + "eigen" + ] } diff --git a/products/mcut.pyconf b/products/mcut.pyconf index a42c465..1df6ac1 100644 --- a/products/mcut.pyconf +++ b/products/mcut.pyconf @@ -28,14 +28,14 @@ default : "PyQt", "Python", "numpy", - "eigen", - "libigl" + "eigen" ] build_depend : ["cmake", "cppunit"] opt_depend : [ "cgal", "cork", - "irmb" + "irmb", + "libigl" ] source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name @@ -52,7 +52,8 @@ version_b5b0ec6: { build_source: "script" compil_script: "mcut" + $VARS.scriptExtension - patches : ['mcut-b5b0ec6-p01_cgsboolean.patch', + patches : [ + 'mcut-b5b0ec6-p01_cgsboolean.patch', 'mcut-b5b0ec6-p02_cgsboolean.patch' ] } diff --git a/products/meshbooleanplugin.pyconf b/products/meshbooleanplugin.pyconf index 39ff414..6c81dbb 100644 --- a/products/meshbooleanplugin.pyconf +++ b/products/meshbooleanplugin.pyconf @@ -44,6 +44,11 @@ default : } } +default_win : +{ + opt_depend : ["cgal", "libigl", "cork"] +} + version_no_irmb_mcut : { patches: ['meshbooleanplugin-p01.irmb-mcut.patch'] # remove irmb and mcut since requires c++20 diff --git a/products/mpir.pyconf b/products/mpir.pyconf new file mode 100644 index 0000000..72d7b11 --- /dev/null +++ b/products/mpir.pyconf @@ -0,0 +1,45 @@ +default : +{ + name : "mpir" + build_source : "script" + compil_script : "mpir" + $VARS.scriptExtension + get_source : "git" + git_info: + { + repositories : + { + github : "https://github.com/winlibs/mpir.git" + } + } + patches : [] + system_info : + { + rpm : [] + rpm_dev : [] + apt : [] + apt_dev : [] + } + environ : + { + env_script : $name + ".py" + } + depend : ["SMESH", + "mmg", + "PyQt", + "Python", + "numpy" + ] + build_depend : ["cmake", "cppunit"] + opt_depend : [ + "cgal", + "libigl" + ] + source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name + build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name + install_dir : 'base' + properties : + { + incremental : "yes" + single_install_dir : "no" + } +} diff --git a/products/patches/cork-5987de5_mingw-w64-x86_64.patch b/products/patches/cork-5987de5_mingw-w64-x86_64.patch new file mode 100644 index 0000000..0f234e2 --- /dev/null +++ b/products/patches/cork-5987de5_mingw-w64-x86_64.patch @@ -0,0 +1,101 @@ +diff --git a/src/file_formats/off.cpp b/src/file_formats/off.cpp +index 3b12571..2a52bf4 100644 +--- a/src/file_formats/off.cpp ++++ b/src/file_formats/off.cpp +@@ -50,6 +50,7 @@ int readOFF(string filename, FileMesh *data) + in >> filetype; + if(filetype != "OFF") return 1; + ++ in >> filetype >> filetype >> filetype >> filetype; // Skip meshio stamp + // counts of things + int numvertices, numfaces, numedges; + in >> numvertices >> numfaces >> numedges; +diff --git a/src/isct/fixint.h b/src/isct/fixint.h +index 37465a1..ccc2074 100644 +--- a/src/isct/fixint.h ++++ b/src/isct/fixint.h +@@ -45,7 +45,7 @@ + + + +-#ifdef _WIN32 ++#ifdef _MSC_VER + #include + #else + #include +diff --git a/src/isct/gmpext4.h b/src/isct/gmpext4.h +index 1a5541c..fb76fab 100644 +--- a/src/isct/gmpext4.h ++++ b/src/isct/gmpext4.h +@@ -25,7 +25,7 @@ + // +------------------------------------------------------------------------- + #pragma once + +-#ifdef _WIN32 ++#ifdef _MSC_VER + #pragma warning(disable: 4800) + #pragma warning(disable: 4244) + #include +diff --git a/src/mesh/mesh.isct.tpp b/src/mesh/mesh.isct.tpp +index 6c48930..9c2b16d 100644 +--- a/src/mesh/mesh.isct.tpp ++++ b/src/mesh/mesh.isct.tpp +@@ -632,7 +632,7 @@ public: + quantized_coords.resize(N); + uint write = 0; + TopoCache::verts.for_each([&](Vptr v) { +-#ifdef _WIN32 ++#ifdef _MSC_VER + Vec3d raw = mesh->verts[v->ref].pos; + #else + Vec3d raw = TopoCache::mesh->verts[v->ref].pos; +diff --git a/src/mesh/mesh.tpp b/src/mesh/mesh.tpp +index 9da1614..bc63204 100644 +--- a/src/mesh/mesh.tpp ++++ b/src/mesh/mesh.tpp +@@ -250,7 +250,7 @@ typename Mesh::NeighborCache + } + + // This function signature is an amazing disaster... +-#ifdef _WIN32 ++#ifdef _MSC_VER + template + template + typename Mesh::EGraphCache +diff --git a/src/util/prelude.h b/src/util/prelude.h +index 00329aa..2eaadaf 100644 +--- a/src/util/prelude.h ++++ b/src/util/prelude.h +@@ -30,7 +30,9 @@ + #include + #include + #include +- ++#ifndef M_PI ++ #define M_PI 3.14159265358979323846 ++#endif + #ifndef uint + typedef unsigned int uint; + #endif +@@ -113,7 +115,7 @@ inline double rad2deg(double rad) { + // ********** + // * Timing + +-#ifdef _WIN32 ++#ifdef _MSC_VER + #include + #endif + +diff --git a/src/util/timer.cpp b/src/util/timer.cpp +index 3bc710a..bd06dcf 100644 +--- a/src/util/timer.cpp ++++ b/src/util/timer.cpp +@@ -25,7 +25,7 @@ + // +------------------------------------------------------------------------- + #include "prelude.h" + +-#ifdef _WIN32 ++#ifdef _MSC_VER + #include + #include + void gettimeofday(struct timeval* t,void* timezone) diff --git a/products/patches/cork-5987de5_msvc.patch b/products/patches/cork-5987de5_msvc.patch new file mode 100644 index 0000000..99d72e6 --- /dev/null +++ b/products/patches/cork-5987de5_msvc.patch @@ -0,0 +1,197 @@ +diff --git a/win/wincork/wincork.sln b/win/wincork/wincork.sln +index 46a4177..db1e8eb 100644 +--- a/win/wincork/wincork.sln ++++ b/win/wincork/wincork.sln +@@ -1,20 +1,31 @@ +- ++ + Microsoft Visual Studio Solution File, Format Version 12.00 +-# Visual Studio Express 2012 for Windows Desktop ++# Visual Studio 15 ++VisualStudioVersion = 15.0.35319.79 ++MinimumVisualStudioVersion = 10.0.40219.1 + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wincork", "wincork.vcxproj", "{AD6B1A8B-6983-40ED-9EF2-A7FFC457517E}" + EndProject + Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 ++ Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 ++ Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {AD6B1A8B-6983-40ED-9EF2-A7FFC457517E}.Debug|Win32.ActiveCfg = Debug|Win32 + {AD6B1A8B-6983-40ED-9EF2-A7FFC457517E}.Debug|Win32.Build.0 = Debug|Win32 +- {AD6B1A8B-6983-40ED-9EF2-A7FFC457517E}.Release|Win32.ActiveCfg = Release|Win32 +- {AD6B1A8B-6983-40ED-9EF2-A7FFC457517E}.Release|Win32.Build.0 = Release|Win32 ++ {AD6B1A8B-6983-40ED-9EF2-A7FFC457517E}.Debug|x64.ActiveCfg = Debug|Win32 ++ {AD6B1A8B-6983-40ED-9EF2-A7FFC457517E}.Debug|x64.Build.0 = Debug|Win32 ++ {AD6B1A8B-6983-40ED-9EF2-A7FFC457517E}.Release|Win32.ActiveCfg = Release|x64 ++ {AD6B1A8B-6983-40ED-9EF2-A7FFC457517E}.Release|Win32.Build.0 = Release|x64 ++ {AD6B1A8B-6983-40ED-9EF2-A7FFC457517E}.Release|x64.ActiveCfg = Release|Win32 ++ {AD6B1A8B-6983-40ED-9EF2-A7FFC457517E}.Release|x64.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection ++ GlobalSection(ExtensibilityGlobals) = postSolution ++ SolutionGuid = {03B5EC15-EDF5-46E1-AEB0-F97AE8B731A9} ++ EndGlobalSection + EndGlobal +diff --git a/win/wincork/wincork.vcxproj b/win/wincork/wincork.vcxproj +index 92a3fae..638e9d0 100644 +--- a/win/wincork/wincork.vcxproj ++++ b/win/wincork/wincork.vcxproj +@@ -1,30 +1,52 @@ +- +- ++ ++ + + + Debug + Win32 + ++ ++ Debug ++ x64 ++ + + Release + Win32 + ++ ++ Release ++ x64 ++ + + + {AD6B1A8B-6983-40ED-9EF2-A7FFC457517E} + wincork ++ 10.0.22621.0 + + + + Application + true +- v110 ++ v141 ++ MultiByte ++ ++ ++ Application ++ true ++ v141 + MultiByte + + + Application + false +- v110 ++ v141 ++ true ++ MultiByte ++ ++ ++ Application ++ false ++ v141 + true + MultiByte + +@@ -34,22 +56,41 @@ + + + ++ ++ ++ + + + ++ ++ ++ + + + + + Level3 + Disabled +- C:\Users\Gilbert\Documents\GitHub\cork\src;C:\Users\Gilbert\Documents\GitHub\cork\src\accel;C:\Users\Gilbert\Documents\GitHub\cork\src\file_formats;C:\Users\Gilbert\Documents\GitHub\cork\src\isct;C:\Users\Gilbert\Documents\GitHub\cork\src\math;C:\Users\Gilbert\Documents\GitHub\cork\src\mesh;C:\Users\Gilbert\Documents\GitHub\cork\src\rawmesh;C:\Users\Gilbert\Documents\GitHub\cork\src\util;%(AdditionalIncludeDirectories) ++ ..\..\src;..\..\src\accel;..\..\src\file_formats;..\..\src\isct;..\..\src\math;..\..\src\mesh;..\..\src\rawmesh;..\..\src\util;$(MPIR_ROOT_DIR)\include;%(AdditionalIncludeDirectories) ++ _USE_MATH_DEFINES;NOMINMAX;%(PreprocessorDefinitions) ++ MultiThreadedDebugDLL ++ ++ ++ true ++ $(MPIR_ROOT_DIR)\lib\mpir.lib %(AdditionalOptions) ++ ++ ++ ++ ++ Level3 ++ Disabled ++ ..\..\src;..\..\src\accel;..\..\src\file_formats;..\..\src\isct;..\..\src\math;..\..\src\mesh;..\..\src\rawmesh;..\..\src\util;$(MPIR_ROOT_DIR)\include;%(AdditionalIncludeDirectories) + _USE_MATH_DEFINES;NOMINMAX;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + + + true +- mpir.lib %(AdditionalOptions) ++ $(MPIR_ROOT_DIR)\lib\mpir.lib %(AdditionalOptions) + + + +@@ -58,13 +99,30 @@ + MaxSpeed + true + true +- C:\Users\Gilbert\Documents\GitHub\cork\src;C:\Users\Gilbert\Documents\GitHub\cork\src\accel;C:\Users\Gilbert\Documents\GitHub\cork\src\file_formats;C:\Users\Gilbert\Documents\GitHub\cork\src\isct;C:\Users\Gilbert\Documents\GitHub\cork\src\math;C:\Users\Gilbert\Documents\GitHub\cork\src\mesh;C:\Users\Gilbert\Documents\GitHub\cork\src\rawmesh;C:\Users\Gilbert\Documents\GitHub\cork\src\util;%(AdditionalIncludeDirectories) ++ ..\..\src;..\..\src\accel;..\..\src\file_formats;..\..\src\isct;..\..\src\math;..\..\src\mesh;..\..\src\rawmesh;..\..\src\util;$(MPIR_ROOT_DIR)\include;%(AdditionalIncludeDirectories) ++ _USE_MATH_DEFINES;NOMINMAX;%(PreprocessorDefinitions) ++ ++ ++ true ++ true ++ true ++ $(MPIR_ROOT_DIR)\lib\mpir.lib;%(AdditionalDependencies) ++ ++ ++ ++ ++ Level3 ++ MaxSpeed ++ true ++ true ++ ..\..\src;..\..\src\accel;..\..\src\file_formats;..\..\src\isct;..\..\src\math;..\..\src\mesh;..\..\src\rawmesh;..\..\src\util;$(MPIR_ROOT_DIR)\include;%(AdditionalIncludeDirectories) + _USE_MATH_DEFINES;NOMINMAX;%(PreprocessorDefinitions) + + + true + true + true ++ $(MPIR_ROOT_DIR)\lib\mpir.lib;%(AdditionalDependencies) + + + +@@ -109,7 +167,9 @@ + + + NO_TIMER;REDUCED;CDT_ONLY;TRILIBRARY;ANSI_DECLARATORS;%(PreprocessorDefinitions) ++ NO_TIMER;REDUCED;CDT_ONLY;TRILIBRARY;ANSI_DECLARATORS;%(PreprocessorDefinitions) + NO_TIMER;REDUCED;CDT_ONLY;TRILIBRARY;ANSI_DECLARATORS;%(PreprocessorDefinitions) ++ NO_TIMER;REDUCED;CDT_ONLY;TRILIBRARY;ANSI_DECLARATORS;%(PreprocessorDefinitions) + + + +diff --git a/win/wincork/wincork.vcxproj.filters b/win/wincork/wincork.vcxproj.filters +index 792818b..d689e83 100644 +--- a/win/wincork/wincork.vcxproj.filters ++++ b/win/wincork/wincork.vcxproj.filters +@@ -1,4 +1,4 @@ +- ++ + + + diff --git a/products/pyqwt.pyconf b/products/pyqwt.pyconf index d70eed9..1798ef3 100644 --- a/products/pyqwt.pyconf +++ b/products/pyqwt.pyconf @@ -33,23 +33,9 @@ default : } } -version_0_12_1 : -{ -} - version_0_12_1_no_pip : { - compil_script: "pyqwt-0.12.1.sh" - properties : - { - incremental : "yes" - pip : "no" - } -} - -version_0_12_1_win : -{ - compil_script: "pyqwt-0.12.1.bat" + compil_script: "pyqwt-0.12.1" + $VARS.scriptExtension properties : { incremental : "yes" diff --git a/products/qtpy.pyconf b/products/qtpy.pyconf index 409b1c7..9fff776 100644 --- a/products/qtpy.pyconf +++ b/products/qtpy.pyconf @@ -33,23 +33,9 @@ default : } } -version_2_4_1 : -{ -} - version_2_4_1_no_pip : { - compil_script: "qtpy-2.4.1.sh" - properties : - { - incremental : "yes" - pip : "no" - } -} - -version_2_4_1_win : -{ - compil_script: "qtpy-2.4.1.bat" + compil_script: "qtpy-2.4.1" + $VARS.scriptExtension properties : { incremental : "yes" diff --git a/products/wheel.pyconf b/products/wheel.pyconf new file mode 100644 index 0000000..1efcea0 --- /dev/null +++ b/products/wheel.pyconf @@ -0,0 +1,39 @@ +default : +{ + name : "wheel" + build_source : "script" + compil_script : 'pip_install' + $VARS.scriptExtension + get_source : "archive" + patches : [] + system_info : + { + rpm : [] + rpm_dev : [] + apt : ['python3-wheel'] + apt_dev : [] + } + environ : + { + env_script : "wheel.py" + } + depend : ['Python','setuptools','numpy', 'qwt', 'PyQt', 'qtpy'] + opt_depend: [] + source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name + build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name + install_dir : 'base' + properties : + { + incremental : "yes" + pip : "yes" + } +} + +version_0_44_0_no_pip : +{ + compil_script: "wheel-0.44.0" + $VARS.scriptExtension + properties : + { + incremental : "yes" + pip : "no" + } +} -- 2.39.2