SALOME 6.5.0 preparation: homard 10.3 -> 10.4

diff --git a/config_CentOS_5.5_64bit.xml b/config_CentOS_5.5_64bit.xml
index 49208cd0e1ac18b87cbf0186615edd35bfc86a4d..c9b307d1a829e7a4dd7ba0e60bd5ca2babd9c938 100755 (executable)
--- a/config_CentOS_5.5_64bit.xml
+++ b/config_CentOS_5.5_64bit.xml
@@ -657,7 +657,7 @@
             type="prerequisite"
              description="HOMARD meshing tools">
       <installation os="CentOS 5.5 64bit"
-                    version="" 
+                    version="10.4" 
                    disable="false"
                    installdiskspace="10076,0,10076"
                    script="homard.sh"/>

diff --git a/config_Debian_4.0.xml b/config_Debian_4.0.xml
index 7f1e88f822b99859379d8a33306761866cf306b7..ef927b81af3f669a450a9af02f04f5105f8f4c59 100755 (executable)
--- a/config_Debian_4.0.xml
+++ b/config_Debian_4.0.xml
@@ -657,7 +657,7 @@
             type="prerequisite"
              description="HOMARD meshing tools">
       <installation os="Debian 4.0"
-                    version="" 
+                    version="10.4" 
                    disable="false"
                    installdiskspace="10076,0,10076"
                    script="homard.sh"/>

diff --git a/config_Debian_4.0_64bit.xml b/config_Debian_4.0_64bit.xml
index 1343a7861a0533997e773e002f1ce5c86ee3db7d..7e4eb4229572b82fd7608d429b9008d0d7c53f2d 100755 (executable)
--- a/config_Debian_4.0_64bit.xml
+++ b/config_Debian_4.0_64bit.xml
@@ -657,7 +657,7 @@
             type="prerequisite"
              description="HOMARD meshing tools">
       <installation os="Debian 4.0 64bit"
-                    version="" 
+                    version="10.4" 
                    disable="false"
                    installdiskspace="10076,0,10076"
                    script="homard.sh"/>

diff --git a/config_Debian_5.0_64bit.xml b/config_Debian_5.0_64bit.xml
index 2984ae7478a4491d001f72e9865e850e6b44f85a..873963f98f0baf3a38cbb0fa056a812c5b1402ce 100755 (executable)
--- a/config_Debian_5.0_64bit.xml
+++ b/config_Debian_5.0_64bit.xml
@@ -657,7 +657,7 @@
             type="prerequisite"
              description="HOMARD meshing tools">
       <installation os="Debian 5.0 64bit"
-                    version="" 
+                    version="10.4" 
                    disable="false"
                    installdiskspace="10076,0,10076"
                    script="homard.sh"/>

diff --git a/config_Debian_6.0_64bit.xml b/config_Debian_6.0_64bit.xml
index 0bd40417612413ffdef7d8966cff8994869a1acc..c0cfeb84b3a3cd870f6fb287e797cdddf50baa3b 100755 (executable)
--- a/config_Debian_6.0_64bit.xml
+++ b/config_Debian_6.0_64bit.xml
@@ -657,7 +657,7 @@
             type="prerequisite"
              description="HOMARD meshing tools">
       <installation os="Debian 6.0 64bit"
-                    version="" 
+                    version="10.4" 
                    disable="false"
                    installdiskspace="10076,0,10076"
                    script="homard.sh"/>

diff --git a/config_Mandriva_2008.0.xml b/config_Mandriva_2008.0.xml
index 568a25ae5a190a19dc1126ba0eb755404940663e..8b426b906300ae58174ccb404ad68ed869eba18b 100755 (executable)
--- a/config_Mandriva_2008.0.xml
+++ b/config_Mandriva_2008.0.xml
@@ -657,7 +657,7 @@
             type="prerequisite"
              description="HOMARD meshing tools">
       <installation os="Mandriva 2008.0"
-                    version="" 
+                    version="10.4" 
                    disable="false"
                    installdiskspace="10076,0,10076"
                    script="homard.sh"/>

diff --git a/config_Mandriva_2008.0_64bit.xml b/config_Mandriva_2008.0_64bit.xml
index 2a3122bfc00b178c72465b6c5f5a6f2709681d1e..3f4af3a00c81da38e2c767b99d61ce601407b410 100755 (executable)
--- a/config_Mandriva_2008.0_64bit.xml
+++ b/config_Mandriva_2008.0_64bit.xml
@@ -657,7 +657,7 @@
             type="prerequisite"
              description="HOMARD meshing tools">
       <installation os="Mandriva 2008.0 64bit"
