DCQ: prepare V2.0.0

diff --git a/salome_adm/Makefile.in b/salome_adm/Makefile.in
index cbe47153deaff92c0697fa2a23e53066949410ac..d170972f1ec634a5b412555d95128ceb35b719ae 100644 (file)
--- a/salome_adm/Makefile.in
+++ b/salome_adm/Makefile.in
@@ -13,7 +13,7 @@ install:
 bin:
 
 resources :
-       cp -rf @top_srcdir@/salome_adm @top_builddir@
+       cp -rf @top_srcdir@/salome_adm $(top_builddir)
 
 inc:
 

diff --git a/salome_adm/unix/config_files/check_htmlgen.m4 b/salome_adm/unix/config_files/check_htmlgen.m4
index 026f80d076f00248fb95ae131462e686efd9c0c8..85c8dca84c637ba6dfa628bf0b9cffe10f0a7be2 100644 (file)
--- a/salome_adm/unix/config_files/check_htmlgen.m4
+++ b/salome_adm/unix/config_files/check_htmlgen.m4
@@ -3,39 +3,43 @@ dnl Copyright (C) 2003  CEA/DEN, EDF R&D
 AC_DEFUN([CHECK_HTML_GENERATORS],[
 
 #AC_CHECKING(for html generators)
-AC_CHECKING(for doxygen)
 
 doxygen_ok=yes
-
 dnl were is doxygen ?
-
 AC_PATH_PROG(DOXYGEN,doxygen) 
-       
 if test "x$DOXYGEN" = "x"
 then
-  doxygen_ok=no
-  AC_MSG_RESULT(no)
   AC_MSG_WARN(doxygen not found)
-else
-  dnl AC_SUBST(DOXYGEN)
-  AC_MSG_RESULT(yes)
+  doxygen_ok=no
 fi
-
-AC_CHECKING(for graphviz)
+dnl AC_SUBST(DOXYGEN)
 
 graphviz_ok=yes
-
 dnl were is graphviz ?
-
 AC_PATH_PROG(DOT,dot) 
-       
 if test "x$DOT" = "x" ; then
-  graphviz_ok=no
-  AC_MSG_RESULT(no)
   AC_MSG_WARN(graphviz not found)
-else
-  AC_MSG_RESULT(yes)
+  graphviz_ok=no
+fi
+dnl AC_SUBST(DOT)
+
+AC_PATH_PROG(LATEX,latex) 
+if test "x$LATEX" = "x" ; then
+  AC_MSG_WARN(latex not found)
+fi
+AC_SUBST(LATEX)
+
+AC_PATH_PROG(DVIPS,dvips)
+if test "x$DVIPS" = "x" ; then
+  AC_MSG_WARN(dvips not found)
+fi
+AC_SUBST(DVIPS)
+
+AC_PATH_PROG(PDFLATEX,pdflatex)
+if test "x$PDFLATEX" = "x" ; then
+  AC_MSG_WARN(pdflatex not found)
 fi
+AC_SUBST(PDFLATEX)
 
 ])dnl
 dnl

diff --git a/src/Container/SALOME_ComponentPy.py b/src/Container/SALOME_ComponentPy.py
index 2c2a5d0f13034d1497f43dd58a70c352b9f587f7..37b00188e33929a05f71da349789e5c2b56a0fc8 100755 (executable)
--- a/src/Container/SALOME_ComponentPy.py
+++ b/src/Container/SALOME_ComponentPy.py
@@ -31,6 +31,7 @@
 import os
 import sys
 import time
+import string
 from omniORB import CORBA, PortableServer
 import Engines, Engines__POA
 import Registry
@@ -73,7 +74,8 @@ class SALOME_ComponentPy_i (Engines__POA.Component):
         self._Executed = 0
 
         naming_service = SALOME_NamingServicePy_i(self._orb)
-        Component_path = "/Containers/" +  os.getenv( "HOSTNAME" ) + "/" + self._containerName + "/" + self._interfaceName
+        myMachine=string.split(os.getenv( "HOSTNAME" ),'.')
+        Component_path = "/Containers/" + myMachine[0] + "/" + self._containerName + "/" + self._interfaceName
         MESSAGE(  'SALOME_ComponentPy_i Register' + str( Component_path ) )
         naming_service.Register(self._this(), Component_path)
 

