spns #41606: root 6.30.06 + visual 2022

diff --git a/products/compil_scripts/root-6.30.bat b/products/compil_scripts/root-6.30.bat
new file mode 100755 (executable)
index 0000000..2604a37
--- /dev/null
+++ b/products/compil_scripts/root-6.30.bat
@@ -0,0 +1,91 @@
+@echo off
+
+echo ##########################################################################
+echo root %VERSION%
+echo ##########################################################################
+
+IF NOT DEFINED SAT_DEBUG (
+  SET SAT_DEBUG=0
+)
+
+SET PRODUCT_BUILD_TYPE=Release
+SET CMAKE_GENERATOR="Visual Studio 17 2022"
+REM TODO: NGH: not Tested yet
+if %SAT_DEBUG% == 1 (
+  set PRODUCT_BUILD_TYPE=Debug
+)
+
+if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL%
+SET INCLUDE=
+REM clean BUILD directory
+if exist "%BUILD_DIR%" rmdir /Q /S %BUILD_DIR%
+mkdir %BUILD_DIR%
+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% -Dbuiltin_fftw3=OFF 
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPYTHON_EXECUTABLE=%PYTHONBIN%
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPython3_LIBRARY_DIRS=%PYTHON_ROOT_DIR%\libs
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -Dpyroot=ON
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -Dpyroot_legacy=OFF
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -Dminuit2=ON
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -Dasimage=OFF
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -Dbuiltin_clang=ON
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -Dbuiltin_llvm=ON
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -Dbuiltin_openui5=ON
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -Dbuiltin_freetype=OFF
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -Dbuiltin_davix=OFF
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -Dbuiltin_ftgl=OFF
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -Dbuiltin_gl2ps=OFF
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -Dbuiltin_glew=OFF
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -Dbuiltin_gsl=OFF
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -Dbuiltin_lz4=OFF
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -Dbuiltin_lzma=OFF
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -Dbuiltin_pcre=OFF
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -Dbuiltin_unuran=ON
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -Dbuiltin_xxhash=OFF
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -Dbuiltin_zlib=ON
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -Dbuiltin_zstd=OFF
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -Dmathmore=OFF
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR%
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -A x64  -Thost=x64
+
+cd %BUILD_DIR%
+SET INCLUDE=
+set PATH=%BUILD_DIR%\bin;%PATH%
+
+echo.
+echo --------------------------------------------------------------------------
+echo *** %CMAKE_ROOT%\bin\cmake %CMAKE_OPTIONS% %SOURCE_DIR%
+echo --------------------------------------------------------------------------
+
+%CMAKE_ROOT%\bin\cmake %CMAKE_OPTIONS% %SOURCE_DIR%
+if NOT %ERRORLEVEL% == 0 (
+    echo ERROR on root
+    exit 1
+)
+
+echo.
+echo --------------------------------------------------------------------------
+echo *** msbuild %MAKE_OPTIONS% /p:Configuration=Release /p:Platform=x64 ALL_BUILD.vcxproj
+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 *** msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 INSTALL.vcxproj
+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/root.pyconf b/products/root.pyconf
index 90ac5ddee45166d68e567a4c2290d40183ef10a2..71ad0484c301845114ff47051814d1f690778755 100644 (file)
--- a/products/root.pyconf
+++ b/products/root.pyconf
@@ -32,17 +32,18 @@ default_win:
     patches : []
 }
 
-version_6_24_06:
+version_6_30_06:
 {
     get_source : "archive"
+    archive_info : {archive_name : "root_v6.30.06.source.tar.gz"}
     patches : []
 }
 
-version_6_24_06_win:
+version_6_30_06_win:
 {
     build_source : "script"
-    compil_script :  "root-6.24.bat"
-    depend : ['Python', 'Cython', 'numpy']
+    compil_script :  "root-6.30.bat"
+    depend : ['Python', 'Cython', 'numpy', 'gl2ps', 'freetype', 'freeimage']
     patches : []
 }