From 8a85dae8a78a6843d422404b7b3863dcf13d9792 Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Tue, 23 Mar 2021 18:32:06 +0100 Subject: [PATCH] SALOME windows: update debug build options --- products/compil_scripts/ParaView-5.8.0.bat | 39 +++++++++++++++++++--- products/compil_scripts/PyQt-5.9.bat | 9 ++++- products/compil_scripts/Python-3.6.5.bat | 9 +++++ products/compil_scripts/cgns.bat | 6 ++-- products/compil_scripts/cython.bat | 10 +++++- products/compil_scripts/freeimage.bat | 6 ++++ products/compil_scripts/freetype.bat | 3 ++ products/compil_scripts/ispc.bat | 7 ++-- products/compil_scripts/netgen.bat | 31 ++++++++++------- products/compil_scripts/omniORB.bat | 3 +- products/compil_scripts/omniORBpy.bat | 6 +++- products/compil_scripts/opencv.bat | 8 +++-- products/compil_scripts/sip.bat | 7 ++++ products/sphinx_rtd_theme.pyconf | 23 +++++++++++++ 14 files changed, 138 insertions(+), 29 deletions(-) diff --git a/products/compil_scripts/ParaView-5.8.0.bat b/products/compil_scripts/ParaView-5.8.0.bat index 9606e3e..8cfd0ea 100644 --- a/products/compil_scripts/ParaView-5.8.0.bat +++ b/products/compil_scripts/ParaView-5.8.0.bat @@ -81,7 +81,11 @@ REM Python settings set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPARAVIEW_USE_PYTHON:BOOL=ON set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_WRAP_PYTHON:BOOL=ON set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPython3_INCLUDE_DIR:STRING=%PYTHON_ROOT_DIR:\=/%/include -set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPython3_LIBRARY:STRING=%PYTHON_ROOT_DIR:\=/%/libs/python%PYTHON_VERSION:.=%.lib +if %SAT_DEBUG% == 0 ( + set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPython3_LIBRARY:STRING=%PYTHON_ROOT_DIR:\=/%/libs/python%PYTHON_VERSION:.=%.lib +) else ( + set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPython3_LIBRARY:STRING=%PYTHON_ROOT_DIR:\=/%/libs/python%PYTHON_VERSION:.=%_d.lib +) set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_PYTHON_FULL_THREADSAFE:BOOL=ON set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_NO_PYTHON_THREADS:BOOL=OFF set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_PYTHON_VERSION:STRING=3 @@ -131,12 +135,19 @@ REM freetype settings set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_MODULE_USE_EXTERNAL_VTK_freetype:BOOL=ON set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DFREETYPE_INCLUDE_DIRS:PATH=%FREETYPE_ROOT_DIR:\=/%/include set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DFREETYPE_INCLUDE_DIR_freetype2:PATH=%FREETYPE_ROOT_DIR:\=/%/include/freetype2 -set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DFREETYPE_LIBRARY:STRING=%FREETYPE_ROOT_DIR:\=/%/lib/freetype.lib - +if %SAT_DEBUG% == 0 ( + set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DFREETYPE_LIBRARY:STRING=%FREETYPE_ROOT_DIR:\=/%/lib/freetype.lib +) else ( + set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DFREETYPE_LIBRARY:STRING=%FREETYPE_ROOT_DIR:\=/%/lib/freetyped.lib +) REM ZLIB settings 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 -set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DZLIB_LIBRARY:STRING=%ZLIB_ROOT_DIR:\=/%/bin/zlib1.lib +if %SAT_DEBUG% == 0 ( + set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DZLIB_LIBRARY:STRING=%ZLIB_ROOT_DIR:\=/%/lib/zlib.lib +) else ( + set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DZLIB_LIBRARY:STRING=%ZLIB_ROOT_DIR:\=/%/lib/zlibd.lib +) REM Extra options (switch off non-used Paraview plug-ins) set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPARAVIEW_PLUGINS_DEFAULT:BOOL=ON @@ -161,6 +172,20 @@ if NOT %ERRORLEVEL% == 0 ( 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 ^ > Directory.Build.props + echo ^ >> Directory.Build.props + echo ^ >> Directory.Build.props + echo ^%PYTHON_ROOT_DIR:\=/%/libs^;%%(AdditionalLibraryDirectories)^ >> Directory.Build.props + echo ^ >> Directory.Build.props + echo ^ >> Directory.Build.props + echo ^ >> Directory.Build.props +) + echo. echo -------------------------------------------------------------------------- echo *** msbuild %MAKE_OPTIONS% ALL_BUILD.vcxproj /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 @@ -191,6 +216,12 @@ MOVE /Y site-packages Lib\site-packages REM move set MSBUILDDISABLENODEREUSE=1 +REM In debug mode, we need to rename all .pyd to _d.pyd... don't ask why. Seems like a known bug in OmniORB. +if %SAT_DEBUG% == 1 ( + cd %PRODUCT_INSTALL%\bin\Lib\site-packages + powershell -Command "Get-ChildItem -File -Recurse *.pyd| ForEach-Object {if ((!$_.Name.EndsWith('_d.pyd'))) { $_ | Copy-Item -Destination {$_.Name -replace '.pyd','_d.pyd'}}}" +) + echo. echo -------------------------------------------------------------------------- echo *** Post processing diff --git a/products/compil_scripts/PyQt-5.9.bat b/products/compil_scripts/PyQt-5.9.bat index 576f24c..b1b2313 100644 --- a/products/compil_scripts/PyQt-5.9.bat +++ b/products/compil_scripts/PyQt-5.9.bat @@ -62,6 +62,13 @@ if NOT %ERRORLEVEL% == 0 ( exit 3 ) +REM In debug mode, we need to rename all .pyd to _d.pyd. +if %SAT_DEBUG% == 1 ( + cd %PRODUCT_INSTALL%\lib\%python_name%\site-packages\PyQt5 + powershell -Command "Get-ChildItem -File -Recurse *.pyd| ForEach-Object {if ((!$_.Name.EndsWith('_d.pyd'))) { $_ | Copy-Item -Destination {$_.Name -replace '.pyd','_d.pyd'}}}" + powershell -Command "Get-ChildItem -File -Recurse *_d.pyd| ForEach-Object {if (($_.Name.EndsWith('_d.pyd'))) { $_ | Copy-Item -Destination {$_.Name -replace '_d.pyd','.pyd'}}}" +) + echo. echo ########## END @@ -70,4 +77,4 @@ EXIT /B :NORMALIZEPATH SET RETVAL=%~dpfn1 - EXIT /B \ No newline at end of file + EXIT /B diff --git a/products/compil_scripts/Python-3.6.5.bat b/products/compil_scripts/Python-3.6.5.bat index 5a5474a..a639fc8 100644 --- a/products/compil_scripts/Python-3.6.5.bat +++ b/products/compil_scripts/Python-3.6.5.bat @@ -140,6 +140,15 @@ set PATH=%PRODUCT_INSTALL%\Scripts;%PATH% %PRODUCT_INSTALL%\python.exe %SOURCE_DIR%\externals\pip-19.1.1\get-pip.py --force-reinstall --no-setuptools --no-wheel --no-index --find-links=%SOURCE_DIR%\externals\pip-19.1.1 +REM In debug mode, we need to rename all _d.pyd to .pyd... don't ask why. Seems like a known bug in OmniORB. +if %SAT_DEBUG% == 1 ( + cd %PRODUCT_INSTALL% + powershell -Command "Get-ChildItem -File -Recurse *.pyd| ForEach-Object {if ((!$_.Name.EndsWith('_d.pyd'))) { $_ | Copy-Item -Destination {$_.Name -replace '.pyd','_d.pyd'}}}" + cd %PRODUCT_INSTALL%\lib\site-packages + powershell -Command "Get-ChildItem -File -Recurse *.pyd| ForEach-Object {if ((!$_.Name.EndsWith('_d.pyd'))) { $_ | Copy-Item -Destination {$_.Name -replace '.pyd','_d.pyd'}}}" +) + + taskkill /F /IM "mspdbsrv.exe" echo. diff --git a/products/compil_scripts/cgns.bat b/products/compil_scripts/cgns.bat index 20d9497..0cdb99c 100755 --- a/products/compil_scripts/cgns.bat +++ b/products/compil_scripts/cgns.bat @@ -11,9 +11,9 @@ IF NOT DEFINED SAT_DEBUG ( SET PRODUCT_BUILD_TYPE=Release REM TODO: NGH: not Tested yet -REM if %SAT_DEBUG% == 1 ( -REM set PRODUCT_BUILD_TYPE=Debug -REM ) +if %SAT_DEBUG% == 1 ( + set PRODUCT_BUILD_TYPE=Debug +) if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL% diff --git a/products/compil_scripts/cython.bat b/products/compil_scripts/cython.bat index 373249c..97e738b 100755 --- a/products/compil_scripts/cython.bat +++ b/products/compil_scripts/cython.bat @@ -39,13 +39,21 @@ echo -------------------------------------------------------------------------- if %INSTALL_CENTRALLY% == 1 ( %PYTHON_ROOT_DIR%\python.exe setup.py install ) else ( - %PYTHON_ROOT_DIR%\python setup.py install --single-version-externally-managed --root=/ --prefix=%PRODUCT_INSTALL% --install-lib=%PRODUCT_INSTALL%\lib\python%PYTHON_VERSION%\site-packages + %PYTHON_ROOT_DIR%\python.exe setup.py install --single-version-externally-managed --root=/ --prefix=%PRODUCT_INSTALL% --install-lib=%PRODUCT_INSTALL%\lib\python%PYTHON_VERSION%\site-packages ) if NOT %ERRORLEVEL% == 0 ( echo "ERROR on setup install" exit 3 ) +REM In debug mode, we need to rename all .pyd to _d.pyd... don't ask why. Seems like a known bug in OmniORB. +if %SAT_DEBUG% == 1 ( + cd %PYTHON_ROOT_DIR%\lib\site-packages\Cython-0.29.12-py3.6-win-amd64.egg + powershell -Command "Get-ChildItem -File -Recurse *.pyd| ForEach-Object {if ((!$_.Name.EndsWith('_d.pyd'))) { $_ | Copy-Item -Destination {$_.Name -replace '.pyd','_d.pyd'}}}" + cd %PYTHON_ROOT_DIR%lib\site-packages\Cython-0.29.12-py3.6-win-amd64.egg\Cython\Runtime + powershell -Command "Get-ChildItem -File -Recurse *.pyd| ForEach-Object {if ((!$_.Name.EndsWith('_d.pyd'))) { $_ | Copy-Item -Destination {$_.Name -replace '.pyd','_d.pyd'}}}" +) + echo. echo Product %PRODUCT_NAME% version: %VERSION%> %PRODUCT_INSTALL%\README.txt echo Installation folder: %PYTHON_ROOT_DIR%>> %PRODUCT_INSTALL%\README.txt diff --git a/products/compil_scripts/freeimage.bat b/products/compil_scripts/freeimage.bat index 61f1799..3bd5ad5 100644 --- a/products/compil_scripts/freeimage.bat +++ b/products/compil_scripts/freeimage.bat @@ -57,10 +57,16 @@ echo *** COPY FreeImage DLL to %PRODUCT_INSTALL% if %SAT_DEBUG% == 1 ( copy /Y %BUILD_DIR%\Dist\x64\*.dll %PRODUCT_INSTALL%\bin\ copy /Y %BUILD_DIR%\Dist\x64\*.lib %PRODUCT_INSTALL%\lib\ + copy /Y %BUILD_DIR%\Dist\x64\*.pdb %PRODUCT_INSTALL%\lib\ copy /Y %BUILD_DIR%\Dist\x64\*.h %PRODUCT_INSTALL%\include\ copy /Y %BUILD_DIR%\Wrapper\FreeImagePlus\dist\x64\*.dll %PRODUCT_INSTALL%\bin\ copy /Y %BUILD_DIR%\Wrapper\FreeImagePlus\dist\x64\*.lib %PRODUCT_INSTALL%\lib\ + copy /Y %BUILD_DIR%\Wrapper\FreeImagePlus\dist\x64\*.pdb %PRODUCT_INSTALL%\lib\ copy /Y %BUILD_DIR%\Wrapper\FreeImagePlus\dist\x64\*.h %PRODUCT_INSTALL%\include\ + copy /Y %BUILD_DIR%\Wrapper\FreeImagePlus\dist\x64\FreeImagePlusd.dll %PRODUCT_INSTALL%\bin\FreeImagePlus.dll + copy /Y %BUILD_DIR%\Wrapper\FreeImagePlus\dist\x64\FreeImagePlusd.lib %PRODUCT_INSTALL%\lib\FreeImagePlus.lib + copy /Y %BUILD_DIR%\Dist\x64\FreeImaged.dll %PRODUCT_INSTALL%\bin\FreeImage.dll + copy /Y %BUILD_DIR%\Dist\x64\FreeImaged.lib %PRODUCT_INSTALL%\lib\FreeImage.lib ) else ( copy /Y %BUILD_DIR%\Dist\x64\FreeImage.dll %PRODUCT_INSTALL%\bin\FreeImage.dll copy /Y %BUILD_DIR%\Dist\x64\FreeImage.lib %PRODUCT_INSTALL%\lib\FreeImage.lib diff --git a/products/compil_scripts/freetype.bat b/products/compil_scripts/freetype.bat index eaa1d40..60a1b9f 100755 --- a/products/compil_scripts/freetype.bat +++ b/products/compil_scripts/freetype.bat @@ -73,7 +73,10 @@ if NOT exist "%PRODUCT_INSTALL%\bin" mkdir %PRODUCT_INSTALL%\bin if %SAT_DEBUG% == 0 ( copy /Y %BUILD_DIR%\%PRODUCT_BUILD_TYPE%\Freetype.dll %PRODUCT_INSTALL%\bin\Freetype.dll ) else ( + copy /Y %BUILD_DIR%\%PRODUCT_BUILD_TYPE%\*.lib %PRODUCT_INSTALL%\lib\ copy /Y %BUILD_DIR%\%PRODUCT_BUILD_TYPE%\*.dll %PRODUCT_INSTALL%\bin\ + copy /Y %BUILD_DIR%\%PRODUCT_BUILD_TYPE%\Freetyped.dll %PRODUCT_INSTALL%\bin\Freetype.dll + copy /Y %BUILD_DIR%\%PRODUCT_BUILD_TYPE%\Freetyped.lib %PRODUCT_INSTALL%\lib\Freetype.lib ) if NOT %ERRORLEVEL% == 0 ( echo ERROR when copying Freetype DLL diff --git a/products/compil_scripts/ispc.bat b/products/compil_scripts/ispc.bat index 5d4fa03..ec54df7 100644 --- a/products/compil_scripts/ispc.bat +++ b/products/compil_scripts/ispc.bat @@ -9,9 +9,10 @@ IF NOT DEFINED SAT_DEBUG ( ) SET PRODUCT_BUILD_TYPE=Release -if %SAT_DEBUG% == 1 ( - set PRODUCT_BUILD_TYPE=Debug -) +REM Building ISPC in DEBUG mode is definitely not relevant. +REM if %SAT_DEBUG% == 1 ( +REM set PRODUCT_BUILD_TYPE=Debug +REM ) if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL% REM clean BUILD directory diff --git a/products/compil_scripts/netgen.bat b/products/compil_scripts/netgen.bat index b022dba..e41b901 100644 --- a/products/compil_scripts/netgen.bat +++ b/products/compil_scripts/netgen.bat @@ -4,6 +4,15 @@ echo ########################################################################## echo NETGEN %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 +) + dos2unix -q %SOURCE_DIR%/libsrc/occ/* dos2unix -q %SOURCE_DIR%/libsrc/nglib/* @@ -12,16 +21,14 @@ REM clean BUILD directory if exist "%BUILD_DIR%" rmdir /Q /S %BUILD_DIR% mkdir %BUILD_DIR% -set CMAKE_OPTIONS=-DCMAKE_INSTALL_PREFIX:STRING=%PRODUCT_INSTALL:\=/% -if defined CMAKE_GENERATOR ( - set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR% -) else ( - set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR="Visual Studio 15 2017 Win64" -) -set MSBUILDDISABLENODEREUSE=1 - +set CMAKE_OPTIONS= +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_PREFIX=%PRODUCT_INSTALL% +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE=%PRODUCT_BUILD_TYPE% set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DZLIB_ROOT_DIR=%ZLIB_DIR% set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCASROOT=%CASROOT% +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR="Visual Studio 15 2017 Win64" + +set MSBUILDDISABLENODEREUSE=1 cd %BUILD_DIR% @@ -38,11 +45,11 @@ if NOT %ERRORLEVEL% == 0 ( echo. echo ********************************************************************* -echo *** msbuild %MAKE_OPTIONS% /p:Configuration=Release ALL_BUILD.vcxproj" +echo *** msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% ALL_BUILD.vcxproj echo ********************************************************************* echo. -msbuild %MAKE_OPTIONS% /p:Configuration=Release ALL_BUILD.vcxproj +msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% ALL_BUILD.vcxproj if NOT %ERRORLEVEL% == 0 ( echo ERROR on msbuild ALL_BUILD.vcxproj exit 2 @@ -50,11 +57,11 @@ if NOT %ERRORLEVEL% == 0 ( echo. echo ********************************************************************* -echo *** installation... msbuild %MAKE_OPTIONS% /p:Configuration=Release INSTALL.vcxproj +echo *** installation... msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% INSTALL.vcxproj echo ********************************************************************* echo. -msbuild %MAKE_OPTIONS% /p:Configuration=Release INSTALL.vcxproj +msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% INSTALL.vcxproj if NOT %ERRORLEVEL% == 0 ( echo ERROR on msbuild INSTALL.vcxproj exit 3 diff --git a/products/compil_scripts/omniORB.bat b/products/compil_scripts/omniORB.bat index 8579b1c..b75192b 100755 --- a/products/compil_scripts/omniORB.bat +++ b/products/compil_scripts/omniORB.bat @@ -39,9 +39,8 @@ echo INFO: activating platform target: x86_win32_vs_15 sed "s/#platform = x86_win32_vs_15/platform = x86_win32_vs_15/g" < %CONFIG_REF% > %CONFIG_MK% if %SAT_DEBUG% == 1 ( copy %CONFIG_MK% %CONFIG_DBG% -) -if %SAT_DEBUG% == 1 ( sed "s/#BuildDebugBinary = 1/BuildDebugBinary = 1/g" < %CONFIG_DBG% > %CONFIG_MK% + sed -i '199s/\.lib/\_d\.lib/' %BUILD_DIR%\src\tool\omniidl\cxx\dir.mk ) REM target our Python in the configuration file diff --git a/products/compil_scripts/omniORBpy.bat b/products/compil_scripts/omniORBpy.bat index ab87ed1..3d7444b 100755 --- a/products/compil_scripts/omniORBpy.bat +++ b/products/compil_scripts/omniORBpy.bat @@ -36,5 +36,9 @@ if NOT %ERRORLEVEL% == 0 ( exit 2 ) +if %SAT_DEBUG% == 1 ( + cd %PRODUCT_INSTALL% + powershell -Command "Get-ChildItem -File -Recurse *.pyd| ForEach-Object {if ((!$_.Name.EndsWith('_d.pyd'))) { $_ | Copy-Item -Destination {$_.Name -replace '.pyd','_d.pyd'}}}" +) echo. -echo ########## END \ No newline at end of file +echo ########## END diff --git a/products/compil_scripts/opencv.bat b/products/compil_scripts/opencv.bat index 2e206c8..083ac65 100755 --- a/products/compil_scripts/opencv.bat +++ b/products/compil_scripts/opencv.bat @@ -26,7 +26,11 @@ SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DWITH_EIGEN:BOOL=OFF SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DSTATIC_LIBRARY_FLAGS:STRING="/machine:x64" SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPYTHON_EXECUTABLE=%PYTHON_ROOT_DIR:\=/%/python.exe set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPYTHON_INCLUDE_DIR:STRING=%PYTHON_ROOT_DIR:\=/%/include -SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPYTHON_LIBRARY=%PYTHON_ROOT_DIR:\=/%/libs/python%PYTHON_VERSION:.=%.lib +if %SAT_DEBUG% == 0 ( + set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPYTHON_LIBRARY:STRING=%PYTHON_ROOT_DIR:\=/%/libs/python%PYTHON_VERSION:.=%.lib +) else ( + set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPYTHON_LIBRARY:STRING=%PYTHON_ROOT_DIR:\=/%/libs/python%PYTHON_VERSION:.=%_d.lib +) SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBUILD_opencv_java:STRING=OFF SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR="Visual Studio 15 2017 Win64" @@ -68,4 +72,4 @@ if NOT %ERRORLEVEL% == 0 ( taskkill /F /IM "mspdbsrv.exe" echo. -echo ########## END \ No newline at end of file +echo ########## END diff --git a/products/compil_scripts/sip.bat b/products/compil_scripts/sip.bat index 3535513..3a18662 100755 --- a/products/compil_scripts/sip.bat +++ b/products/compil_scripts/sip.bat @@ -58,5 +58,12 @@ if NOT %ERRORLEVEL% == 0 ( exit 3 ) +REM In debug mode, we need to rename all _d.pyd to .pyd... don't ask why. Seems like a known bug in OmniORB. +if %SAT_DEBUG% == 1 ( + cd %PRODUCT_INSTALL%\lib\%python_name%\site-packages + powershell -Command "Get-ChildItem *_d.pyd| Rename-Item -newname { $_.name -replace '_d.pyd','.pyd' }" + powershell -Command "Get-ChildItem *.pyd| Rename-Item -newname { $_.name -replace '.pyd','_d.pyd' }" +) + echo. echo ########## END diff --git a/products/sphinx_rtd_theme.pyconf b/products/sphinx_rtd_theme.pyconf index 4c93f6b..f46ec83 100644 --- a/products/sphinx_rtd_theme.pyconf +++ b/products/sphinx_rtd_theme.pyconf @@ -36,3 +36,26 @@ version_0_1_9: pip : "no" } } + +version_0_4_3_win_dbg: +{ + name : "sphinx_rtd_theme" + build_source : "script" + compil_script : "sphinx_rtd_theme.bat" + get_source : "archive" + archive_info : {archive_name : "sphinx_rtd_theme-0.4.3.tar.gz"} + environ : + { + env_script : "sphinx_rtd_theme.py" + } + depend : ['Python', 'Sphinx'] + patches : [] + 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 : "no" + } +} -- 2.39.2