PR: Appli and lib

diff --git a/bin/appli_clean.sh b/bin/appli_clean.sh
index 0046e946cc96733aef2d41b8f0ee85747b726cfc..169a56622b0106fdefdf427c03b870b0ab172c9d 100644 (file)
--- a/bin/appli_clean.sh
+++ b/bin/appli_clean.sh
@@ -20,4 +20,4 @@
 # 
 
 #clean appli
-rm -rf bin lib share doc  env.d envd setAppliPath.sh searchFreePort.sh runAppli runConsole runSession runRemote.sh runTests SalomeApp.xml *.pyc *~ .bashrc
+rm -rf bin lib share doc  env.d envd getAppliPath.py searchFreePort.sh runAppli runConsole runSession runRemote.sh runTests SalomeApp.xml *.pyc *~ .bashrc

diff --git a/bin/appli_gen.py b/bin/appli_gen.py
index c24614cc15a3dd705cd34eeb9aac508568d199ff..1ce244aca540971e95ba67470eef9b4c5691c9fc 100644 (file)
--- a/bin/appli_gen.py
+++ b/bin/appli_gen.py
@@ -145,7 +145,7 @@ def install(prefix,config_file):
     appliskel_dir=os.path.join(home_dir,'bin','salome','appliskel')
 
     for fn in ('envd',
-               'setAppliPath.sh',
+               'getAppliPath.py',
                'searchFreePort.sh',
                'runRemote.sh',
                'runAppli',
@@ -154,7 +154,7 @@ def install(prefix,config_file):
                'runTests',
                '.bashrc',
                ):
-        virtual_salome.symlink(os.path.join(appliskel_dir, fn),os.path.join(home_dir, fn))
+        virtual_salome.symlink("./bin/salome/appliskel/"+fn,os.path.join(home_dir, fn))
         pass
 
     if filename != os.path.join(home_dir,"config_appli.xml"):
@@ -174,7 +174,7 @@ def install(prefix,config_file):
 
     f =open(os.path.join(home_dir,'env.d','configSalome.sh'),'w')
     for module in _config["modules"]:
-        command='export '+ module + '_ROOT_DIR=' + home_dir +'\n'
+        command='export '+ module + '_ROOT_DIR=${HOME}/${APPLI}\n'
         f.write(command)
         pass
     if _config.has_key("samples_path"):
@@ -185,9 +185,9 @@ def install(prefix,config_file):
 
 
     f =open(os.path.join(home_dir,'env.d','configGUI.sh'),'w')
-    command = 'export SalomeAppConfig=' + home_dir +'\n'
+    command = 'export SalomeAppConfig=${HOME}/${APPLI}\n'
     f.write(command)
-    command = 'export SUITRoot=' + os.path.join(home_dir,'share','salome') +'\n'
+    command = 'export SUITRoot=${HOME}/${APPLI}/share/salome\n'
     f.write(command)
     f.write('export DISABLE_FPE=1\n')
     f.write('export MMGT_REENTRANT=1\n')

diff --git a/bin/appli_install.sh b/bin/appli_install.sh
index 37da0092e3f7378245cc3e064426702e83bd9ea0..5e0dc418afa4c81e232f3c0f1d029352bc2ce32a 100644 (file)
--- a/bin/appli_install.sh
+++ b/bin/appli_install.sh
@@ -25,13 +25,13 @@ INSTALL_ROOT=${SALOME_ROOT}/Install
 APPLI_ROOT=`pwd`
 
 # --- clean appli
-rm -rf bin lib share doc envd setAppliPath.sh searchFreePort.sh runAppli runConsole runSession env.d
+rm -rf bin lib share doc envd getAppliPath.py searchFreePort.sh runAppli runConsole runSession env.d
 
 # --- install appli
 
 mkdir -p env.d
 ln -fs bin/salome/appliskel/envd .
-ln -fs bin/salome/appliskel/setAppliPath.sh .
+ln -fs bin/salome/appliskel/getAppliPath.py .
 ln -fs bin/salome/appliskel/searchFreePort.sh .
 ln -fs bin/salome/appliskel/runRemote.sh .
 ln -fs bin/salome/appliskel/runAppli .

diff --git a/bin/appliskel/CatalogResources.xml b/bin/appliskel/CatalogResources.xml
index 8caed2bfb265edddeab27ea20f05f4457df1ca24..9e09ed5fc0851dc72601e2c595c567c1a7b86ab9 100644 (file)
--- a/bin/appliskel/CatalogResources.xml
+++ b/bin/appliskel/CatalogResources.xml
@@ -1,28 +1,4 @@
 <!DOCTYPE ResourcesCatalog>
 <resources>
