SAT - Windows DEBUG mode

diff --git a/applications/SALOME-master-windows.pyconf b/applications/SALOME-master-windows.pyconf
index 9013ca09da07e38b67ba3f6c366cb059a68b8933..e4af8c0f67b1e48eeab248c9d7fa3759b274f229 100644 (file)
--- 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 52c56d014b215d4ef9b52fdfeb117eb5fbec8613..d6c8b6deca5e7af41d89d4214646161af81fee35 100644 (file)
--- 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 ebd688fa0a33d331ade0a4fef3ef56b08ab0cde8..576f24c8c6d27b95eceed1d20ed7d15a6d4df2ee 100644 (file)
--- 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 8112a59b17bdff1f3b39191e79a255c87eb2ec4e..5a5474a3908f33b8119556ed002693b6f7678297 100644 (file)
--- 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 ff595b3eb0df051a3c301893b814b10d6f0a6047..477b97511aa1eb32ed4007c099caf40011b55adb 100644 (file)
--- 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 632730809d28c7f16ba6b053d6d4ec4dc9a23574..53e6e279a953d2a9eb55f1ad25a92959328c751a 100755 (executable)
--- a/products/compil_scripts/cppunit.bat
+++ b/products/compil_scripts/cppunit.bat
@@ -10,9 +10,9 @@ IF NOT DEFINED SAT_DEBUG (
 \r
 SET PRODUCT_BUILD_TYPE=Release\r
 REM TODO: NGH: not Tested yet\r
-REM if %SAT_DEBUG% == 1 (\r
-REM   set PRODUCT_BUILD_TYPE=Debug\r
-REM )\r
+if %SAT_DEBUG% == 1 (\r
+  set PRODUCT_BUILD_TYPE=Debug\r
+)\r
 \r
 if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL%\r
 \r

diff --git a/products/compil_scripts/cython.bat b/products/compil_scripts/cython.bat
index 3715a7bdc59405f0d4d1b9ad790b24e5f0581afd..373249c2c510434085c45a52804b3b5d4b9370ce 100755 (executable)
--- a/products/compil_scripts/cython.bat
+++ b/products/compil_scripts/cython.bat
@@ -24,9 +24,10 @@ echo --------------------------------------------------------------------------
 echo *** Launching "python.exe setup.py build"\r
 echo --------------------------------------------------------------------------\r
 set BUILD_OPT=\r
-if %SAT_DEBUG% == 1 (\r
-   set BUILD_OPT=--debug\r
-)\r
+REM not built by OCCT - see spns #20292 attached Excel document\r
+REM if %SAT_DEBUG% == 1 (\r
+REM    set BUILD_OPT=--debug\r
+REM)\r
 \r
 %PYTHON_ROOT_DIR%\python.exe setup.py build %BUILD_OPT%\r
 \r
@@ -50,4 +51,4 @@ echo Product %PRODUCT_NAME% version: %VERSION%> %PRODUCT_INSTALL%\README.txt
 echo Installation folder: %PYTHON_ROOT_DIR%>> %PRODUCT_INSTALL%\README.txt\r
 \r
 echo.\r
-echo ########## END
\ No newline at end of file
+echo ########## END\r

diff --git a/products/compil_scripts/eigen.bat b/products/compil_scripts/eigen.bat
index dee85e052c8fc55b6981447e2d81fada9bda0136..bcba481397d06df226b59cb2aba17063278cd1f0 100644 (file)
--- 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 05ee31d621d74614ad09d0e1dd03c736580694cb..61f179971fc6c59c8b675f64d1b5c09c4b490bd8 100644 (file)
--- 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 f36414f081fc1e15cb70666cb6ece881f852acda..eaa1d4012c30bbf7e68dc4880549b7b1a3c349f7 100755 (executable)
--- a/products/compil_scripts/freetype.bat
+++ b/products/compil_scripts/freetype.bat
@@ -9,10 +9,9 @@ IF NOT DEFINED SAT_DEBUG (
 )\r
 \r
 SET PRODUCT_BUILD_TYPE=Release\r
-REM TODO: NGH: not Tested yet\r
-REM if %SAT_DEBUG% == 1 (\r
-REM   set PRODUCT_BUILD_TYPE=Debug\r
-REM )\r
+if %SAT_DEBUG% == 1 (\r
+  set PRODUCT_BUILD_TYPE=Debug\r
+)\r
 \r
 if NOT exist "%PRODUCT_INSTALL%" mkdir  %PRODUCT_INSTALL%\r
 \r
@@ -21,15 +20,12 @@ if exist "%BUILD_DIR%" rmdir /Q /S %BUILD_DIR%
 mkdir %BUILD_DIR%\r
 \r
 cd %BUILD_DIR%\r
+set CMAKE_OPTIONS=\r
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_PREFIX=%PRODUCT_INSTALL%\r
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE=%PRODUCT_BUILD_TYPE%\r
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBUILD_SHARED_LIBS=ON\r
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_DISABLE_FIND_PACKAGE_HarfBuzz=TRUE\r
-if defined CMAKE_GENERATOR (\r
-    set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%\r
-) else (\r
-    set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR="Visual Studio 15 2017 Win64"\r
-)\r
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR="Visual Studio 15 2017 Win64"\r
 set MSBUILDDISABLENODEREUSE=1\r
 \r
 echo.\r
@@ -46,7 +42,7 @@ if NOT %ERRORLEVEL% == 0 (
 \r
 echo.\r
 echo *********************************************************************\r
-echo *** msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% ALL_BUILD.vcxproj"\r
+echo *** msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% ALL_BUILD.vcxproj\r
 echo *********************************************************************\r
 echo.\r
 \r
@@ -70,11 +66,15 @@ if NOT %ERRORLEVEL% == 0 (
 \r
 echo.\r
 echo *********************************************************************\r
-echo *** COPY Freetype DLL file from %BUILD_DIR% to %PRODUCT_INSTALL%\r
+echo *** COPY Freetype DLL files from %BUILD_DIR% to %PRODUCT_INSTALL%\r
 echo *********************************************************************\r
 echo.\r
 if NOT exist "%PRODUCT_INSTALL%\bin"     mkdir  %PRODUCT_INSTALL%\bin\r
-copy /Y  %BUILD_DIR%\%PRODUCT_BUILD_TYPE%\Freetype.dll %PRODUCT_INSTALL%\bin\Freetype.dll \r
+if %SAT_DEBUG% == 0 (\r
+  copy /Y  %BUILD_DIR%\%PRODUCT_BUILD_TYPE%\Freetype.dll %PRODUCT_INSTALL%\bin\Freetype.dll\r
+) else (\r
+  copy /Y  %BUILD_DIR%\%PRODUCT_BUILD_TYPE%\*.dll %PRODUCT_INSTALL%\bin\\r
+)\r
 if NOT %ERRORLEVEL% == 0 (\r
     echo ERROR when copying Freetype DLL\r
     exit 2\r

diff --git a/products/compil_scripts/graphviz-2.44.1.bat b/products/compil_scripts/graphviz-2.44.1.bat
index 43a0b2ea7ea00cc421e55052e9acdd97096e6a7e..7ca56949d4d926649def7af8814551dc9f3e3653 100644 (file)
--- 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 e7c9c39c4ff4296626e8675407800960585cbe3d..e413b19841b3ea442f66422e9a51a2a52d2d701d 100755 (executable)
--- a/products/compil_scripts/hdf5CMake.bat
+++ b/products/compil_scripts/hdf5CMake.bat
@@ -9,10 +9,9 @@ IF NOT DEFINED SAT_DEBUG (
 )\r
 \r
 SET PRODUCT_BUILD_TYPE=Release\r
-REM TODO: NGH: not Tested yet\r
-REM if %SAT_DEBUG% == 1 (\r
-REM   set PRODUCT_BUILD_TYPE=Debug\r
-REM )\r
+if %SAT_DEBUG% == 1 (\r
+  set PRODUCT_BUILD_TYPE=Debug\r
+)\r
 \r
 if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL%\r
 \r
@@ -79,31 +78,7 @@ if NOT %ERRORLEVEL% == 0 (
     exit 3\r
 )\r
 \r
-REM some of the products like GUI expect .lib instead of _D.lib...\r
-cd %PRODUCT_INSTALL%\lib\\r
-if %SAT_DEBUG% == 1 (\r
-  SETLOCAL ENABLEDELAYEDEXPANSION\r
-  FOR %%f IN (*_D.lib) do (\r
-     set X=%%f\r
-     copy /Y /B %PRODUCT_INSTALL%\lib\%%f %PRODUCT_INSTALL%\lib\!X:_D.lib=.lib!\r
-  )\r
-  ENDLOCAL\r
-)\r
-\r
-REM Symbolic links require being in developer mode\r
-cd %PRODUCT_INSTALL%\bin\\r
-if %SAT_DEBUG% == 1 (\r
-  SETLOCAL ENABLEDELAYEDEXPANSION\r
-  FOR %%f IN (*_D.dll) do (\r
-     set X=%%f\r
-     copy /Y /B %PRODUCT_INSTALL%\bin\%%f %PRODUCT_INSTALL%\bin\!X:_D.dll=.dll!\r
-  )\r
-  ENDLOCAL\r
-)\r
-\r
 taskkill /F /IM "mspdbsrv.exe"\r
 \r
-\r
-\r
 echo.\r
 echo ########## END\r

diff --git a/products/compil_scripts/ispc.bat b/products/compil_scripts/ispc.bat
index fbf0bfea752f1213780651ed65dce5f3c3c2a324..5d4fa033ea2b44f75cc59a93a64e04b19fbb733a 100644 (file)
--- 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 02a8e8c969b43c69cdba8ce710a14cc7a76975c0..65a5d88ecf01bc945156e3c72b16b255b5188f30 100644 (file)
--- 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 640260e58ad94eb061d03d933fa77a28093333b2..1425d2e1358e67acf153bf17b40c71a3ebdd2b7e 100755 (executable)
--- a/products/compil_scripts/medCMake.bat
+++ b/products/compil_scripts/medCMake.bat
@@ -9,17 +9,17 @@ IF NOT DEFINED SAT_DEBUG (
 )\r
 \r
 SET PRODUCT_BUILD_TYPE=Release\r
-REM TODO: NGH: not Tested yet\r
-REM if %SAT_DEBUG% == 1 (\r
-REM   set PRODUCT_BUILD_TYPE=Debug\r
-REM )\r
+if %SAT_DEBUG% == 1 (\r
+  set PRODUCT_BUILD_TYPE=Debug\r
+)\r
 \r
 if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL%\r
 REM clean BUILD directory\r
 if exist "%BUILD_DIR%" rmdir /Q /S %BUILD_DIR%\r
 mkdir %BUILD_DIR%\r
 \r
-SET CMAKE_OPTIONS=-DCMAKE_INSTALL_PREFIX:STRING=%PRODUCT_INSTALL:\=/%\r
+SET CMAKE_OPTIONS=\r
+SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_PREFIX:STRING=%PRODUCT_INSTALL:\=/%\r
 SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE:STRING=%PRODUCT_BUILD_TYPE%\r
 SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DMEDFILE_BUILD_STATIC_LIBS:BOOL=OFF\r
 SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DMEDFILE_BUILD_SHARED_LIBS:BOOL=ON\r

diff --git a/products/compil_scripts/opencv.bat b/products/compil_scripts/opencv.bat
index 2559c0bd2e32f00e878a4f9a491fcba1fc6d4791..2e206c8c808ca37a5b9746eae9f161f7704f56a8 100755 (executable)
--- a/products/compil_scripts/opencv.bat
+++ b/products/compil_scripts/opencv.bat
@@ -10,9 +10,9 @@ IF NOT DEFINED SAT_DEBUG (
 \r
 SET PRODUCT_BUILD_TYPE=Release\r
 REM TODO: NGH: not Tested yet\r
-REM if %SAT_DEBUG% == 1 (\r
-REM   set PRODUCT_BUILD_TYPE=Debug\r
-REM )\r
+if %SAT_DEBUG% == 1 (\r
+  set PRODUCT_BUILD_TYPE=Debug\r
+)\r
 \r
 if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL%\r
 REM clean BUILD directory\r

diff --git a/products/compil_scripts/pthreads.bat b/products/compil_scripts/pthreads.bat
index 2cb43afeef1f6771dad9bb4fcb320236a00c2c85..579ec8ed8137c250dad05bbc9150382de6538def 100755 (executable)
--- a/products/compil_scripts/pthreads.bat
+++ b/products/compil_scripts/pthreads.bat
@@ -9,10 +9,9 @@ IF NOT DEFINED SAT_DEBUG (
 )\r
 \r
 SET PRODUCT_BUILD_TYPE=Release\r
-REM TODO: NGH: not Tested yet\r
-REM if %SAT_DEBUG% == 1 (\r
-REM   set PRODUCT_BUILD_TYPE=Debug\r
-REM )\r
+if %SAT_DEBUG% == 1 (\r
+  set PRODUCT_BUILD_TYPE=Debug\r
+)\r
 \r
 if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL%\r
 if NOT exist "%PRODUCT_INSTALL%\lib" mkdir %PRODUCT_INSTALL%\lib\r

diff --git a/products/compil_scripts/qt.bat b/products/compil_scripts/qt.bat
index 18132c6716eedabea0cf8333fb08c1f6248b55ff..d3b6577b9a10726901cd05587f2089c110d10149 100644 (file)
--- 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 b015a0e11c7867730b6ef893cea9ff03890b4cbb..2bbc35a6cf5d9692be1d525e45bb72f7448d3df9 100755 (executable)
--- 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%\r
 echo ##########################################################################\r
 \r
+IF NOT DEFINED SAT_DEBUG (\r
+  SET SAT_DEBUG=0\r
+)\r
+\r
 if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL%\r
 \r
 if exist "%BUILD_DIR%" rmdir /Q /S "%BUILD_DIR%"\r
@@ -39,13 +43,15 @@ sed "s|\(target\.path[[:space:]]*\)=\([[:space:]]*\).*|\1=\2\$\$QWT_INSTALL_PREF
 move /y %tmpfile% designer.pro\r
 cd ..\r
 \r
-rem # Desactivation du mode Debug\r
-call :GETTEMPNAME\r
-attrib -R qwtbuild.pri\r
-sed "s|\(CONFIG[[:space:]]*+=[[:space:]]*debug_and_release\)|#\1|g" < qwtbuild.pri > %tmpfile%\r
-move /y %tmpfile% qwtbuild.pri\r
-sed "s|\(CONFIG[[:space:]]*+=[[:space:]]*build_all\)|#\1|g" < qwtbuild.pri > %tmpfile%\r
-move /y %tmpfile% qwtbuild.pri\r
+REM remove debug build only if release build is requested\r
+if %SAT_DEBUG% == 0 (\r
+  call :GETTEMPNAME\r
+  attrib -R qwtbuild.pri\r
+  sed "s|\(CONFIG[[:space:]]*+=[[:space:]]*debug_and_release\)|#\1|g" < qwtbuild.pri > %tmpfile%\r
+  move /y %tmpfile% qwtbuild.pri\r
+  sed "s|\(CONFIG[[:space:]]*+=[[:space:]]*build_all\)|#\1|g" < qwtbuild.pri > %tmpfile%\r
+  move /y %tmpfile% qwtbuild.pri\r
+)\r
 \r
 echo.\r
 echo --------------------------------------------------------------------------\r

diff --git a/products/compil_scripts/sip.bat b/products/compil_scripts/sip.bat
index 2b39abcde7d7edbbd9d2cd703d942f8524cc35ac..3535513a79686719d1bdbb3fbe9d32ee0e9571f5 100755 (executable)
--- 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 (file)
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 5804a43a946c36e1a1f432ddcca4809f34668f94..e8c3c441ef3b3ae584322db6d4c937b424734646 100644 (file)
--- 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