From 260bf6b42efe9e30501c4e6e99b013da3fe34f77 Mon Sep 17 00:00:00 2001
From: inv <inv@opencascade.com>
Date: Mon, 2 Apr 2012 07:52:44 +0000
Subject: [PATCH] SALOME 6.5.0 preparation: homard 10.3 -> 10.4

---
 config_CentOS_5.5_64bit.xml              |  2 +-
 config_Debian_4.0.xml                    |  2 +-
 config_Debian_4.0_64bit.xml              |  2 +-
 config_Debian_5.0_64bit.xml              |  2 +-
 config_Debian_6.0_64bit.xml              |  2 +-
 config_Mandriva_2008.0.xml               |  2 +-
 config_Mandriva_2008.0_64bit.xml         |  2 +-
 config_Mandriva_2010.0.xml               |  2 +-
 config_Mandriva_2010.0_64bit.xml         |  2 +-
 config_Red_Hat_Enterprise_WS_4_64bit.xml |  2 +-
 config_Scientific_SL_5.1_64bit.xml       |  2 +-
 config_files/homard.sh                   | 15 ++++++++++-----
 12 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/config_CentOS_5.5_64bit.xml b/config_CentOS_5.5_64bit.xml
index 49208cd..c9b307d 100755
--- 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 7f1e88f..ef927b8 100755
--- 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 1343a78..7e4eb42 100755
--- 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 2984ae7..873963f 100755
--- 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 0bd4041..c0cfeb8 100755
--- 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 568a25a..8b426b9 100755
--- 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 2a3122b..3f4af3a 100755
--- 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 ed95a60..42fb010 100755
--- 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 e3e6907..eb4fbf6 100755
--- 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 3f8e8a4..a88e5ba 100755
--- 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 837519a..1cebd88 100755
--- 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 7c6d76f..54b4cb8 100755
--- 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
-- 
2.39.2