diff -uNr OpenCASCADE6.3.0-old/ros/src/Aspect/Aspect_Driver.cxx OpenCASCADE6.3.0/ros/src/Aspect/Aspect_Driver.cxx --- OpenCASCADE6.3.0-old/ros/src/Aspect/Aspect_Driver.cxx 2001-11-15 18:01:55.000000000 +0100 +++ OpenCASCADE6.3.0/ros/src/Aspect/Aspect_Driver.cxx 2008-10-02 23:38:50.000000000 +0200 @@ -35,14 +35,12 @@ fontdir = getenv("CSF_MDTVFontDirectory" ); if ( !fontdir) { casroot = getenv("CASROOT"); - if ( casroot ) { - TCollection_AsciiString CasRootString (casroot); - CasRootString += "/src/FontMFT" ; - CSF_MDTVFontDirectory = OSD_Environment(CasRootString.ToCString()); - } else { - cout << " CASROOT or CSF_MDTVFontDirectory are mandatory to use this fonctionnality " << endl; - Standard_Failure::Raise ( "CSF_MDTVTexturesDirectory and CASROOT not setted " ); + if ( !casroot ) { + casroot = "/usr/share/OpenCASCADE"; } + TCollection_AsciiString CasRootString (casroot); + CasRootString += "/src/FontMFT" ; + CSF_MDTVFontDirectory = OSD_Environment(CasRootString.ToCString()); } else { CSF_MDTVFontDirectory = OSD_Environment("CSF_MDTVFontDirectory"); } diff -uNr OpenCASCADE6.3.0-old/ros/src/DPrsStd/DPrsStd.cxx OpenCASCADE6.3.0/ros/src/DPrsStd/DPrsStd.cxx --- OpenCASCADE6.3.0-old/ros/src/DPrsStd/DPrsStd.cxx 2005-07-08 15:51:41.000000000 +0200 +++ OpenCASCADE6.3.0/ros/src/DPrsStd/DPrsStd.cxx 2008-10-02 23:38:50.000000000 +0200 @@ -59,11 +59,12 @@ Standard_Boolean hasPlugin = Standard_False; TCollection_AsciiString PluginName ; if ( !plugin ) { - if ( casroot ) { - PluginName = TCollection_AsciiString (casroot); - PluginName+="/src/StdResource" ; - hasPlugin = Standard_True ; + if ( !casroot ) { + casroot = "/usr/share/OpenCASCADE"; } + PluginName = TCollection_AsciiString (casroot); + PluginName+="/src/StdResource" ; + hasPlugin = Standard_True ; } else { PluginName = TCollection_AsciiString (plugin); hasPlugin = Standard_True ; diff -uNr OpenCASCADE6.3.0-old/ros/src/Draw/Draw.cxx OpenCASCADE6.3.0/ros/src/Draw/Draw.cxx --- OpenCASCADE6.3.0-old/ros/src/Draw/Draw.cxx 2008-07-25 16:03:00.000000000 +0200 +++ OpenCASCADE6.3.0/ros/src/Draw/Draw.cxx 2008-10-02 23:38:50.000000000 +0200 @@ -253,8 +253,7 @@ #ifdef WNT ReadInitFile("ddefault"); #else - cout << " the CASROOT variable is mandatory to Run OpenCascade "< 0 ) { - CasRootString += "/src/UnitsAPI/Lexi_Expr.dat" ; - Units::LexiconFile(CasRootString.ToCString()); - } - else { - Standard_NoSuchObject::Raise("environment variable CSF_UnitsLexicon undefined"); + if (CasRootString.Length() == 0 ) { + CasRootString = "/usr/share/OpenCASCADE"; } + CasRootString += "/src/UnitsAPI/Lexi_Expr.dat" ; + Units::LexiconFile(CasRootString.ToCString()); } TCollection_AsciiString sunitsfile(env2.Value()); if( sunitsfile.Length() > 0 ) @@ -49,13 +47,11 @@ else { OSD_Environment CasRootEnv("CASROOT"); TCollection_AsciiString CasRootString(CasRootEnv.Value()); - if (CasRootString.Length() > 0 ) { - CasRootString += "/src/UnitsAPI/Units.dat"; - Units::UnitsFile(CasRootString.ToCString()); - } - else { - Standard_NoSuchObject::Raise("environment variable CSF_UnitsDefinition undefined"); + if (CasRootString.Length() == 0 ) { + CasRootString = "/usr/share/OpenCASCADE"; } + CasRootString += "/src/UnitsAPI/Units.dat"; + Units::UnitsFile(CasRootString.ToCString()); } switch (aSystemUnits) { case UnitsAPI_DEFAULT : diff -uNr OpenCASCADE6.3.0-old/ros/src/ViewerTest/ViewerTest.cxx OpenCASCADE6.3.0/ros/src/ViewerTest/ViewerTest.cxx --- OpenCASCADE6.3.0-old/ros/src/ViewerTest/ViewerTest.cxx 2008-08-15 15:57:34.000000000 +0200 +++ OpenCASCADE6.3.0/ros/src/ViewerTest/ViewerTest.cxx 2008-10-02 23:38:50.000000000 +0200 @@ -1566,11 +1566,12 @@ Standard_Boolean HasDefinition = Standard_False ; if ( !envir ) { casroot = getenv("CASROOT"); - if ( casroot ) { - VarName = TCollection_AsciiString (casroot); - VarName += "/src/Textures" ; - HasDefinition = Standard_True ; + if ( !casroot ) { + casroot = "/usr/share/OpenCASCADE"; } + VarName = TCollection_AsciiString (casroot); + VarName += "/src/Textures" ; + HasDefinition = Standard_True ; } else { VarName = TCollection_AsciiString (envir); HasDefinition = Standard_True ; diff -uNr OpenCASCADE6.3.0-old/ros/src/XmlLDrivers/XmlLDrivers_DocumentStorageDriver.cxx OpenCASCADE6.3.0/ros/src/XmlLDrivers/XmlLDrivers_DocumentStorageDriver.cxx --- OpenCASCADE6.3.0-old/ros/src/XmlLDrivers/XmlLDrivers_DocumentStorageDriver.cxx 2008-07-04 17:39:02.000000000 +0200 +++ OpenCASCADE6.3.0/ros/src/XmlLDrivers/XmlLDrivers_DocumentStorageDriver.cxx 2008-10-02 23:38:50.000000000 +0200 @@ -183,18 +183,11 @@ if (aResourceDir.IsEmpty()) { // now try by CASROOT aResourceDir = getenv (aCSFVariable[1]); - if ( !aResourceDir.IsEmpty() ) { - aResourceDir += "/src/XmlOcafResource" ; - aToSetCSFVariable = Standard_True; //CSF variable to be set later + if ( aResourceDir.IsEmpty() ) { + aResourceDir = "/usr/share/OpenCASCADE"; } -#ifdef DEB - else { - TCollection_ExtendedString aWarn = FAILSTR "Neither "; - aWarn = (aWarn + aCSFVariable[0] + ", nor " + aCSFVariable[1] - + " variables have been set"); - aMessageDriver->Write (aWarn.ToExtString()); - } -#endif + aResourceDir += "/src/XmlOcafResource" ; + aToSetCSFVariable = Standard_True; //CSF variable to be set later } if (!aResourceDir.IsEmpty()) { TCollection_AsciiString aResourceFileName = aResourceDir + "/XmlOcaf.xsd"; Index: opencascade/ros/src/Resource/Resource_Manager.cxx =================================================================== --- opencascade.orig/ros/src/Resource/Resource_Manager.cxx +++ opencascade/ros/src/Resource/Resource_Manager.cxx @@ -56,10 +56,16 @@ { Debug = (getenv("ResourceDebug") != NULL) ; - TCollection_AsciiString EnvVar, CSF_ = "CSF_" ; + TCollection_AsciiString EnvVar, DefaultVar = "/usr/share/OpenCASCADE/src/", CSF_ = "CSF_" ; + TCollection_AsciiString Name = aName ; TCollection_AsciiString Directory ; Standard_CString dir ; + if ( Name.IsEqual("STEP") || Name.IsEqual("IGES")) + DefaultVar += "XSTEPResource"; + else + DefaultVar += "StdResource"; + if ( getenv ("CSF_ResourceVerbose") != NULL ) myVerbose = Standard_True; @@ -69,9 +75,12 @@ Load(Directory,myName,myRefMap); } else + { if (myVerbose) cout << "Resource Manager Warning: Environment variable \"" << EnvVar - << "\" not set." << endl; + << "\" not set, using default value \"" << DefaultVar << "\"." << endl; + Load(DefaultVar,myName,myRefMap); + } EnvVar = CSF_ + aName + "UserDefaults" ; if ((dir = getenv (EnvVar.ToCString())) != NULL) {