Join modifications from branch V3_1_0_For_CCRT

diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in
index a381c106243939379f6ccd638043eb2ff3bdb9f8..79cded1cfe0edbfd0ed6f8f411bad7b862860bc9 100644 (file)
--- a/adm_local/unix/make_commence.in
+++ b/adm_local/unix/make_commence.in
@@ -2,7 +2,7 @@
 inc_builddir=$(top_builddir)/include/salome
 
 @SET_MAKE@
-SHELL=/bin/sh
+SHELL=@SHELL@
 
 # header missing
 
@@ -10,9 +10,13 @@ HAVE_SSTREAM=@HAVE_SSTREAM@
 
 
 LIBS=@LIBS@ 
-LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib/salome -Xlinker -rpath-link -Xlinker -L$(top_builddir)/lib/salome
+LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib/salome
 # add libstdc++ to link c++ library with libtool !
-LDFLAGS+= -lstdc++
+LDFLAGS+= @STDLIB@
+
+LIBSFORBIN=@LIBS@
+LDFLAGSFORBIN=@LDFLAGS@ -L$(top_builddir)/lib/salome
+LDFLAGSFORBIN+= @STDLIB@
 
 CP=@CP@
 
@@ -101,12 +105,12 @@ MED2_MT_LIBS=@MED2_MT_LIBS@
 OCC_INCLUDES=@CAS_CPPFLAGS@
 OCC_CXXFLAGS=@CAS_CXXFLAGS@
 
-OCC_KERNEL_LIBS=@CAS_KERNEL@
-OCC_OCAF_LIBS=@CAS_OCAF@
-OCC_VIEWER_LIBS=@CAS_VIEWER@
-OCC_MODELER_LIBS=@CAS_MODELER@
-OCC_DATAEXCHANGE_LIBS=@CAS_DATAEXCHANGE@
-OCC_LIBS=@CAS_LDFLAGS@
+CAS_KERNEL=@CAS_KERNEL@
+CAS_OCAF=@CAS_OCAF@
+CAS_VIEWER=@CAS_VIEWER@
+CAS_MODELER=@CAS_MODELER@
+CAS_DATAEXCHANGE=@CAS_DATAEXCHANGE@
+CAS=@CAS_LDFLAGS@
 
 # MPICH
 

diff --git a/build_configure b/build_configure
index fc8583e77c18ede546faf7b2839df99faa382789..209885f42dd6b9499bc49d1c4cec48ec382015b4 100755 (executable)
--- a/build_configure
+++ b/build_configure
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 #
 # Tool for updating list of .in file for the SALOME project 
@@ -52,8 +52,8 @@ fi
 
 find_in()
 {
-  local i
-  local f=$2
+  i=0
+  f=$2
 
 # if the first argument is not a directory, returns
 
@@ -104,8 +104,11 @@ ABS_CONF_DIR=`pwd`
 # Common part of the configure.in file
 #
 chmod u+w configure.in.base
-if ! \cp -f configure.in.base configure.in_tmp1 
+if \cp -f configure.in.base configure.in_tmp1 
 then
+       echo
+        chmod u+w configure.in_tmp1
+else
        echo
        echo "error : can't create files in" ${CONF_DIR}
        echo "aborting ..."
@@ -176,9 +179,11 @@ then
        fi
 else
        echo -n "Updating 'configure.in' file ... "
-       if ! \cp configure.in configure.in_old >& /dev/null
+       if \cp configure.in configure.in_old >& /dev/null
        then
                echo
+        else
+                echo
                echo
                echo "Can't backup previous configure.in"
                echo -n "Continue (you will not be able to revert) - (Y/N) ? "

diff --git a/configure.in.base b/configure.in.base
index eba7c7f46974187c6245dd6c18daaecec56114c8..ea4b5a89a4d11c99f3370d0ee0b8246b707cec52 100644 (file)
--- a/configure.in.base
+++ b/configure.in.base
@@ -44,6 +44,12 @@ echo Build  root directory : $ROOT_BUILDDIR
 echo
 echo
 
+dnl Modification B. Secher portage sur osf CCRT
+AC_CHECK_PROG(SHELL,sh,,)
+AC_SUBST(SHELL)
+
+AUX_CONFIG_DIR=${KERNEL_ROOT_DIR}/salome_adm/unix/config_files
+
 if test -z "$AR"; then
    AC_CHECK_PROGS(AR,ar xar,:,$PATH)
 fi
@@ -82,10 +88,23 @@ dnl Fix up the INSTALL macro if it s a relative path. We want the
 dnl full-path to the binary instead.
 case "$INSTALL" in
    *install-sh*)
-      INSTALL='\${KERNEL_ROOT_DIR}'/salome_adm/unix/config_files/install-sh
-      ;;
+     case $host_os in
+       osf*)
+         INSTALL="${AUX_CONFIG_DIR}/install-sh -c"
+         ;;
+       *)
+         INSTALL='\${AUX_CONFIG_DIR}'/install-sh
+         ;;
+     esac
 esac
 