diff --git a/src/LifeCycleCORBA/LifeCycleCORBA.py b/src/LifeCycleCORBA/LifeCycleCORBA.py
index fe19bfdffe2076dbfb39164187782c825f045903..448491864e96b1ee4a1ca18ac4ba94b9a90cfc7f 100644 (file)
--- a/src/LifeCycleCORBA/LifeCycleCORBA.py
+++ b/src/LifeCycleCORBA/LifeCycleCORBA.py
@@ -29,6 +29,7 @@
 import os
 import sys
 import time
+import string
 from omniORB import CORBA
 import CosNaming
 import Engines
@@ -133,7 +134,8 @@ class LifeCycleCORBA:
         aContainer = self.FindContainer( theComputer + "/" + theContainer )
         if aContainer is None :
             if (theContainer == "FactoryServer") | (theContainer == "FactoryServerPy") :
-                if theComputer == os.getenv("HOSTNAME") :
+                myMachine=string.split(os.getenv( "HOSTNAME" ),'.')
+                if theComputer == myMachine[0] :
                     rshstr = ""
                 else :
                     rshstr = "rsh -n " + theComputer + " "

diff --git a/src/Loader/InquireServersQThread.cxx b/src/Loader/InquireServersQThread.cxx
index 812a04e8d7de48d19d4e60e0cc3301a378bd68a7..ed5d276cdb82587c8d135e3df3431e25c2d430c8 100644 (file)
--- a/src/Loader/InquireServersQThread.cxx
+++ b/src/Loader/InquireServersQThread.cxx
@@ -547,6 +547,27 @@ QString findFile( QString filename )
   QString dir;
   char* cenv;
   
