From 58492c1312c21b0210f85f9828a255622d4519dc Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Tue, 19 Jan 2021 13:21:33 +0100 Subject: [PATCH] SAT - Windows DEBUG mode --- applications/SALOME-master-windows.pyconf | 10 ++++ products/compil_scripts/ParaView.bat | 10 ++-- products/compil_scripts/PyQt-5.9.bat | 11 ++++- products/compil_scripts/Python-3.6.5.bat | 30 ++---------- products/compil_scripts/boost_V1.67.0.bat | 6 +-- products/compil_scripts/cppunit.bat | 6 +-- products/compil_scripts/cython.bat | 9 ++-- products/compil_scripts/eigen.bat | 11 +++-- products/compil_scripts/freeimage.bat | 27 +++++++---- products/compil_scripts/freetype.bat | 24 +++++----- products/compil_scripts/graphviz-2.44.1.bat | 6 +-- products/compil_scripts/hdf5CMake.bat | 31 ++---------- products/compil_scripts/ispc.bat | 12 ++--- products/compil_scripts/lapack.bat | 30 ++++++------ products/compil_scripts/medCMake.bat | 10 ++-- products/compil_scripts/opencv.bat | 6 +-- products/compil_scripts/pthreads.bat | 7 ++- products/compil_scripts/qt.bat | 8 ++-- products/compil_scripts/qwt-6.1.0.bat | 20 +++++--- products/compil_scripts/sip.bat | 16 ++++++- products/compil_scripts/sphinxintl.bat | 53 +++++++++++++++++++++ products/sphinxintl.pyconf | 10 ++++ 22 files changed, 208 insertions(+), 145 deletions(-) create mode 100644 products/compil_scripts/sphinxintl.bat diff --git a/applications/SALOME-master-windows.pyconf b/applications/SALOME-master-windows.pyconf index 9013ca0..e4af8c0 100644 --- a/applications/SALOME-master-windows.pyconf +++ b/applications/SALOME-master-windows.pyconf @@ -156,6 +156,7 @@ APPLICATION : 'EFICAS' 'EFICAS_TOOLS' 'ADAO' + 'PARAVISADDONS' : {tag: 'spns/20440'} 'CEATESTBASE' : {tag: 'SalomeV9'} } profile : @@ -181,3 +182,12 @@ APPLICATION : single_install_dir : "yes" } } + +__overwrite__ : +[ + { + __condition__ : "APPLICATION.debug == 'yes'" + 'APPLICATION.products.numpy' : {tag : '1.16.4', section: 'version_1_16_4_win_dbg'} + 'APPLICATION.products.sphinxintl' : {tag : '2.0.0', section: 'version_2_0_0_win_dbg'} + } +] diff --git a/products/compil_scripts/ParaView.bat b/products/compil_scripts/ParaView.bat index 52c56d0..d6c8b6d 100644 --- a/products/compil_scripts/ParaView.bat +++ b/products/compil_scripts/ParaView.bat @@ -14,17 +14,15 @@ if exist "%BUILD_DIR%" rmdir /Q /S %BUILD_DIR% mkdir %BUILD_DIR% SET PRODUCT_BUILD_TYPE=Release -REM TODO: NGH: not Tested yet -REM if %SAT_DEBUG% == 1 ( -REM set PRODUCT_BUILD_TYPE=Debug -REM ) - -set CMAKE_OPTIONS= +if %SAT_DEBUG% == 1 ( + set PRODUCT_BUILD_TYPE=Debug +) set PVLIBVERSION=5.8 set python_name=python%PYTHON_VERSION% +set CMAKE_OPTIONS= REM common compiler and install settings set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_PREFIX:STRING=%PRODUCT_INSTALL:\=/% set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_VERBOSE_MAKEFILE=ON diff --git a/products/compil_scripts/PyQt-5.9.bat b/products/compil_scripts/PyQt-5.9.bat index ebd688f..576f24c 100644 --- a/products/compil_scripts/PyQt-5.9.bat +++ b/products/compil_scripts/PyQt-5.9.bat @@ -4,6 +4,10 @@ echo ########################################################################## echo PyQt %VERSION% echo ########################################################################## +IF NOT DEFINED SAT_DEBUG ( + SET SAT_DEBUG=0 +) + if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL% REM clean BUILD directory if exist "%BUILD_DIR%" rmdir /Q /S %BUILD_DIR% @@ -23,7 +27,12 @@ echo -------------------------------------------------------------------------- echo *** python configure.py echo -------------------------------------------------------------------------- -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 PRODUCT_BUILD_TYPE= +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 +) if NOT %ERRORLEVEL% == 0 ( echo ERROR on python configure.py exit 1 diff --git a/products/compil_scripts/Python-3.6.5.bat b/products/compil_scripts/Python-3.6.5.bat index 8112a59..5a5474a 100644 --- a/products/compil_scripts/Python-3.6.5.bat +++ b/products/compil_scripts/Python-3.6.5.bat @@ -115,36 +115,16 @@ if NOT %ERRORLEVEL% == 0 ( exit 6 ) -REM on purpose, we don't use mklink +REM on purpose, we don't use mklink - requires admin rights... copy /Y /B %PRODUCT_INSTALL%\python%LIB_TAG%.exe %PRODUCT_INSTALL%\python3.exe - -REM some prequistes the DLL to be renamed -REM on purpose we don't use mklink, since this requires the user to have his node set in developer mode. -cd %PRODUCT_INSTALL%\ -if %SAT_DEBUG% == 1 ( - FOR %%G IN (python3 python python36 sqlite3 pyshellext) DO copy /Y /B %PRODUCT_INSTALL%\%%G%LIB_TAG%.dll %PRODUCT_INSTALL%\%%G.dll -) - -REM some of the products expect .lib instead of _d.lib... -REM on purpose we don't use mklink, since this requires the user to have his node set in developer mode. -cd %PRODUCT_INSTALL%\libs\ if %SAT_DEBUG% == 1 ( - SETLOCAL ENABLEDELAYEDEXPANSION - FOR %%f IN (*_d.lib) do ( - set X=%%f - copy /Y /B %PRODUCT_INSTALL%\libs\%%f %PRODUCT_INSTALL%\libs\!X:_d.lib=.lib! - copy /Y /B %PRODUCT_INSTALL%\%%f %PRODUCT_INSTALL%\!X:_d.lib=.lib! - ) - ENDLOCAL + copy /Y /B %PRODUCT_INSTALL%\python_d.exe %PRODUCT_INSTALL%\python.exe + REM otherwise OmniORB does not compile... + copy /Y /B %PRODUCT_INSTALL%\libs\python36_d.lib %PRODUCT_INSTALL%\libs\python36.lib + copy /Y /B %PRODUCT_INSTALL%\libs\python_d.lib %PRODUCT_INSTALL%\libs\python.lib ) cd %PRODUCT_INSTALL%\ -powershell -Command "Get-ChildItem *_d.exe| Rename-Item -newname { $_.name -replace '_d.exe','.exe' }" -REM powershell -Command "Get-ChildItem *_d.dll| Rename-Item -newname { $_.name -replace '_d.dll','.dll' }" -REM powershell -Command "Get-ChildItem *_d.pdb| Rename-Item -newname { $_.name -replace '_d.pdb','.pdb' }" -REM powershell -Command "Get-ChildItem *_d.pyd| Rename-Item -newname { $_.name -replace '_d.pyd','.pyd' }" -REM powershell -Command "Get-ChildItem *_d.exp| Rename-Item -newname { $_.name -replace '_d.exp','.exp' }" -REM powershell -Command "Get-ChildItem *_d.ilk| Rename-Item -newname { $_.name -replace '_d.ilk','.ilk' }" REM Add PIP support set PYTHONHOME=%PRODUCT_INSTALL% diff --git a/products/compil_scripts/boost_V1.67.0.bat b/products/compil_scripts/boost_V1.67.0.bat index ff595b3..477b975 100644 --- a/products/compil_scripts/boost_V1.67.0.bat +++ b/products/compil_scripts/boost_V1.67.0.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% if NOT exist "%PRODUCT_INSTALL%\include" mkdir %PRODUCT_INSTALL%\include diff --git a/products/compil_scripts/cppunit.bat b/products/compil_scripts/cppunit.bat index 6327308..53e6e27 100755 --- a/products/compil_scripts/cppunit.bat +++ b/products/compil_scripts/cppunit.bat @@ -10,9 +10,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 3715a7b..373249c 100755 --- a/products/compil_scripts/cython.bat +++ b/products/compil_scripts/cython.bat @@ -24,9 +24,10 @@ echo -------------------------------------------------------------------------- echo *** Launching "python.exe setup.py build" echo -------------------------------------------------------------------------- set BUILD_OPT= -if %SAT_DEBUG% == 1 ( - set BUILD_OPT=--debug -) +REM not built by OCCT - see spns #20292 attached Excel document +REM if %SAT_DEBUG% == 1 ( +REM set BUILD_OPT=--debug +REM) %PYTHON_ROOT_DIR%\python.exe setup.py build %BUILD_OPT% @@ -50,4 +51,4 @@ echo Product %PRODUCT_NAME% version: %VERSION%> %PRODUCT_INSTALL%\README.txt echo Installation folder: %PYTHON_ROOT_DIR%>> %PRODUCT_INSTALL%\README.txt echo. -echo ########## END \ No newline at end of file +echo ########## END diff --git a/products/compil_scripts/eigen.bat b/products/compil_scripts/eigen.bat index dee85e0..bcba481 100644 --- a/products/compil_scripts/eigen.bat +++ b/products/compil_scripts/eigen.bat @@ -10,9 +10,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% REM clean BUILD directory @@ -22,7 +22,10 @@ mkdir %BUILD_DIR% cd %BUILD_DIR% REM Install dir -set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_PREFIX:STRING=%PRODUCT_INSTALL:\=/% -DCMAKE_GENERATOR="Visual Studio 15 2017 Win64" +set CMAKE_OPTIONS= +SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE:STRING=%PRODUCT_BUILD_TYPE% +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_PREFIX:STRING=%PRODUCT_INSTALL:\=/% +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR="Visual Studio 15 2017 Win64" echo. diff --git a/products/compil_scripts/freeimage.bat b/products/compil_scripts/freeimage.bat index 05ee31d..61f1799 100644 --- a/products/compil_scripts/freeimage.bat +++ b/products/compil_scripts/freeimage.bat @@ -10,9 +10,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% if NOT exist "%PRODUCT_INSTALL%\include" mkdir %PRODUCT_INSTALL%\include @@ -54,12 +54,21 @@ if NOT %ERRORLEVEL% == 0 ( echo. echo *** COPY FreeImage DLL to %PRODUCT_INSTALL% -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 -copy /Y %BUILD_DIR%\Dist\x64\FreeImage.h %PRODUCT_INSTALL%\include\FreeImage.h -copy /Y %BUILD_DIR%\Wrapper\FreeImagePlus\dist\x64\FreeImagePlus.dll %PRODUCT_INSTALL%\bin\FreeImagePlus.dll -copy /Y %BUILD_DIR%\Wrapper\FreeImagePlus\dist\x64\FreeImagePlus.lib %PRODUCT_INSTALL%\lib\FreeImagePlus.lib -copy /Y %BUILD_DIR%\Wrapper\FreeImagePlus\dist\x64\FreeImagePlus.h %PRODUCT_INSTALL%\include\FreeImagePlus.h +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\*.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\*.h %PRODUCT_INSTALL%\include\ +) 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 + copy /Y %BUILD_DIR%\Dist\x64\FreeImage.h %PRODUCT_INSTALL%\include\FreeImage.h + copy /Y %BUILD_DIR%\Wrapper\FreeImagePlus\dist\x64\FreeImagePlus.dll %PRODUCT_INSTALL%\bin\FreeImagePlus.dll + copy /Y %BUILD_DIR%\Wrapper\FreeImagePlus\dist\x64\FreeImagePlus.lib %PRODUCT_INSTALL%\lib\FreeImagePlus.lib + copy /Y %BUILD_DIR%\Wrapper\FreeImagePlus\dist\x64\FreeImagePlus.h %PRODUCT_INSTALL%\include\FreeImagePlus.h +) taskkill /F /IM "mspdbsrv.exe" diff --git a/products/compil_scripts/freetype.bat b/products/compil_scripts/freetype.bat index f36414f..eaa1d40 100755 --- a/products/compil_scripts/freetype.bat +++ b/products/compil_scripts/freetype.bat @@ -9,10 +9,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% @@ -21,15 +20,12 @@ 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=%PRODUCT_INSTALL% set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE=%PRODUCT_BUILD_TYPE% set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBUILD_SHARED_LIBS=ON set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_DISABLE_FIND_PACKAGE_HarfBuzz=TRUE -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 CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR="Visual Studio 15 2017 Win64" set MSBUILDDISABLENODEREUSE=1 echo. @@ -46,7 +42,7 @@ if NOT %ERRORLEVEL% == 0 ( echo. echo ********************************************************************* -echo *** msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% ALL_BUILD.vcxproj" +echo *** msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% ALL_BUILD.vcxproj echo ********************************************************************* echo. @@ -70,11 +66,15 @@ if NOT %ERRORLEVEL% == 0 ( echo. echo ********************************************************************* -echo *** COPY Freetype DLL file from %BUILD_DIR% to %PRODUCT_INSTALL% +echo *** COPY Freetype DLL files from %BUILD_DIR% to %PRODUCT_INSTALL% echo ********************************************************************* echo. if NOT exist "%PRODUCT_INSTALL%\bin" mkdir %PRODUCT_INSTALL%\bin -copy /Y %BUILD_DIR%\%PRODUCT_BUILD_TYPE%\Freetype.dll %PRODUCT_INSTALL%\bin\Freetype.dll +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%\*.dll %PRODUCT_INSTALL%\bin\ +) if NOT %ERRORLEVEL% == 0 ( echo ERROR when copying Freetype DLL exit 2 diff --git a/products/compil_scripts/graphviz-2.44.1.bat b/products/compil_scripts/graphviz-2.44.1.bat index 43a0b2e..7ca5694 100644 --- a/products/compil_scripts/graphviz-2.44.1.bat +++ b/products/compil_scripts/graphviz-2.44.1.bat @@ -10,9 +10,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% if NOT exist "%PRODUCT_INSTALL%\bin" mkdir %PRODUCT_INSTALL%\bin diff --git a/products/compil_scripts/hdf5CMake.bat b/products/compil_scripts/hdf5CMake.bat index e7c9c39..e413b19 100755 --- a/products/compil_scripts/hdf5CMake.bat +++ b/products/compil_scripts/hdf5CMake.bat @@ -9,10 +9,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% @@ -79,31 +78,7 @@ if NOT %ERRORLEVEL% == 0 ( exit 3 ) -REM some of the products like GUI expect .lib instead of _D.lib... -cd %PRODUCT_INSTALL%\lib\ -if %SAT_DEBUG% == 1 ( - SETLOCAL ENABLEDELAYEDEXPANSION - FOR %%f IN (*_D.lib) do ( - set X=%%f - copy /Y /B %PRODUCT_INSTALL%\lib\%%f %PRODUCT_INSTALL%\lib\!X:_D.lib=.lib! - ) - ENDLOCAL -) - -REM Symbolic links require being in developer mode -cd %PRODUCT_INSTALL%\bin\ -if %SAT_DEBUG% == 1 ( - SETLOCAL ENABLEDELAYEDEXPANSION - FOR %%f IN (*_D.dll) do ( - set X=%%f - copy /Y /B %PRODUCT_INSTALL%\bin\%%f %PRODUCT_INSTALL%\bin\!X:_D.dll=.dll! - ) - ENDLOCAL -) - taskkill /F /IM "mspdbsrv.exe" - - echo. echo ########## END diff --git a/products/compil_scripts/ispc.bat b/products/compil_scripts/ispc.bat index fbf0bfe..5d4fa03 100644 --- a/products/compil_scripts/ispc.bat +++ b/products/compil_scripts/ispc.bat @@ -9,10 +9,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% REM clean BUILD directory @@ -28,7 +27,8 @@ if NOT defined CYGWIN_ROOT_DIR ( set PATH=%PATH%;%CYGWIN_ROOT_DIR%\bin -SET CMAKE_OPTIONS=-DCMAKE_INSTALL_PREFIX:STRING=%PRODUCT_INSTALL:\=/% +SET CMAKE_OPTIONS= +SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_PREFIX:STRING=%PRODUCT_INSTALL:\=/% SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE:STRING=%PRODUCT_BUILD_TYPE% SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPYTHON_EXECUTABLE=%PYTHON_ROOT_DIR:\=/%/python.exe @@ -72,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/lapack.bat b/products/compil_scripts/lapack.bat index 02a8e8c..65a5d88 100644 --- a/products/compil_scripts/lapack.bat +++ b/products/compil_scripts/lapack.bat @@ -9,10 +9,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 +) set GFORTRAN_EXE=%MINGW_ROOT_DIR%\bin\gfortran.exe @@ -26,8 +25,8 @@ echo ************************************************ echo *** Setting local path to %MINGW_ROOT_DIR%\bin echo ************************************************ set path=%MINGW_ROOT_DIR%\bin;%path% -set CMAKE_OPTIONS=%SOURCE_DIR% -set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_PREFIX=%PRODUCT_INSTALL% +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% -DBUILD_SHARED_LIBS:BOOL=ON set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_CXX_FLAGS=-fPIC @@ -39,29 +38,28 @@ set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_SIZEOF_VOID_P=8 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_Fortran_COMPILER=%MINGW_ROOT_DIR:\=/%/bin/gfortran.exe set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_EXE_LINKER_FLAGS="-Wl,--allow-multiple-definition" set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_SH="CMAKE_SH-NOTFOUND" -if defined CMAKE_GENERATOR ( - set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR% -) else ( - set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR="MinGW Makefiles" -) +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR="MinGW Makefiles" + set MSBUILDDISABLENODEREUSE=1 echo. +echo ********************************************************************* echo *** cmake %CMAKE_OPTIONS}% -%CMAKE_ROOT%\bin\cmake %CMAKE_OPTIONS% +echo ********************************************************************* +%CMAKE_ROOT%\bin\cmake %CMAKE_OPTIONS% %SOURCE_DIR% if NOT %ERRORLEVEL% == 0 ( echo "ERROR on cmake" exit 1 ) + echo. echo ********************************************************************* -echo *** mingw32-make" +echo *** mingw32-make echo ********************************************************************* echo. - mingw32-make if NOT %ERRORLEVEL% == 0 ( - echo ERROR on msbuild ALL_BUILD.vcxproj + echo ERROR on mingw32-make exit 2 ) @@ -72,7 +70,7 @@ echo ********************************************************************* echo. mingw32-make install if NOT %ERRORLEVEL% == 0 ( - echo ERROR on msbuild INSTALL.vcxproj + echo ERROR on mingw32-make install exit 3 ) diff --git a/products/compil_scripts/medCMake.bat b/products/compil_scripts/medCMake.bat index 640260e..1425d2e 100755 --- a/products/compil_scripts/medCMake.bat +++ b/products/compil_scripts/medCMake.bat @@ -9,17 +9,17 @@ 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% 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:\=/% +SET CMAKE_OPTIONS= +SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_PREFIX:STRING=%PRODUCT_INSTALL:\=/% SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE:STRING=%PRODUCT_BUILD_TYPE% SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DMEDFILE_BUILD_STATIC_LIBS:BOOL=OFF SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DMEDFILE_BUILD_SHARED_LIBS:BOOL=ON diff --git a/products/compil_scripts/opencv.bat b/products/compil_scripts/opencv.bat index 2559c0b..2e206c8 100755 --- a/products/compil_scripts/opencv.bat +++ b/products/compil_scripts/opencv.bat @@ -10,9 +10,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% REM clean BUILD directory diff --git a/products/compil_scripts/pthreads.bat b/products/compil_scripts/pthreads.bat index 2cb43af..579ec8e 100755 --- a/products/compil_scripts/pthreads.bat +++ b/products/compil_scripts/pthreads.bat @@ -9,10 +9,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% if NOT exist "%PRODUCT_INSTALL%\lib" mkdir %PRODUCT_INSTALL%\lib diff --git a/products/compil_scripts/qt.bat b/products/compil_scripts/qt.bat index 18132c6..d3b6577 100644 --- a/products/compil_scripts/qt.bat +++ b/products/compil_scripts/qt.bat @@ -9,10 +9,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-and-release +) if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL% REM clean BUILD directory @@ -32,6 +31,7 @@ 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% -prefix %PRODUCT_INSTALL% +echo **** call configure %QT_OPTIONS% call configure %QT_OPTIONS% if NOT %ERRORLEVEL% == 0 ( echo "ERROR on configure" diff --git a/products/compil_scripts/qwt-6.1.0.bat b/products/compil_scripts/qwt-6.1.0.bat index b015a0e..2bbc35a 100755 --- a/products/compil_scripts/qwt-6.1.0.bat +++ b/products/compil_scripts/qwt-6.1.0.bat @@ -4,6 +4,10 @@ echo ########################################################################## echo qwt %VERSION% echo ########################################################################## +IF NOT DEFINED SAT_DEBUG ( + SET SAT_DEBUG=0 +) + if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL% if exist "%BUILD_DIR%" rmdir /Q /S "%BUILD_DIR%" @@ -39,13 +43,15 @@ sed "s|\(target\.path[[:space:]]*\)=\([[:space:]]*\).*|\1=\2\$\$QWT_INSTALL_PREF move /y %tmpfile% designer.pro cd .. -rem # Desactivation du mode Debug -call :GETTEMPNAME -attrib -R qwtbuild.pri -sed "s|\(CONFIG[[:space:]]*+=[[:space:]]*debug_and_release\)|#\1|g" < qwtbuild.pri > %tmpfile% -move /y %tmpfile% qwtbuild.pri -sed "s|\(CONFIG[[:space:]]*+=[[:space:]]*build_all\)|#\1|g" < qwtbuild.pri > %tmpfile% -move /y %tmpfile% qwtbuild.pri +REM remove debug build only if release build is requested +if %SAT_DEBUG% == 0 ( + call :GETTEMPNAME + attrib -R qwtbuild.pri + sed "s|\(CONFIG[[:space:]]*+=[[:space:]]*debug_and_release\)|#\1|g" < qwtbuild.pri > %tmpfile% + move /y %tmpfile% qwtbuild.pri + sed "s|\(CONFIG[[:space:]]*+=[[:space:]]*build_all\)|#\1|g" < qwtbuild.pri > %tmpfile% + move /y %tmpfile% qwtbuild.pri +) echo. echo -------------------------------------------------------------------------- diff --git a/products/compil_scripts/sip.bat b/products/compil_scripts/sip.bat index 2b39abc..3535513 100755 --- a/products/compil_scripts/sip.bat +++ b/products/compil_scripts/sip.bat @@ -4,12 +4,18 @@ echo ########################################################################## echo sip %VERSION% echo ########################################################################## +IF NOT DEFINED SAT_DEBUG ( + SET SAT_DEBUG=0 +) + + 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% set python_name=python%PYTHON_VERSION% @@ -18,12 +24,18 @@ echo -------------------------------------------------------------------------- echo Launching "python.exe configure.py" echo -------------------------------------------------------------------------- -%PYTHON_ROOT_DIR%\python.exe configure.py -b %PRODUCT_INSTALL%\bin -d %PRODUCT_INSTALL%\lib\%python_name%\site-packages -e %PRODUCT_INSTALL%\include\%python_name% -v %PRODUCT_INSTALL%\sip -p win32-msvc +if %SAT_DEBUG% == 1 ( + %PYTHON_ROOT_DIR%\python_d.exe %SOURCE_DIR%\configure.py --debug -b %PRODUCT_INSTALL%\bin -d %PRODUCT_INSTALL%\lib\%python_name%\site-packages -e %PRODUCT_INSTALL%\include\%python_name% -v %PRODUCT_INSTALL%\sip -p win32-msvc +) else ( + %PYTHON_ROOT_DIR%\python.exe configure.py -b %PRODUCT_INSTALL%\bin -d %PRODUCT_INSTALL%\lib\%python_name%\site-packages -e %PRODUCT_INSTALL%\include\%python_name% -v %PRODUCT_INSTALL%\sip -p win32-msvc +) + if NOT %ERRORLEVEL% == 0 ( echo "ERROR on python configure.py " exit 1 ) + echo. echo -------------------------------------------------------------------------- echo Launching "nmake" diff --git a/products/compil_scripts/sphinxintl.bat b/products/compil_scripts/sphinxintl.bat new file mode 100644 index 0000000..2d1c4d8 --- /dev/null +++ b/products/compil_scripts/sphinxintl.bat @@ -0,0 +1,53 @@ +@echo off + +echo ########################################################################## +echo sphinxintl %VERSION% +echo ########################################################################## + +REM install in python directly +SET INSTALL_CENTRALLY=1 + +IF NOT DEFINED SAT_DEBUG ( + SET SAT_DEBUG=0 +) + +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% + +echo. +echo -------------------------------------------------------------------------- +echo Launching "python.exe setup.py build" +echo -------------------------------------------------------------------------- +set BUILD_OPT= +if %SAT_DEBUG% == 1 ( + set BUILD_OPT=--debug +) + +%PYTHON_ROOT_DIR%\python.exe setup.py build %BUILD_OPT% + +echo. +echo -------------------------------------------------------------------------- +echo Launching "python.exe setup.py install" +echo -------------------------------------------------------------------------- + +if %INSTALL_CENTRALLY% == 1 ( + %PYTHON_ROOT_DIR%\python.exe setup.py install +) else ( + %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.py 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/sphinxintl.pyconf b/products/sphinxintl.pyconf index 5804a43..e8c3c44 100644 --- a/products/sphinxintl.pyconf +++ b/products/sphinxintl.pyconf @@ -24,3 +24,13 @@ default_win : compil_script : 'pip_install_whl' + $VARS.scriptExtension archive_info : {archive_name : "sphinx_intl-" + $APPLICATION.products.sphinxintl + "_windows.tar.gz"} } + +version_2_0_0_win_dbg : +{ + compil_script : 'sphinxintl.bat' + properties: + { + incremental : "yes" + pip : "no" + } +} \ No newline at end of file -- 2.39.2