spns #41854: align native on windows approach

diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index e9c91a2c6ccfa77ceb96f13d8a01ef9ff9794a02..6a41cac71a267edc8270323082255981e0fb09e1 100644 (file)
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@ -42,6 +42,7 @@ APPLICATION :
         catalyst: '2.0'
         C3PO: 'v2.3'
         certifi : 'native'
+        cftime: 'native'
         cgns : '4.2.0'
         chardet : 'native'
         click : 'native'
@@ -63,7 +64,7 @@ APPLICATION :
         gdal : 'native'
         gmsh : '4.10.3'
         graphviz : 'native'
-        h5py : '3.11.0'
+        h5py : 'native'
         hdf5 : '1.10.3'
         idna : 'native'
         imagesize : 'native'
@@ -75,6 +76,8 @@ APPLICATION :
         llvm : 'native'
         markupsafe : 'native'
         matplotlib : 'native'
+        mdurl : 'native'
+        markdown_it_py : '3.0.0'
         medfile : '4.1.1'
         mesa : {tag : '19.0.8-x86_64-'+$VARS.dist, base: 'no', section: 'version_bin'}
         MeshGems : '2.15-1'
@@ -85,6 +88,7 @@ APPLICATION :
         # comment out line above and uncomment the line below to use Netgen 6.
         #netgen : '6.2.2101'
         netcdf : 'native'
+        netCDF4: 'native'
         nlopt : 'native'
         nose: 'native'
         numpy : 'native'
@@ -217,6 +221,7 @@ __overwrite__ :
         'APPLICATION.products.netcdf'           : '4.6.2'
         'APPLICATION.products.PyFMI'            : {tag: '2.6',   base: 'no', section: 'version_2_6_no_pip'      }
         'APPLICATION.products.scipy'            : {tag: '1.5.2', base: 'no', section: 'version_1_5_2_no_pip'    } # scipy >= 1.4 - system one too old
+        'APPLICATION.products.mdurl'            : {tag: '0.1.2', base: 'no', section: 'version_0_1_2'        }
         'APPLICATION.products.numpy'            : {tag: '1.20.3', base: 'no', section: 'version_1_20_3'      }
     }
     {
@@ -314,6 +319,7 @@ __overwrite__ :
         'APPLICATION.products.PyFMI'            : {tag: '2.6',   base: 'no', section: 'version_2_6_no_pip'   }
         'APPLICATION.products.Sphinx'           : {tag: '1.7.6', base: 'no', section: 'version_1_7_6_no_pip' }
         'APPLICATION.products.gdal'             : {tag:'2.4.0',  base: 'no', section: 'version_2_4_0_FD32'   } # spns #29324
+        'APPLICATION.products.mdurl'            : {tag: '0.1.2', base: 'no', section: 'version_0_1_2'        }
         'APPLICATION.products.numpy'            : {tag: '1.20.3', base: 'no', section: 'version_1_20_3'      }
     }
     {

diff --git a/products/compil_scripts/h5py-3.11.0.sh b/products/compil_scripts/h5py-3.11.0.sh
index 492ae6597507fea1f4b1315e61e3bddb154c6eda..99146c8749ffd6dbda5dc0c9a8b167c04872170a 100755 (executable)
--- a/products/compil_scripts/h5py-3.11.0.sh
+++ b/products/compil_scripts/h5py-3.11.0.sh
@@ -31,6 +31,8 @@ case $LINUX_DISTRIBUTION in
         fi
         ;;
     *)
+        echo "Not implemented"
+        exit 1
         ;;
 esac
 

diff --git a/products/compil_scripts/markdown-it-py-3.0.0.sh b/products/compil_scripts/markdown-it-py-3.0.0.sh
new file mode 100644 (file)
index 0000000..073c95f
--- /dev/null
+++ b/products/compil_scripts/markdown-it-py-3.0.0.sh
@@ -0,0 +1,28 @@
+#!/bin/bash                                                                                                                                                                              
+
+echo "##########################################################################"
+echo "mdurl" $VERSION
+echo "##########################################################################"
+
+LINUX_DISTRIBUTION="$DIST_NAME$DIST_VERSION"
+
+echo "*** check installation"
+mkdir -p ${PRODUCT_INSTALL}
+rm -rf $BUILD_DIR
+mkdir -p $BUILD_DIR/cache/pip
+cd $BUILD_DIR
+
+export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH
+export PATH=${PRODUCT_INSTALL}/bin:$PATH
+
+WHEELS=('markdown_it_py-3.0.0-py3-none-any.whl')
+for WHEEL in "${WHEELS[@]}"; do
+    ${PYTHONBIN} -m pip install --cache-dir=$BUILD_DIR/cache/pip  $SOURCE_DIR/$WHEEL --no-deps --prefix=$PRODUCT_INSTALL
+    if [ $? -ne 0 ]; then
+        echo "ERROR: could not install $WHEEL"
+        exit 1
+    fi
+done
+
+echo
+echo "########## END"