+  // Try ${SALOME_SITE_DIR}/share/${SALOME_SITE_NAME}/resources directory
+  cenv = getenv( "SALOME_SITE_DIR" );
+  if ( cenv ) {
+    dir.sprintf( "%s", cenv );
+    if ( !dir.isEmpty() ) {
+      dir = addSlash(dir) ;
+      dir = dir + "share" ;
+      dir = addSlash(dir) ;
+      cenv = getenv( "SALOME_SITE_NAME" );
+      if ( cenv ) 
+       dir = dir + cenv ;
+      else
+       dir = dir + "salome" ;
+      dir = addSlash(dir) ;
+      dir = dir + "resources" ;
+      dir = addSlash(dir) ;
+      QFileInfo fileInfo( dir + filename );
+      if ( fileInfo.isFile() && fileInfo.exists() )
+       return fileInfo.filePath();
+    }
+  }
   // Try ${KERNEL_ROOT_DIR}/share/salome/resources directory
   cenv = getenv( "KERNEL_ROOT_DIR" );
   if ( cenv ) {

diff --git a/src/MEDWrapper/MED_Structures.cxx b/src/MEDWrapper/MED_Structures.cxx
index 6b940e7c620c863b5d6e6816bb7a73547cb41574..500a3e932c987c27ca4269a71945b8b164be4c71 100644 (file)
--- a/src/MEDWrapper/MED_Structures.cxx
+++ b/src/MEDWrapper/MED_Structures.cxx
@@ -54,7 +54,13 @@ med_int MED::GetNbConn(med_entite_maillage theMedEntity,
 
 //---------------------------------------------------------------
 TNameInfo::TNameInfo(const string& theValue):
-  myName('\0',MED_TAILLE_NOM+1) 
+#if defined __GNUC_2__
+  // _CS_phb Attention, il s'agit dans ce cas (gcc2.*) d'un vector.
+  // L'appel des arguments est inversé.
+  myName(MED_TAILLE_NOM+1,'\0')
+#else
+  myName('\0',MED_TAILLE_NOM+1)
+#endif
 {
   if(theValue != "") SetName(theValue);
 }
@@ -85,11 +91,21 @@ TFamilyInfo::TFamilyInfo(const PMeshInfo& theMeshInfo,
   myMeshInfo(theMeshInfo),
   myId(theId),
   myNbGroup(theNbGroup),
+#if defined __GNUC_2__
+  // _CS_phb Attention, il s'agit dans ce cas (gcc2.*) d'un vector
+  // L'appel des arguments est inversé.
+  myGroupNames(theNbGroup*MED_TAILLE_LNOM+1,'\0'),
+#else
   myGroupNames('\0',theNbGroup*MED_TAILLE_LNOM+1),
+#endif
   myNbAttr(theNbAttr), 
   myAttrId(theNbAttr), 
   myAttrVal(theNbAttr),
+#if defined __GNUC_2__
+  myAttrDesc(theNbAttr*MED_TAILLE_DESC+1,'\0')
+#else
   myAttrDesc('\0',theNbAttr*MED_TAILLE_DESC+1)
+#endif
 {}  
 
 TFamilyInfo::TFamilyInfo(const PMeshInfo& theMeshInfo,
@@ -103,11 +119,22 @@ TFamilyInfo::TFamilyInfo(const PMeshInfo& theMeshInfo,
   myMeshInfo(theMeshInfo),
   myId(theId),
   myNbGroup(theGroupNames.size()),
+#if defined __GNUC_2__
+  // _CS_phb Attention, il s'agit dans ce cas (gcc2.*) d'un vector
+  // L'appel des arguments est inversé.
+  myGroupNames(theGroupNames.size()*MED_TAILLE_LNOM+1,'\0'),
+#else
   myGroupNames('\0',theGroupNames.size()*MED_TAILLE_LNOM+1),
+#endif
   myNbAttr(theAttrDescs.size()), 
   myAttrId(theAttrDescs.size()), 
   myAttrVal(theAttrDescs.size()),
+#if defined __GNUC_2__
+  myAttrDesc(theAttrDescs.size()*MED_TAILLE_DESC+1,'\0')
+#else
   myAttrDesc('\0',theAttrDescs.size()*MED_TAILLE_DESC+1)
+#endif
+
 {
   if(myNbGroup){
     TStringSet::const_iterator anIter = theGroupNames.begin();
@@ -154,7 +181,11 @@ TElemInfo::TElemInfo(const PMeshInfo& theMeshInfo,
   myIsElemNum(theIsElemNum), 
   myElemNum(theIsElemNum == MED_FAUX? 0: theNbElem),
   myIsElemNames(theIsElemNames),
+#if defined __GNUC_2__
+  myElemNames((theIsElemNames == MED_FAUX? 0: theNbElem)*MED_TAILLE_PNOM+1,'\0')
+#else
   myElemNames('\0',(theIsElemNames == MED_FAUX? 0: theNbElem)*MED_TAILLE_PNOM+1)
+#endif
 {}
 
 TElemInfo::TElemInfo(const PMeshInfo& theMeshInfo, 
@@ -167,7 +198,11 @@ TElemInfo::TElemInfo(const PMeshInfo& theMeshInfo,
   myIsElemNum(theElemNums.size()? MED_VRAI: MED_FAUX), 
   myElemNum(theElemNums.size()),
   myIsElemNames(theElemNames.size()? MED_VRAI: MED_FAUX),
+#if defined __GNUC_2__
+  myElemNames(theElemNames.size()*MED_TAILLE_PNOM+1,'\0')
+#else
   myElemNames('\0',theElemNames.size()*MED_TAILLE_PNOM+1)
+#endif
 {
   if(myNbElem){
     for(med_int anId = 0; anId < myNbElem; anId++){
@@ -205,8 +240,13 @@ TNodeInfo::TNodeInfo(const PMeshInfo& theMeshInfo,
   TElemInfo(theMeshInfo,theNbElem,theIsElemNum,theIsElemNames),
   myCoord(theNbElem*theMeshInfo->myDim), 
   mySystem(theSystem), 
+#if defined __GNUC_2__
+  myCoordNames(theMeshInfo->myDim*MED_TAILLE_PNOM+1,'\0'),
+  myCoordUnits(theMeshInfo->myDim*MED_TAILLE_PNOM+1,'\0')
+#else
   myCoordNames('\0',theMeshInfo->myDim*MED_TAILLE_PNOM+1),
   myCoordUnits('\0',theMeshInfo->myDim*MED_TAILLE_PNOM+1)
+#endif
 {}
 
 TNodeInfo::TNodeInfo(const PMeshInfo& theMeshInfo, 
@@ -220,8 +260,13 @@ TNodeInfo::TNodeInfo(const PMeshInfo& theMeshInfo,
   TElemInfo(theMeshInfo,theFamilyNums,theElemNums,theElemNames),
   myCoord(theNodeCoords.size()), 
   mySystem(theSystem), 
+#if defined __GNUC_2__
+  myCoordNames(theMeshInfo->myDim*MED_TAILLE_PNOM+1,'\0'),
+  myCoordUnits(theMeshInfo->myDim*MED_TAILLE_PNOM+1,'\0')
+#else
   myCoordNames('\0',theMeshInfo->myDim*MED_TAILLE_PNOM+1),
   myCoordUnits('\0',theMeshInfo->myDim*MED_TAILLE_PNOM+1)
+#endif
 {
   if(myCoord.size() == myNbElem*theMeshInfo->myDim){
     for(med_int anId = 0, anEnd = myCoord.size(); anId < anEnd; anId++){
@@ -315,8 +360,13 @@ TFieldInfo::TFieldInfo(const PMeshInfo& theMeshInfo,
   myMeshInfo(theMeshInfo), 
   myNbComp(theNbComp),
   myType(theType),
+#if defined __GNUC_2__
+  myCompNames(theNbComp*MED_TAILLE_PNOM + 1,'\0'),
+  myUnitNames(theNbComp*MED_TAILLE_PNOM + 1,'\0')
+#else
   myCompNames('\0',theNbComp*MED_TAILLE_PNOM + 1),
   myUnitNames('\0',theNbComp*MED_TAILLE_PNOM + 1)
+#endif
 {}
 
 string TFieldInfo::GetCompName(med_int theId) const { 
@@ -343,7 +393,11 @@ TTimeStampInfo::TTimeStampInfo(const PFieldInfo& theFieldInfo,
   myFieldInfo(theFieldInfo), 
   myEntity(theEntity), 
   myGeom(theGeom), 
+#if defined __GNUC_2__
+  myUnitDt(MED_TAILLE_PNOM+1,'\0')
+#else
   myUnitDt('\0',MED_TAILLE_PNOM+1)
+#endif
 {}
 
 string TTimeStampInfo::GetUnitDt() const { 
@@ -358,7 +412,11 @@ void TTimeStampInfo::SetUnitDt(const string& theValue){
 //---------------------------------------------------------------
 TTimeStampVal::TTimeStampVal(const PTimeStampInfo& theTimeStampInfo):
   myTimeStampInfo(theTimeStampInfo),
+#if defined __GNUC_2__
+  myPflName(MED_TAILLE_NOM+1,'\0')
+#else
   myPflName('\0',MED_TAILLE_NOM+1)
+#endif
 {
   med_int aNbComp = theTimeStampInfo->myFieldInfo->myNbComp;
   med_int aNbGauss = theTimeStampInfo->myNbGauss;

diff --git a/src/ModuleCatalog/SALOME_ModuleCatalog_Handler.cxx b/src/ModuleCatalog/SALOME_ModuleCatalog_Handler.cxx
index 5af547b2e452606b410b6fecce3393d38fd57328..da1ce33ceb654cba42939cf7624306b4fd96a0dc 100644 (file)
--- a/src/ModuleCatalog/SALOME_ModuleCatalog_Handler.cxx
+++ b/src/ModuleCatalog/SALOME_ModuleCatalog_Handler.cxx
@@ -523,8 +523,8 @@ bool SALOME_ModuleCatalog_Handler::characters(const QString& chars)
 #include <fstream>
 bool SALOME_ModuleCatalog_Handler::endDocument()
 {
-  ofstream f("/tmp/logs/xxx.log", std::ofstream::app);
-  f << "---------------------------------------------------------" << std::endl;
+//  ofstream f("/tmp/logs/xxx.log", std::ofstream::app);
+//  f << "---------------------------------------------------------" << std::endl;
   BEGIN_OF("endDocument");
   //_pathlist
   for (unsigned int ind = 0; ind < _pathList.size(); ind++)
@@ -536,10 +536,10 @@ bool SALOME_ModuleCatalog_Handler::endDocument()
 
    // _moduleList
 //  SCRUTE(_moduleList.size());
-  for (unsigned int ind = 0; ind < _moduleList.size(); ind++)
-    {
-      f << _moduleList[ind] << std::endl;
-    }
+//  for (unsigned int ind = 0; ind < _moduleList.size(); ind++)
+//    {
+//      f << _moduleList[ind] << std::endl;
+//    }
 
   MESSAGE("Document parsed");
   END_OF("endDocument");

diff --git a/src/OBJECT/Makefile.in b/src/OBJECT/Makefile.in
index 4bb0d399bf95c25d099a90076278be5d984fde94..d15092cab254769df7030e6a828c67c070bbaa65 100644 (file)
--- a/src/OBJECT/Makefile.in
+++ b/src/OBJECT/Makefile.in
@@ -32,7 +32,7 @@ BIN =
 BIN_SRC        =
 
 CPPFLAGS+=$(PYTHON_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES)
-LDFLAGS+= $(VTK_LIBS) $(OGL_LIBS) $(PYTHON_LIBS) $(CAS_LDPATH) -lTKV3d -lSalomeVTKFilter
+LDFLAGS+= $(PYTHON_LIBS) $(VTK_LIBS) $(OGL_LIBS) $(CAS_LDPATH) -lTKV3d -lSalomeVTKFilter
 
 
 @CONCLUDE@