X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=products%2Froot.pyconf;h=6b4aa8cafdb87b700b71d07240598f907c4ed2cb;hb=a5b5db0e92441764ce99bbface7b2adbbb63e52d;hp=0a82bff964d75ac7ca42ea3c8effc99eaf34c4af;hpb=9aa9f7d4c4e2edb2f04acb082e9cef505ca68e30;p=tools%2Fsat_salome.git

diff --git a/products/root.pyconf b/products/root.pyconf
index 0a82bff..6b4aa8c 100644
--- a/products/root.pyconf
+++ b/products/root.pyconf
@@ -3,7 +3,12 @@ default :
     name : "root"
     build_source : "cmake"
     cmake_options : " -Dgminimal:BOOL=ON -Dmathmore:BOOL=ON -Ddataframe:BOOL=ON -Dmlp:BOOL=ON -Dfftw3:BOOL=ON -Dminuit2:BOOL=ON -Dxml:BOOL=ON -Dasimage:BOOL=ON -Dpyroot:BOOL=ON -Dsoversion:BOOL=ON -Ddataframe:BOOL=ON -DPYTHON_EXECUTABLE:STRING=${PYTHONBIN} -DPYTHON_INCLUDE_DIR:STRING=${PYTHON_INCLUDE} "
-    get_source : "archive"
+    get_source : "git"
+    git_info:
+    {
+        repo : "https://github.com/root-project/root.git"
+        repo_dev : $repo
+    }
     environ :
     {
        env_script : $name + ".py"
@@ -19,8 +24,17 @@ default :
     }
 }
 
+default_win:
+{
+    build_source : "script"
+    compil_script :  "root.bat"
+    depend : ['Python', 'Cython', 'numpy']
+    patches : []
+}
+
 version_6_24_00:
 {
+    get_source : "archive"
     patches : []
 }
 
@@ -28,45 +42,56 @@ version_6_24_00_win:
 {
     build_source : "script"
     compil_script :  "root-6.24.bat"
-    depend : ['Python', 'boost', 'freetype', 'freeimage']
+    depend : ['Python', 'Cython', 'numpy']
     patches : []
 }
 
 version_6_22_06:
 {
+    get_source : "archive"
     patches : ['root-6.22.06.patch']
 }
 
 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 : []
 }
 
 version_6_22_02:
 {
+    get_source : "archive"
     patches : ['root-6.22.02.patch']
 }
 
 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 : []
 }
 
+# these two patches cannot be merged - compilation issue on UB20 otherwise
+version_6_22_02_FD34:
+{
+    get_source : "archive"
+    patches : ['root-6.22.02.patch', 'root-6.22.02-gcc-11.0.patch']
+}
+
 version_6_16_00:
-{}
+{
+    get_source : "archive"
+}
 
 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"
 }