-  <machine 
-          protocol="ssh"
-          nbOfNodes="1"
-          mode="interactif"
-          OS="LINUX"
-          CPUFreqMHz="2800"
-          userName="prascle"
-          memInMB="1500"
-          nbOfProcPerNode="2"
-          alias="cli76cd"
-          hostname="cli76cd" >
-  </machine>
-
-  <machine
-          protocol="ssh"
-          nbOfNodes="1"
-          mode="interactif"
-          OS="LINUX"
-          CPUFreqMHz="2000"
-          userName="prascle"
-          memInMB="1000"
-          nbOfProcPerNode="1"
-          alias="cli76ce"
-          hostname="cli76ce" >
-  </machine>
+   <machine hostname="localhost" />
 </resources>

diff --git a/bin/appliskel/README b/bin/appliskel/README
index 644da212258868b1388dc73d4fda6075571bf126..21ee467ac0d463bdc22ac483164083acbdd52ce9 100644 (file)
--- a/bin/appliskel/README
+++ b/bin/appliskel/README
@@ -57,7 +57,7 @@ SALOME internal run scripts
 envd
    Sets SALOME application environment, envd is sourced by other scripts.
 
-setAppliPath.sh
+getAppliPath.py
    Used by other scripts to define the Application Path.
 
 searchFreePort.sh

diff --git a/bin/appliskel/killCurrentPort b/bin/appliskel/killCurrentPort
index 41b14866a4f940b78bfebfd26bb6cd023af2c175..c9f1e6c9d83a54555c7916878708713c04ce8346 100755 (executable)
--- a/bin/appliskel/killCurrentPort
+++ b/bin/appliskel/killCurrentPort
@@ -2,7 +2,8 @@
 
 # --- retrieve APPLI path, relative to $HOME, set ${APPLI}
 
-. `dirname $0`/setAppliPath.sh
+APPLI_HOME=`dirname $0`
+export APPLI=`${APPLI_HOME}/getAppliPath.py`
 
 # --- set the SALOME environment (prerequisites, MODULES_ROOT_DIR...)
 

diff --git a/bin/appliskel/runAppli b/bin/appliskel/runAppli
index 2bd9f1dae2f94933e7820313fd16dfc75d0164dd..a18114dd6e2758cd2a0d52e6cf4f1f4da9cabc1a 100755 (executable)
--- a/bin/appliskel/runAppli
+++ b/bin/appliskel/runAppli
@@ -4,7 +4,7 @@ APPLI_HOME=`dirname $0`
 
 # --- retrieve APPLI path, relative to $HOME, set ${APPLI}
 
-. ${APPLI_HOME}/setAppliPath.sh
+export APPLI=`${APPLI_HOME}/getAppliPath.py`
 
 # --- set the SALOME environment (prerequisites, MODULES_ROOT_DIR...)
 

diff --git a/bin/appliskel/runConsole b/bin/appliskel/runConsole
index c94a02fcf7988e68b18c96cdd1534aa530e70afe..73f5f5f8890b3a9ed842f0e6e0f6a2b674565596 100755 (executable)
--- a/bin/appliskel/runConsole
+++ b/bin/appliskel/runConsole
@@ -4,7 +4,7 @@ APPLI_HOME=`dirname $0`
 
 # --- retrieve APPLI path, relative to $HOME, set ${APPLI}
 
-. ${APPLI_HOME}/setAppliPath.sh
+export APPLI=`${APPLI_HOME}/getAppliPath.py`
 
 # --- set the SALOME environment (prerequisites, MODULES_ROOT_DIR...)
 

diff --git a/bin/appliskel/runRemote.sh b/bin/appliskel/runRemote.sh
index 21bc0b0c1202950e93df018c65ff5fe3c83ae752..6cd76ef4695adb645142191348d2e74275202d55 100755 (executable)
--- a/bin/appliskel/runRemote.sh
+++ b/bin/appliskel/runRemote.sh
@@ -42,7 +42,8 @@
 
 # --- retrieve APPLI path, relative to $HOME, set ${APPLI}
 
-. `dirname $0`/setAppliPath.sh
+APPLI_HOME=`dirname $0`
+export APPLI=`${APPLI_HOME}/getAppliPath.py`
 
 # --- set the SALOME environment (prerequisites, MODULES_ROOT_DIR...)
 

diff --git a/bin/appliskel/runSession b/bin/appliskel/runSession
index 9f3b0e4f9b05507e78d51c74476449235d5eb8c3..446ee605acc0f341ac639a0c6fbaf52da1bebc3c 100755 (executable)
--- a/bin/appliskel/runSession
+++ b/bin/appliskel/runSession
@@ -9,7 +9,7 @@ APPLI_HOME=`dirname $0`
 
 # --- retrieve APPLI path, relative to $HOME, set ${APPLI}
 
-. ${APPLI_HOME}/setAppliPath.sh
+export APPLI=`${APPLI_HOME}/getAppliPath.py`
 
 # --- set the SALOME environment (prerequisites, MODULES_ROOT_DIR...)
 