-                    version="" 
+                    version="10.4" 
                    disable="false"
                    installdiskspace="10076,0,10076"
                    script="homard.sh"/>

diff --git a/config_Mandriva_2010.0.xml b/config_Mandriva_2010.0.xml
index ed95a60806d541feff78b20aff21359708bb8917..42fb010dc6931d9ec214e28df5d9cffc0f2c1cac 100755 (executable)
--- a/config_Mandriva_2010.0.xml
+++ b/config_Mandriva_2010.0.xml
@@ -657,7 +657,7 @@
             type="prerequisite"
              description="HOMARD meshing tools">
       <installation os="Mandriva 2010.0"
-                    version="" 
+                    version="10.4" 
                    disable="false"
                    installdiskspace="10076,0,10076"
                    script="homard.sh"/>

diff --git a/config_Mandriva_2010.0_64bit.xml b/config_Mandriva_2010.0_64bit.xml
index e3e69071dc2dd34d68743adf50cbfaa44e502cf3..eb4fbf697d8c1111da7104e69e0c5ff889372d8a 100755 (executable)
--- a/config_Mandriva_2010.0_64bit.xml
+++ b/config_Mandriva_2010.0_64bit.xml
@@ -657,7 +657,7 @@
             type="prerequisite"
              description="HOMARD meshing tools">
       <installation os="Mandriva 2010.0 64bit"
-                    version="" 
+                    version="10.4" 
                    disable="false"
                    installdiskspace="10076,0,10076"
                    script="homard.sh"/>

diff --git a/config_Red_Hat_Enterprise_WS_4_64bit.xml b/config_Red_Hat_Enterprise_WS_4_64bit.xml
index 3f8e8a4217e0d44064e58bbf775aeda947e277d2..a88e5ba2fce67436968cb4a5698ff12a1b53ad27 100755 (executable)
--- a/config_Red_Hat_Enterprise_WS_4_64bit.xml
+++ b/config_Red_Hat_Enterprise_WS_4_64bit.xml
@@ -657,7 +657,7 @@
             type="prerequisite"
              description="HOMARD meshing tools">
       <installation os="Red Hat Enterprise WS 4 64bit"
-                    version="" 
+                    version="10.4" 
                    disable="false"
                    installdiskspace="10076,0,10076"
                    script="homard.sh"/>

diff --git a/config_Scientific_SL_5.1_64bit.xml b/config_Scientific_SL_5.1_64bit.xml
index 837519aaf0729458198ab5467ccb859aeb9fac4f..1cebd8891f804459660caf7dd1dee3cd0664c740 100755 (executable)
--- a/config_Scientific_SL_5.1_64bit.xml
+++ b/config_Scientific_SL_5.1_64bit.xml
@@ -657,7 +657,7 @@
             type="prerequisite"
              description="HOMARD meshing tools">
       <installation os="Scientific SL 5.1 64bit"
-                    version="" 
+                    version="10.4" 
                    disable="false"
                    installdiskspace="10076,0,10076"
                    script="homard.sh"/>

diff --git a/config_files/homard.sh b/config_files/homard.sh
index 7c6d76fc12643fbde6e63c0ede5f29dee9bea7fa..54b4cb851de49f5ecbfa9c023a575cf34f62e29b 100755 (executable)
--- a/config_files/homard.sh
+++ b/config_files/homard.sh
@@ -13,12 +13,17 @@
 ####################################################################################
 
 #
-# ghs3d &blsurf versions
+# homard version
+#
+HOMARD_VERSION=10.4
+
+#
+# homard's bin directory (platform)
 #
 if test `uname -m` = "x86_64" ; then
-homard_VERSION=10.3_64
+    HOMARD_DIR=HOMARD_V${HOMARD_VERSION}_64
 else
-homard_VERSION=10.3_32
+    HOMARD_DIR=HOMARD_V${HOMARD_VERSION}_32
 fi
 
 
@@ -32,7 +37,7 @@ print_env_bin()
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export homard_HOME=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
-export PATH=\${homard_HOME}/HOMARD_V${homard_VERSION}/bin:\$PATH
+export PATH=\${homard_HOME}/${HOMARD_DIR}:\$PATH
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
@@ -92,7 +97,7 @@ REMOVE_SRC_TMP=$9;
 shift
 BIN_DIR=$9;
 test $# == 10 && shift && SINGLE_DIR=$9
-export PRODUCT="homard"
+export PRODUCT="homard-${HOMARD_VERSION}"
 export PRODUCT_DIR=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
 export PRODUCT_SRC_DIR=${INST_ROOT}/${PRODUCT}_SRC