ROOT : cleanup + add ROOT master product batch file

diff --git a/products/compil_scripts/root-6.16.bat b/products/compil_scripts/root-6.16.bat
new file mode 100644 (file)
index 0000000..f0f801d
--- /dev/null
+++ b/products/compil_scripts/root-6.16.bat
@@ -0,0 +1,21 @@
+@echo off
+
+echo ##########################################################################
+echo ROOT %VERSION%
+echo ##########################################################################
+
+if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL%
+
+REM clean BUILD directory
+if exist "%BUILD_DIR%" rmdir /Q /S %BUILD_DIR%
+mkdir %BUILD_DIR%
+
+
+xcopy %SOURCE_DIR%\* %PRODUCT_INSTALL% /E /I /Q
+if NOT %ERRORLEVEL% == 0 (
+    echo ERROR on xcopy
+    exit 1
+)
+
+echo.
+echo ########## END

diff --git a/products/compil_scripts/root-6.22.bat b/products/compil_scripts/root-6.22.bat
new file mode 100644 (file)
index 0000000..f0f801d
--- /dev/null
+++ b/products/compil_scripts/root-6.22.bat
@@ -0,0 +1,21 @@
+@echo off
+
+echo ##########################################################################
+echo ROOT %VERSION%
+echo ##########################################################################
+
+if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL%
+
+REM clean BUILD directory
+if exist "%BUILD_DIR%" rmdir /Q /S %BUILD_DIR%
+mkdir %BUILD_DIR%
+
+
+xcopy %SOURCE_DIR%\* %PRODUCT_INSTALL% /E /I /Q
+if NOT %ERRORLEVEL% == 0 (
+    echo ERROR on xcopy
+    exit 1
+)
+
+echo.
+echo ########## END

diff --git a/products/compil_scripts/root.bat b/products/compil_scripts/root.bat
index f0f801da9d54b8c96a5040cfed048a1507348711..9d76ea86f43cf8849baf07aa557da9b549b44d4b 100644 (file)
--- a/products/compil_scripts/root.bat
+++ b/products/compil_scripts/root.bat
@@ -1,21 +1,92 @@
 @echo off
 
 echo ##########################################################################
-echo ROOT %VERSION%
+echo root %VERSION%
 echo ##########################################################################
 
+IF NOT DEFINED SAT_DEBUG (
+  SET SAT_DEBUG=0
+)
+
+SET PRODUCT_BUILD_TYPE=Release
+
+REM TODO: NGH: not Tested yet
+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=
+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% -A Win32 -Thost=x64
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_CXX_STANDARD=14 
+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% -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=OFF
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -Dbuiltin_zstd=OFF
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -Dmathmore=OFF
+rem set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBOOST_ROOT:PATH=%BOOST_ROOT_DIR:\=/%
+rem set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBoost_ADDITIONAL_VERSIONS="1.67.0 1.67"
+rem set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBOOST_INCLUDEDIR=%BOOST_ROOT_DIR:\=/%/include/boost-1_67
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_SYSTEM_VERSION=10.0.19041.0
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
+
+cd %BUILD_DIR%
+SET INCLUDE=
+set PATH=%BUILD_DIR%\bin;%PATH%
 
+echo.
+echo --------------------------------------------------------------------------
+echo *** %CMAKE_ROOT%\bin\cmake %CMAKE_OPTIONS% %SOURCE_DIR%
+echo --------------------------------------------------------------------------
 
-xcopy %SOURCE_DIR%\* %PRODUCT_INSTALL% /E /I /Q
+%CMAKE_ROOT%\bin\cmake %CMAKE_OPTIONS% %SOURCE_DIR%
 if NOT %ERRORLEVEL% == 0 (
-    echo ERROR on xcopy
+    echo ERROR on root
     exit 1
 )
 
+echo.
+echo --------------------------------------------------------------------------
+echo *** msbuild %MAKE_OPTIONS% /p:Configuration=Release /p:Platform=x86 ALL_BUILD.vcxproj
+echo --------------------------------------------------------------------------
+
+msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x86 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=x86 INSTALL.vcxproj
+echo --------------------------------------------------------------------------
+
+msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x86 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 1118a06420f5c7ea07628ba37de3a50a3cea667d..17838241cc74fd3894dc41f233fe9e624e678c4a 100644 (file)
--- a/products/root.pyconf
+++ b/products/root.pyconf
@@ -24,6 +24,14 @@ default :
     }
 }
 
+default_win:
+{
+    build_source : "script"
+    compil_script :  "root.bat"
+    depend : ['Python', 'Cython', 'numpy']
+    patches : []
+}
+
 version_6_24_00:
 {
     patches : []
@@ -46,7 +54,7 @@ version_6_22_06:
 version_6_22_06_win:
 {
     build_source : "script"
-    compil_script :  "root.bat"
+    compil_script :  "root-6.22.bat"
     archive_info : {archive_name : "root_v6.22.06.win32.vc16.tar.gz"}
     patches : []
 }
@@ -60,7 +68,7 @@ version_6_22_02:
 version_6_22_02_win:
 {
     build_source : "script"
-    compil_script :  "root.bat"
+    compil_script :  "root-6.22.bat"
     archive_info : {archive_name : "root_v6.22.02.win32.vc16.tar.gz"}
     depend : ['Python', 'boost', 'freetype', 'freeimage']
     patches : []
@@ -76,6 +84,6 @@ version_6_16_00_win:
 
     archive_info : {archive_name : "root_v6.16.00-windows.tar.gz"}
     build_source : "script"
-    compil_script :  "root.bat"
+    compil_script :  "root-6.16.bat"
 }