diff --git a/bin/appliskel/runTests b/bin/appliskel/runTests
index e98c1e6aaf92eb75241b7d9dfc2bd015e8c22f7d..4eb9b6dba05e3c8444914228bff11e1c549dbadb 100755 (executable)
--- a/bin/appliskel/runTests
+++ b/bin/appliskel/runTests
@@ -2,7 +2,8 @@
 
 # --- retrieve APPLI path, relative to $HOME, set ${APPLI}
 
-. `dirname $0`/setAppliPath.sh
+APPLI_HOME=`dirname $0`
+export APPLI=`${APPLI_HOME}/getAppliPath.py`
 
 # --- set the SALOME environment (prerequisites, MODULES_ROOT_DIR...)
 

diff --git a/bin/appliskel/setAppliPath.sh b/bin/appliskel/setAppliPath.sh
deleted file mode 100755 (executable)
index ccbd6b8..0000000
--- a/bin/appliskel/setAppliPath.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-# Copyright (C) 2005  OPEN CASCADE, CEA, EDF R&D, LEG
-#           PRINCIPIA R&D, EADS CCR, Lip6, BV, CEDRAT
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either 
-# version 2.1 of the License.
-# 
-# This library is distributed in the hope that it will be useful 
-# but WITHOUT ANY WARRANTY; without even the implied warranty of 
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-# Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public  
-# License along with this library; if not, write to the Free Software 
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-# 
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-# 
-
-# --- retrieve APPLI path, relative to $HOME, set ${APPLI}
-#     on sarge, "which" gives not allways the absolute path...
-     
-comName=`which $0`
-aa=${comName:0:1}
-if test x$aa == x\/; then
-  mycom=${comName}
-elif test x$aa == x\.; then
-  mycom=${PWD}/${comName:2}
-else
-  mycom=${PWD}/${comName}
-fi
-APPLI=`echo ${HOME} \`dirname $mycom\` | awk ' { print substr($2,length($1)+2) } '`
-#echo $APPLI
-export APPLI

diff --git a/bin/setenv.py b/bin/setenv.py
index 7e1b93d80e610343a6f2831560e9423e49a365a0..39ba85ca1c18c8dd95a0ff67d52868b8bf86e27d 100755 (executable)
--- a/bin/setenv.py
+++ b/bin/setenv.py
@@ -74,7 +74,7 @@ def get_lib_dir():
         if platform.machine() == "ia64":
             __lib__dir__ = "lib"
         else:
-            __lib__dir__ = "lib64"
+            __lib__dir__ = "lib"
     else:
         __lib__dir__ = "lib"
     return __lib__dir__

diff --git a/bin/virtual_salome.py b/bin/virtual_salome.py
index 4efd5979fe08750c929b4000af7a620aae6be53c..026dcb1c19a034b7a198452c0dd971c3ab70153e 100644 (file)
--- a/bin/virtual_salome.py
+++ b/bin/virtual_salome.py
@@ -84,7 +84,7 @@ def get_lib_dir():
         if platform.machine() == "ia64":
             __lib__dir__ = "lib"
         else:
-            __lib__dir__ = "lib64"
+            __lib__dir__ = "lib"
     else:
         __lib__dir__ = "lib"
     return __lib__dir__

diff --git a/salome_adm/unix/config_files/ac_linker_options.m4 b/salome_adm/unix/config_files/ac_linker_options.m4
index 9006a46fe54a09849d110c61f088cb93001fbd95..3c0065a077da4de7f84c0a2cb79501332f8c4a07 100644 (file)
--- a/salome_adm/unix/config_files/ac_linker_options.m4
+++ b/salome_adm/unix/config_files/ac_linker_options.m4
@@ -30,7 +30,7 @@ AC_DEFUN([AC_LINKER_OPTIONS],[
   AC_CHECKING(for LIB_LOCATION_SUFFIX)
   LIB_LOCATION_SUFFIX=""
   case "$build_cpu" in
-  x86_64*)  LIB_LOCATION_SUFFIX="64" ;;
+  x86_64*)  LIB_LOCATION_SUFFIX="" ;;
   *)        LIB_LOCATION_SUFFIX="" ;;
   esac
   AC_SUBST(LIB_LOCATION_SUFFIX)

diff --git a/src/KERNEL_PY/salome_shared_modules.py b/src/KERNEL_PY/salome_shared_modules.py
index 892b1085f2f51ae0fd577c6609b2419662e8fbce..4d221200555c61dbd302b829d394a8e8a07e3bb8 100755 (executable)
--- a/src/KERNEL_PY/salome_shared_modules.py
+++ b/src/KERNEL_PY/salome_shared_modules.py
@@ -83,7 +83,7 @@ if platform.architecture()[0] == "64bit":
     if platform.machine() == "ia64":
         libdir = "lib"
     else:
-        libdir = "lib64"
+        libdir = "lib"
 else:
     libdir = "lib"
 for rep in path: