docutils : '0.14'
doxygen : '1.8.3.1'
eigen : '3.3.4'
- embree : '3.5.2'
+ embree : '3.12.2'
expat : '2.0.1'
f2c : '1.0.0'
freeimage : '3.18.0'
#gmsh : '4.1.4'
graphviz : '2.44.1'
hdf5 : '1.10.3'
- #homard_bin : '11.12'
idna : '2.8'
imagesize : '1.1.0'
- ispc : '1.10.0'
+ ispc : '1.15.0'
Jinja2 : '2.10.1'
kiwisolver : '1.1.0'
lapack : '3.8.0'
Pygments : '2.4.2'
pyparsing : '2.4.0'
PyQt : '5.15.3'
- PyQtChart : '5.15.4'
+ # PyQtChart : '5.15.4'
pyreadline : '2.1'
Python : '3.6.5'
pytz : '2019.1'
sphinxintl: '2.0.0'
swig : '3.0.12'
tbb : '2019_U8_win'
+ toml : '0.10.2'
tcltk : '8.6.9'
urllib3 : '1.25.3'
zlib : '1.2.5'
'paraview.0005-ParaView_find_cgns.patch',
'paraview.0006-ParaView_find_libxml2.patch',
'paraview.0007-ParaView_find_freetype.patch',
- 'paraview.0008-ParaView_find_zlib.patch',
+ 'paraview.0009-ParaView_find_zlib.patch',
'paraview-0012-LATA_64BITS_IDS.patch',
'ParaView-5.9.0-CATALYST_cmake.patch',
+ 'paraview.0010-ParaView_windows_catalyst_cmake.patch',
'paraview.0008-ParaView_coincident_rendering.patch'
]
}
'paraview.0007-ParaView_find_freetype.patch',
'paraview.0008-ParaView_find_zlib.patch',
'ParaView-5.9.0-CATALYST_cmake.patch',
+ 'paraview.0010-ParaView_windows_catalyst_cmake.patch',
'paraview.0008-ParaView_coincident_rendering.patch'
]
}
compil_script : "PyQt-5.15" + $VARS.scriptExtension
}
-version_5_12_3 :
+version_5_15_3_win :
{
- name : "PyQt"
- compil_script : "PyQt-5.12" + $VARS.scriptExtension
-}
-
-
-version_5_11_3 :
-{
- compil_script : "PyQt-5.11" + $VARS.scriptExtension
+ depend : ['Python','setuptools', 'toml', 'sip', 'qt']
}
version_5_9 :
REM common ParaView settings
set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPARAVIEW_BUILD_SHARED_LIBS:BOOL=ON
set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_LIBDIR:STRING=lib
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_BINDIR:STRING=lib
set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBUILD_TESTING:BOOL=OFF
set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON
set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_MODULE_USE_EXTERNAL_VTK_zlib:BOOL=ON
set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DZLIB_INCLUDE_DIR:STRING=%ZLIB_ROOT_DIR:\=/%/include
if %SAT_DEBUG% == 0 (
- set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DZLIB_LIBRARY:STRING=%ZLIB_ROOT_DIR:\=/%/lib/zlib.lib
+ set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DZLIB_LIBRARY:STRING=%ZLIB_ROOT_DIR:\=/%/bin/zlib.lib
) else (
- set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DZLIB_LIBRARY:STRING=%ZLIB_ROOT_DIR:\=/%/lib/zlibd.lib
+ set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DZLIB_LIBRARY:STRING=%ZLIB_ROOT_DIR:\=/%/bin/zlibd.lib
)
REM Extra options (switch off non-used Paraview plug-ins)
set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPARAVIEW_PLUGIN_ENABLE_PacMan:BOOL=OFF
set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPARAVIEW_PLUGIN_ENABLE_pvblot:BOOL=OFF
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPARAVIEW_USE_CATALYST:BOOL=ON
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCATALYST_BUILD_STUB_IMPLEMENTATION:BOOL=ON
+
REM allow additional plugins
set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_ALL_NEW_OBJECT_FACTORY:BOOL=ON
exit 1
)
-REM
-REM see https://gitlab.kitware.com/paraview/paraview/-/issues/19488
-if %SAT_DEBUG% == 1 (
- del /Q Directory.Build.props
- echo > Directory.Build.props
- echo ^<Project^> > Directory.Build.props
- echo ^<ItemDefinitionGroup^> >> Directory.Build.props
- echo ^<Link^> >> Directory.Build.props
- echo ^<AdditionalLibraryDirectories^>%PYTHON_ROOT_DIR:\=/%/libs^;%%(AdditionalLibraryDirectories)^</AdditionalLibraryDirectories^> >> Directory.Build.props
- echo ^</Link^> >> Directory.Build.props
- echo ^</ItemDefinitionGroup^> >> Directory.Build.props
- echo ^</Project^> >> Directory.Build.props
-)
-
echo.
echo --------------------------------------------------------------------------
echo *** msbuild %MAKE_OPTIONS% ALL_BUILD.vcxproj /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64
REM clean BUILD directory
if exist "%BUILD_DIR%" rmdir /Q /S %BUILD_DIR%
mkdir %BUILD_DIR%
-
cd %SOURCE_DIR%
-
-call :NORMALIZEPATH "%PRODUCT_INSTALL%\..\Python"
-set python_exe=%RETVAL%\python.exe
-set python_name=python%PYTHON_VERSION%
-
-call :NORMALIZEPATH "%PRODUCT_INSTALL%\..\sip"
-set sip_incdir=%RETVAL%\include\%python_name%
+xcopy * %BUILD_DIR%\ /E /I /Q
+cd %BUILD_DIR%
echo.
echo --------------------------------------------------------------------------
echo *** python configure.py
echo --------------------------------------------------------------------------
-
-set PRODUCT_BUILD_TYPE=
+SET BUILD_OPTIONS=
+SET BUILD_OPTIONS=%BUILD_OPTIONS% -b %PRODUCT_INSTALL%/bin
+SET BUILD_OPTIONS=%BUILD_OPTIONS% -d %PRODUCT_INSTALL%
+SET BUILD_OPTIONS=%BUILD_OPTIONS% -v %PRODUCT_INSTALL%/sip
+SET BUILD_OPTIONS=%BUILD_OPTIONS% --stubsdir=%PRODUCT_INSTALL%/lib/site-packages
+SET BUILD_OPTIONS=%BUILD_OPTIONS% --designer-plugindir=%PRODUCT_INSTALL%/plugins/designer
+SET BUILD_OPTIONS=%BUILD_OPTIONS% --qml-plugindir=%PRODUCT_INSTALL%/plugins/qml
+SET BUILD_OPTIONS=%BUILD_OPTIONS% --no-qsci-api
+SET BUILD_OPTIONS=%BUILD_OPTIONS% --spec=win32-msvc
+SET BUILD_OPTIONS=%BUILD_OPTIONS% --confirm-license
+SET BUILD_OPTIONS=%BUILD_OPTIONS% --disable=QtNfc --disable=QtNetwork --disable=QtWebSockets
+SET BUILD_OPTIONS=%BUILD_OPTIONS% --target-py-version=%PYTHON_VERSION%
if %SAT_DEBUG% == 1 (
- python configure.py --confirm-license --no-designer-plugin --debug --bindir=%PRODUCT_INSTALL%\bin --destdir=%PRODUCT_INSTALL%\lib\%python_name%\site-packages --sipdir=%PRODUCT_INSTALL%\sip --spec=win32-msvc --sip-incdir=%sip_incdir% --pyuic5-interpreter=%python_exe% --disable QtNfc --disable=QtNetwork --disable=QtWebSockets 2>&1
-) else (
- python configure.py --confirm-license --no-designer-plugin --bindir=%PRODUCT_INSTALL%\bin --destdir=%PRODUCT_INSTALL%\lib\%python_name%\site-packages --sipdir=%PRODUCT_INSTALL%\sip --spec=win32-msvc --sip-incdir=%sip_incdir% --pyuic5-interpreter=%python_exe% --disable QtNfc --disable=QtNetwork --disable=QtWebSockets 2>&1
-)
+ SET BUILD_OPTIONS=%BUILD_OPTIONS% -u
+)
+%PYTHONBIN% configure.py %BUILD_OPTIONS:\=/%
if NOT %ERRORLEVEL% == 0 (
- echo ERROR on python configure.py
+ echo ERROR on python configure.py %BUILD_OPTIONS:\=/%
exit 1
)
echo.
echo ########## END
-
-:: ========== FUNCTIONS ==========
-EXIT /B
-
-:NORMALIZEPATH
- SET RETVAL=%~dpfn1
- EXIT /B
--- /dev/null
+@echo off
+
+echo ##########################################################################
+echo ispc %VERSION%
+echo ##########################################################################
+
+if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL%
+if NOT exist "%PRODUCT_INSTALL%\bin" mkdir %PRODUCT_INSTALL%\bin
+
+SET MSBUILDDISABLENODEREUSE=1
+cd %SOURCE_DIR%\bin
+xcopy * %PRODUCT_INSTALL%\bin /E /I /Q
+if NOT %ERRORLEVEL% == 0 (
+ echo ERROR on xcopy
+ exit 1
+)
+
+echo.
+echo ########## END
@echo off
echo ##########################################################################
-echo SIP + PyQt5_sip %VERSION%
+echo SIP %VERSION%
echo ##########################################################################
IF NOT DEFINED SAT_DEBUG (
cd %SOURCE_DIR%
xcopy * %BUILD_DIR%\ /E /I /Q
cd %BUILD_DIR%\sip-5.5.0
-
-
-set python_name=python%PYTHON_VERSION%
-
-rem mkdir %PRODUCT_INSTALL%\lib\%python_name%\site-packages
+mkdir %PRODUCT_INSTALL%\Lib\site-packages
set PATH=%CWD%\bin;%PATH%
-REM set PYTHONPATH=%PRODUCT_INSTALL%\lib\%python_name%\site-packages;%PYTHONPATH%
+set PYTHONPATH=%PYTHONPATH%;%PRODUCT_INSTALL%\Lib\site-packages
echo.
-echo *** build with %PYTHONBIN%
-%PYTHONBIN% setup.py build
+echo ***
+%PYTHONBIN% setup.py build install --prefix=%PRODUCT_INSTALL%
if NOT %ERRORLEVEL% == 0 (
- echo ERROR on SIP running %PYTHONBIN% setup.py build...
+ echo ERROR on SIP running %PYTHONBIN% setup.py build install --prefix=%PRODUCT_INSTALL%
exit 1
)
-
-echo.
-echo *** install with %PYTHONBIN%
-%PYTHONBIN% setup.py install --prefix=%PRODUCT_INSTALL%\lib\%python_name%\site-packages
-if NOT %ERRORLEVEL% == 0 (
- echo ERROR on SIP running %PYTHONBIN% setup.py install --prefix=%PRODUCT_INSTALL:\=/%
- exit 2
-)
-
cd %BUILD_DIR%\PyQt5_sip-12.8.1
-
-echo.
-echo *** build with %PYTHONBIN%
-%PYTHONBIN% setup.py build
+%PYTHONBIN% setup.py build install --prefix=%PRODUCT_INSTALL%
if NOT %ERRORLEVEL% == 0 (
- echo ERROR on PyQt5_sip running %PYTHONBIN% setup.py build...
- exit 3
-)
-
-echo.
-echo *** install with %PYTHONBIN%
-%PYTHONBIN% setup.py install --prefix=%PRODUCT_INSTALL:\=/%
-if NOT %ERRORLEVEL% == 0 (
- echo ERROR on PyQt5_sip running %PYTHONBIN% setup.py install --prefix=%PRODUCT_INSTALL:\=/%
- exit 4
+ echo ERROR on PYQT_SIP running %PYTHONBIN% setup.py build install --prefix=%PRODUCT_INSTALL%
+ exit 2
)
-mkdir %PRODUCT_INSTALL%\include
-xcopy /q /r /Y *.h %PRODUCT_INSTALL%\include
-
-
echo
echo ########## END
env.prepend('PATH', os.path.join(prereq_dir, 'bin'))
env.prepend('PYTHONPATH', prereq_dir)
pyver = 'python' + env.get('PYTHON_VERSION')
- env.prepend('PYTHONPATH', os.path.join(prereq_dir, 'lib', pyver, 'site-packages'))
if not platform.system() == "Windows" :
+ env.prepend('PYTHONPATH', os.path.join(prereq_dir, 'lib', pyver, 'site-packages'))
env.set('PYUIC5',os.path.join(prereq_dir, 'bin','pyuic5'))
env.prepend('LD_LIBRARY_PATH', prereq_dir)
else:
+ if '5.15' in version:
+ env.prepend('PYTHONPATH', os.path.join(prereq_dir, 'lib', 'site-packages'))
+ else:
+ env.prepend('PYTHONPATH', os.path.join(prereq_dir, 'lib', pyver, 'site-packages'))
env.set('PYUIC5',os.path.join(prereq_dir, 'bin','pyuic5.bat'))
def set_nativ_env(env):
env.prepend('LD_LIBRARY_PATH', os.path.join(prereq_dir, 'lib', pyver, 'site-packages'))
env.prepend('CPLUS_INCLUDE_PATH', os.path.join(prereq_dir, 'include', pyver))
else:
-# env.set('SIPDIR', os.path.join(env.get('PYTHON_ROOT_DIR'),'site-packages'))
-# env.set('SIP_ROOT_DIR', os.path.join(env.get('PYTHON_ROOT_DIR'),'site-packages'))
-# env.prepend('CPLUS_INCLUDE_PATH', os.path.join( env.get('PYTHON_INCLUDE_PATH'), pyver))
env.prepend('CPLUS_INCLUDE_PATH', os.path.join(prereq_dir, 'include', pyver))
- env.prepend('PYTHONPATH', os.path.join(prereq_dir, 'lib', pyver, 'site-packages'))
+ if '5.5.1' in version:
+ env.prepend('PYTHONPATH', os.path.join(prereq_dir, 'lib', 'site-packages'))
+ else:
+ env.prepend('PYTHONPATH', os.path.join(prereq_dir, 'lib', pyver, 'site-packages'))
env.prepend('PATH', os.path.join(prereq_dir, 'bin'))
def set_nativ_env(env):
--- /dev/null
+#!/usr/bin/env python
+#-*- coding:utf-8 -*-
+
+import os
+import platform
+
+def set_env(env, prereq_dir, version):
+ env.set("TOML_ROOT_DIR",prereq_dir)
+
+ versionPython = env.get('PYTHON_VERSION')
+ if not platform.system() == "Windows" :
+ env.prepend('PATH', os.path.join(prereq_dir, 'bin'))
+ env.prepend('PYTHONPATH',os.path.join(prereq_dir, 'lib', 'python' + versionPython, 'site-packages'))
+ env.prepend('PYTHONPATH',os.path.join(prereq_dir, 'bin'))
+
+def set_nativ_env(env):
+ pass
version_1_15_0 :
{
build_source : "script"
- compil_script : "ispc-1.15.0.sh"
+ compil_script : "ispc-1.15.0" + $VARS.scriptExtension
archive_info : {archive_name : "ispc-1.15.0-x86_64.tar.gz"}
patches : []
depend : []
}
+version_1_15_0_win :
+{
+ archive_info : {archive_name : "ispc-v1.15.0-windows.tar.gz"}
+ build_depend : ["cmake", "llvm"]
+}
+
version_1_9_2 :
{
build_source : "script"
--- /dev/null
+diff -Naur ParaView-5.8.0_SRC_orig/VTK/CMake/patches/3.13/FindZLIB.cmake ParaView-5.8.0_SRC_modif/VTK/CMake/patches/3.13/FindZLIB.cmake
+--- ParaView-5.8.0_SRC_orig/VTK/CMake/patches/3.13/FindZLIB.cmake 2020-03-23 13:31:26.000000000 +0300
++++ ParaView-5.8.0_SRC_modif/VTK/CMake/patches/3.13/FindZLIB.cmake 2020-04-13 14:13:11.214692753 +0300
+@@ -52,6 +52,11 @@
+
+ set(_ZLIB_SEARCHES)
+
++SET(ZLIB_ROOT_DIR $ENV{ZLIB_ROOT_DIR} CACHE PATH "PATH TO zlib.")
++IF(ZLIB_ROOT_DIR)
++ LIST(APPEND CMAKE_PREFIX_PATH "${ZLIB_ROOT_DIR}")
++ENDIF(ZLIB_ROOT_DIR)
++
+ # Search ZLIB_ROOT first if it is set.
+ if(ZLIB_ROOT)
+ set(_ZLIB_SEARCH_ROOT PATHS ${ZLIB_ROOT} NO_DEFAULT_PATH)
--- /dev/null
+diff -Naur ParaView-5.9.0_SRC_orig/ThirdParty/catalyst/vtkcatalyst/catalyst/cmake/catalyst-macros.cmake ParaView-5.9.0_SRC_modif/ThirdParty/catalyst/vtkcatalyst/catalyst/cmake/catalyst-macros.cmake
+--- ParaView-5.9.0_SRC_orig/ThirdParty/catalyst/vtkcatalyst/catalyst/cmake/catalyst-macros.cmake 2021-04-15 12:41:13.691878300 +0300
++++ ParaView-5.9.0_SRC_modif/ThirdParty/catalyst/vtkcatalyst/catalyst/cmake/catalyst-macros.cmake 2021-04-15 12:50:29.348516100 +0300
+@@ -65,11 +65,20 @@
+ if (arg_INSTALL_EXPORT_DEFAULT)
+ set (_exports EXPORT Catalyst)
+ endif()
+- if (arg_LIBRARY_DESTINATION)
+- install(
+- TARGETS ${arg_TARGET}
+- ${_exports}
+- LIBRARY DESTINATION ${arg_LIBRARY_DESTINATION})
++ if(WIN32)
++ if (arg_LIBRARY_DESTINATION)
++ install(
++ TARGETS ${arg_TARGET}
++ ${_exports}
++ RUNTIME DESTINATION ${arg_LIBRARY_DESTINATION})
++ endif()
++ else()
++ if (arg_LIBRARY_DESTINATION)
++ install(
++ TARGETS ${arg_TARGET}
++ ${_exports}
++ LIBRARY DESTINATION ${arg_LIBRARY_DESTINATION})
++ endif()
+ endif()
+ endfunction()
+
--- /dev/null
+default :
+{
+ name : "toml"
+ build_source : "script"
+ compil_script : 'pip_install' + $VARS.scriptExtension
+ get_source : "archive"
+ system_info :
+ {
+ rpm : ["python3-toml"]
+ rpm_dev : []
+ apt : ["python3-toml"]
+ apt_dev : []
+ }
+ environ :
+ {
+ env_script : $name + ".py"
+ }
+ depend : ['Python','setuptools']
+ 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"
+ }
+}