+AC_CXX_USE_STD_IOSTREAM
+
+dnl 
+dnl Well we use sstream which is not in gcc pre-2.95.3
+dnl We must test if it exists. If not, add it in include !
+dnl
+
 AC_CXX_HAVE_SSTREAM
 
 

diff --git a/idl/Makefile.in b/idl/Makefile.in
index 444fd606e691f19dcf7a755511386e79d768aa56..0feff6b62cd4458f3d81b49cbaf43f8d7462b4a8 100644 (file)
--- a/idl/Makefile.in
+++ b/idl/Makefile.in
@@ -39,7 +39,7 @@ install: install-pyidl install-idl
 # create directory $(idldir) and copy idl files into it
 install-idl: $(IDL_FILES)
        $(INSTALL) -d  $(idldir)
-       cp -p $^ $(idldir)
+       cp -fp $^ $(idldir)
 
 OMNIORB_IDLCXXFLAGS+=-I${MED_ROOT_DIR}/idl/salome
 OMNIORB_IDLPYFLAGS+=-I${MED_ROOT_DIR}/idl/salome

diff --git a/src/CALCULATOR/CALCULATOR.cxx b/src/CALCULATOR/CALCULATOR.cxx
index 64dcfe21e90d552228349f562877c242aa974a2b..31b4c62b36e94d07c25aa1c0c9f6dc3d11ed703a 100644 (file)
--- a/src/CALCULATOR/CALCULATOR.cxx
+++ b/src/CALCULATOR/CALCULATOR.cxx
@@ -3,12 +3,12 @@
 #include "MESHClient.hxx"
 #include <string>
 #include <strstream>
-using namespace std;
 #include "MEDMEM_Mesh_i.hxx"
 #include "MEDMEM_Support_i.hxx"
 #include "MEDMEM_FieldTemplate_i.hxx"
 #include <iomanip>
 #include <cmath>
+using namespace std;
 using namespace MEDMEM;
 
 typedef FIELD<double,MEDMEM::FullInterlace> TFieldDouble;

diff --git a/src/CALCULATOR/CALCULATOR_TEST.py b/src/CALCULATOR/CALCULATOR_TEST.py
index c2a573c0d74c9c55fc31def6c59cdd0eb11f78b3..994e24a2f5246dc35d16c1f2ff53ccc37a18379f 100644 (file)
--- a/src/CALCULATOR/CALCULATOR_TEST.py
+++ b/src/CALCULATOR/CALCULATOR_TEST.py
@@ -1,7 +1,21 @@
+from omniORB import CORBA
+
 import salome
 import SALOME
 import SALOME_MED
 
+#CCRT :
+import os
+import Engines
+import LifeCycleCORBA
+
+host = os.getenv( 'HOST' )
+
+orb = CORBA.ORB_init([''], CORBA.ORB_ID)
+
+lcc = LifeCycleCORBA.LifeCycleCORBA(orb)
+#endCCRT
+
 ################   GET A MED FIELD FROM FILE pointe.med   ###################
 #
 # This test program is based on the field named fieldcelldoublevector in 
@@ -14,7 +28,8 @@ fieldname = "fieldcelldoublescalar"
 
 # Launch the Med Component and use it to load into memory the test field 
 print "Launch the Med Component: "
-med_comp = salome.lcc.FindOrLoadComponent("FactoryServer", "MED")
+#CCRTmed_comp = salome.lcc.FindOrLoadComponent("FactoryServer", "MED")
+med_comp = lcc.FindOrLoadComponent("FactoryServer", "MED")
 
 # Get a Corba field proxy on the distant field (located in the med_comp server).
 try:

diff --git a/src/CALCULATOR/Makefile.in b/src/CALCULATOR/Makefile.in
index 8856dfe9b8151183187ed52f509935dbba228eb4..63b00f6c72d4327b454ef413282b58f3a93d1357 100644 (file)
--- a/src/CALCULATOR/Makefile.in
+++ b/src/CALCULATOR/Makefile.in
@@ -23,7 +23,7 @@ OMNIORB_IDLCXXFLAGS+=-I${MED_ROOT_DIR}/idl/salome
 CPPFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -I${MED_ROOT_DIR}/include/salome $(MED2_INCLUDES) $(HDF5_INCLUDES)
 # CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome
 
-LDFLAGS+= -lSalomeContainer -lOpUtil -L${KERNEL_ROOT_DIR}/lib/salome $(MED2_LIBS) $(HDF5_LIBS) -L${MED_ROOT_DIR}/lib/salome -lMEDClientcmodule
+LDFLAGS+= -L${KERNEL_ROOT_DIR}/lib/salome -lSalomeContainer -lOpUtil $(MED2_LIBS) $(HDF5_LIBS) -L${MED_ROOT_DIR}/lib/salome -lMEDClientcmodule
 # -lmedmem -lMEDWrapper_V2_1 -lMEDWrapperBase
 
 MED.hh MEDSK.cc: MED.idl