diff --git a/products/compil_scripts/mdurl-0.1.2.sh b/products/compil_scripts/mdurl-0.1.2.sh
new file mode 100644 (file)
index 0000000..9287c6c
--- /dev/null
+++ b/products/compil_scripts/mdurl-0.1.2.sh
@@ -0,0 +1,28 @@
+#!/bin/bash                                                                                                                                                                              
+
+echo "##########################################################################"
+echo "mdurl" $VERSION
+echo "##########################################################################"
+
+LINUX_DISTRIBUTION="$DIST_NAME$DIST_VERSION"
+
+echo "*** check installation"
+mkdir -p ${PRODUCT_INSTALL}
+rm -rf $BUILD_DIR
+mkdir -p $BUILD_DIR/cache/pip
+cd $BUILD_DIR
+
+export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH
+export PATH=${PRODUCT_INSTALL}/bin:$PATH
+
+WHEELS=('mdurl-0.1.2-py3-none-any.whl')
+for WHEEL in "${WHEELS[@]}"; do
+    ${PYTHONBIN} -m pip install --cache-dir=$BUILD_DIR/cache/pip  $SOURCE_DIR/$WHEEL --no-deps --prefix=$PRODUCT_INSTALL
+    if [ $? -ne 0 ]; then
+        echo "ERROR: could not install $WHEEL"
+        exit 1
+    fi
+done
+
+echo
+echo "########## END"

diff --git a/products/compil_scripts/meshio-5.3.5.sh b/products/compil_scripts/meshio-5.3.5.sh
index 0969028aa2c9ecbb4cafed3c5ef274817dab795c..9a9721628bebcd06164cf91a9e1bf32289222e5e 100755 (executable)
--- a/products/compil_scripts/meshio-5.3.5.sh
+++ b/products/compil_scripts/meshio-5.3.5.sh
@@ -17,8 +17,7 @@ export PATH=${PRODUCT_INSTALL}/bin:$PATH
 
 case $LINUX_DISTRIBUTION in
     FD32|UB20*)
-        WHEELS=('markdown_it_py-3.0.0-py3-none-any.whl'
-                'typing_extensions-4.11.0-py3-none-any.whl'
+        WHEELS=('typing_extensions-4.11.0-py3-none-any.whl'
                 'meshio-5.3.5-py3-none-any.whl'
                )
         for WHEEL in "${WHEELS[@]}"; do
@@ -30,6 +29,8 @@ case $LINUX_DISTRIBUTION in
         done
         ;;
     *)
+        echo "not implemented"
+        exit 1
         ;;
 esac
 

diff --git a/products/compil_scripts/rich-13.7.1.sh b/products/compil_scripts/rich-13.7.1.sh
index ec1999230a06a862d8702cad4179a51f088c238b..ef343d48239314b67e0b5cc5e7f9f5748cea8cab 100755 (executable)
--- a/products/compil_scripts/rich-13.7.1.sh
+++ b/products/compil_scripts/rich-13.7.1.sh
@@ -14,23 +14,17 @@ rm -rf $BUILD_DIR
 mkdir -p $BUILD_DIR/cache/pip
 cd $BUILD_DIR
 
-case $LINUX_DISTRIBUTION in
-    FD32|UB20*)
-        WHEELS=('rich-13.7.1-py3-none-any.whl')
-        for WHEEL in "${WHEELS[@]}"; do
-            ${PYTHONBIN} -m pip install --cache-dir=$BUILD_DIR/cache/pip  $SOURCE_DIR/$WHEEL --no-deps --prefix=$PRODUCT_INSTALL
-            if [ $? -ne 0 ]; then
-                echo "ERROR: could not install $WHEEL"
-                exit 1
-            fi
-        done
-        if [ -d ${PRODUCT_INSTALL}/lib64 ]; then
-            mv ${PRODUCT_INSTALL}/lib64 ${PRODUCT_INSTALL}/lib
-        fi
-        ;;
-    *)
-        ;;
-esac
+WHEELS=('rich-13.7.1-py3-none-any.whl')
+for WHEEL in "${WHEELS[@]}"; do
+    ${PYTHONBIN} -m pip install --cache-dir=$BUILD_DIR/cache/pip  $SOURCE_DIR/$WHEEL --no-deps --prefix=$PRODUCT_INSTALL
+    if [ $? -ne 0 ]; then
+        echo "ERROR: could not install $WHEEL"
+        exit 1
+    fi
+done
+if [ -d ${PRODUCT_INSTALL}/lib64 ]; then
+    mv ${PRODUCT_INSTALL}/lib64 ${PRODUCT_INSTALL}/lib
+fi
 
 echo
 echo "########## END"

diff --git a/products/markdown_it_py.pyconf b/products/markdown_it_py.pyconf
index a32e41634a3daf80e663092d3b081edd75a963b5..f2e4cb945c4fbf006d2a878efb4928bc5d214a35 100644 (file)
--- a/products/markdown_it_py.pyconf
+++ b/products/markdown_it_py.pyconf
@@ -2,14 +2,14 @@ default :
 {
     name : "markdown_it_py"
     build_source : "script"
-    compil_script: "markdown_it_py.sh"
+    compil_script: "markdown-it-py.sh"
     get_source : "archive"  
     patches : []
     system_info : 
     {
-        rpm : []
+        rpm : ['python3-markdown-it']
         rpm_dev : []
-        apt : []
+        apt : ['python3-markdown-it']
         apt_dev : []
     }
     environ :
@@ -27,3 +27,24 @@ default :
       pip : "yes"
     }
 }
+
+version_3_0_0:
+{
+   compil_script: "markdown-it-py-3.0.0"  + $VARS.scriptExtension
+   archive_info : {archive_name : "markdown-it-py-3.0.0-x86_64.tar.gz"}
+   properties :
+   {
+     incremental : "yes"
+     pip : "no"
+   }
+}
+
+version_3_0_0_win:
+{
+   archive_info : {archive_name : "markdown-it-py-3.0.0.tar.gz"}
+   properties :
+   {
+     incremental : "yes"
+     pip : "yes"
+   }
+}

diff --git a/products/mdurl.pyconf b/products/mdurl.pyconf
index a991ee5745d5b8d3cb7d6c0d766385e8bd9b0879..ba3629d38d13ac7e6824cf4fa72e664bf8b3c2bd 100644 (file)
--- a/products/mdurl.pyconf
+++ b/products/mdurl.pyconf
@@ -7,9 +7,9 @@ default :
     patches : []
     system_info : 
     {
-        rpm : []
+        rpm : ['python3-mdurl']
         rpm_dev : []
-        apt : []
+        apt : ['python3-mdurl']
         apt_dev : []
     }
     environ :
@@ -27,3 +27,24 @@ default :
       pip : "yes"
     }
 }
+
+version_0_1_2:
+{
+   compil_script: "mdurl-0.1.2"  + $VARS.scriptExtension
+   archive_info : {archive_name : "mdurl-0.1.2-x86_64.tar.gz"}
+   properties :
+   {
+     incremental : "yes"
+     pip : "no"
+   }
+}
+
+version_0_1_2_win:
+{
+   archive_info : {archive_name : "mdurl-0.1.2.tar.gz"}
+   properties :
+   {
+     incremental : "yes"
+     pip : "yes"
+   }
+}

diff --git a/products/meshio.pyconf b/products/meshio.pyconf
index fc9cb2b6da5ff4910ad2c4605ddc941d3346b49a..3b30590426f2164251327cf065ab8643d38d4097 100644 (file)
--- a/products/meshio.pyconf
+++ b/products/meshio.pyconf
@@ -16,7 +16,7 @@ default :
     {
        env_script : $name + ".py"
     }
-    depend : ['Python', 'numpy', 'hdf5', 'h5py', 'netcdf', 'rich']
+    depend : ['Python', 'numpy', 'hdf5', 'h5py', 'netcdf', 'rich', 'netCDF4']
     source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name
     build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name
     install_dir : 'base'

diff --git a/products/rich.pyconf b/products/rich.pyconf
index 5e2242f584f3853ef34c7ce3e4036608b21030d7..66eba410645b597e2b0c0cffafb29223e439bec2 100644 (file)
--- a/products/rich.pyconf
+++ b/products/rich.pyconf
@@ -30,6 +30,7 @@ default :
 
 version_13_7_1:
 {
+    depend : ['Python', 'numpy', 'hdf5', 'h5py', 'markdown_it_py', 'Pygments']
     archive_info :
     {
       archive_name  : "rich-13.7.1-x86_64.tar.gz"