casroot

This patch allows using OpenCascade without setting any environment variable.

Gbp-Pq: Name casroot.patch

diff --git a/ros/src/Aspect/Aspect_Driver.cxx b/ros/src/Aspect/Aspect_Driver.cxx
index 46597e435bd072ff3f4ad68b5111c65f8b082ac1..f6fe92ef2b4cfe9ca8b13e84082901e86e0a818e 100644 (file)
--- a/ros/src/Aspect/Aspect_Driver.cxx
+++ b/ros/src/Aspect/Aspect_Driver.cxx
@@ -35,14 +35,12 @@ Aspect_Driver::Aspect_Driver () {
   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/6.5.0";
     }
+    TCollection_AsciiString CasRootString (casroot);
+    CasRootString += "/src/FontMFT" ; 
+    CSF_MDTVFontDirectory = OSD_Environment(CasRootString.ToCString());
   } else {
     CSF_MDTVFontDirectory = OSD_Environment("CSF_MDTVFontDirectory");
   }

diff --git a/ros/src/DPrsStd/DPrsStd.cxx b/ros/src/DPrsStd/DPrsStd.cxx
index 625ccdad987b5e94b4dbe0eba6925792492b3a15..b5fa5e97c0e8f36b04ec164c32479caab597c973 100644 (file)
--- a/ros/src/DPrsStd/DPrsStd.cxx
+++ b/ros/src/DPrsStd/DPrsStd.cxx
@@ -60,11 +60,12 @@ static Standard_Boolean FoundCAFPlugin () {
   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/6.5.0";
     }
+    PluginName = TCollection_AsciiString (casroot);
+    PluginName+="/src/StdResource" ;
+    hasPlugin = Standard_True ;
   } else {
     PluginName = TCollection_AsciiString (plugin);
     hasPlugin = Standard_True ;

diff --git a/ros/src/Draw/Draw.cxx b/ros/src/Draw/Draw.cxx
index b9ca5e765e79e232cbe3aaf6cb2a3a315e82c3db..475ea48f9f4486ce1d9b3410b6bdeaea00366fb9 100644 (file)
--- a/ros/src/Draw/Draw.cxx
+++ b/ros/src/Draw/Draw.cxx
@@ -270,8 +270,7 @@ void Draw_Appli(Standard_Integer argc, char** argv,const FDraw_InitAppli Draw_In
 #ifdef WNT
          ReadInitFile("ddefault");
 #else
-         cout << " the CASROOT variable is mandatory to Run OpenCascade "<< endl;
-         cout << "No default file" << endl;
+         ReadInitFile("/usr/share/opencascade/6.5.0/src/DrawResources/DrawDefault");
 #endif
     }
     else

diff --git a/ros/src/Draw/Draw_PloadCommands.cxx b/ros/src/Draw/Draw_PloadCommands.cxx
index 960cc7575fb3367c1c44e6e5f11d676e6eadce2c..1c261da5302d66ff604d9439ac6e12e7851b9c75 100644 (file)
--- a/ros/src/Draw/Draw_PloadCommands.cxx
+++ b/ros/src/Draw/Draw_PloadCommands.cxx
@@ -54,13 +54,11 @@ static Standard_Boolean FindPluginFile (TCollection_AsciiString& thePluginName,
     // now try by CASROOT
     aPluginDir = getenv("CASROOT");
 
-    if ( !aPluginDir.IsEmpty() ) {
-      aPluginDir +="/src/DrawResources" ;
-      aToSetCSFVariable = Standard_True; //CSF variable to be set later
-    } else {
-      aResult = aDirFound = Standard_False;
-      cout << FAILSTR "Neither " << aCSFVariable.ToCString() << ", nor CASROOT variables have been set" << endl;
+    if ( aPluginDir.IsEmpty() ) {
+      aPluginDir = "/usr/share/opencascade/6.5.0";
     }
+    aPluginDir +="/src/DrawResources" ;
+    aToSetCSFVariable = Standard_True; //CSF variable to be set later
   }
   
   if (aDirFound) {

diff --git a/ros/src/DrawResources/DrawDefault b/ros/src/DrawResources/DrawDefault
index 124ed18d656c21dc3bd65ca1e385a831b4ba37f0..3b6b4d3f77f802ea2192dc891d7fb2d767c2daf8 100644 (file)
--- a/ros/src/DrawResources/DrawDefault
+++ b/ros/src/DrawResources/DrawDefault
@@ -8,11 +8,10 @@ set dir ""
 if { [info exists env(DRAWHOME) ] } { 
   set dir $env(DRAWHOME)  
 } else {
-    if { [info exists env(CASROOT) ] } {
-  set dir [file join $env(CASROOT) src DrawResources]
-    } else {
-  puts " CASROOT is Mandatory to Run OpenCascade"
+    if { ![info exists env(CASROOT) ] } {
+      set env(CASROOT) "/usr/share/opencascade/6.5.0"
     }
+  set dir [file join $env(CASROOT) src DrawResources]
 }
 
 # san - 02/08/2002 - In Tcl8.3 it is no longer necessary to load Tix explicitly on WNT

diff --git a/ros/src/Graphic3d/Graphic3d_GraphicDevice.cxx b/ros/src/Graphic3d/Graphic3d_GraphicDevice.cxx
index 939861206b7b78ed4fff2fcbd578d1e31b659ea3..48eba6aaa01fb76288ea53b3db8a415cf3860ae0 100644 (file)
--- a/ros/src/Graphic3d/Graphic3d_GraphicDevice.cxx
+++ b/ros/src/Graphic3d/Graphic3d_GraphicDevice.cxx
@@ -205,27 +205,8 @@ Standard_Boolean Graphic3d_GraphicDevice::ShrIsDefined (Standard_CString& aShr)
 
   if (! BAD(glso)) {
     glshr = getenv("CSF_GraphicShr");
-  } else if (! BAD(casroot)) {
-    TCollection_AsciiString buffString(casroot);
-    struct utsname info; 
-    uname (&info);
-    buffString = buffString + "/";
-    buffString = buffString + info.sysname;
-#if defined(__hpux) || defined(HPUX)
-    buffString = buffString + "/lib/libTKOpenGl.sl";
-#elif defined(WNT)
-    buffString = buffString + "/TKOpenGl.dll";
-#elif defined(__APPLE__)
-    buffString = buffString + "/lib/libTKOpenGl.dylib";
-#else
-    buffString = buffString + "/lib/libTKOpenGl.so";
-#endif
-    glshr = (char *) malloc (buffString.Length() + 1);
-    memcpy(glshr, buffString.ToCString(), buffString.Length() + 1);
   } else {
-    aShr = NULL;
-    printf("You have not defined CSF_GraphicShr or CASROOT, aborting...");
-    return Standard_False;
+    glshr = "/usr/lib/libTKOpenGl-6.5.0.so";
   }
  
  aShr = glshr;

diff --git a/ros/src/Graphic3d/Graphic3d_Texture1D.cxx b/ros/src/Graphic3d/Graphic3d_Texture1D.cxx
index 1e2e329be5a0e5ddff053bd34694d7719743f1a0..4913772571fdebb57d0f9b9b956f7ef16f2e0358 100644 (file)
--- a/ros/src/Graphic3d/Graphic3d_Texture1D.cxx
+++ b/ros/src/Graphic3d/Graphic3d_Texture1D.cxx
@@ -32,11 +32,12 @@ static TCollection_AsciiString GetEnvir ( ) {
     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/6.5.0";
       }
+      VarName = TCollection_AsciiString  (casroot);
+      VarName += "/src/Textures" ;
+      HasDefinition = Standard_True ;
     } else {
       VarName = TCollection_AsciiString  (envir);
       HasDefinition = Standard_True ;

diff --git a/ros/src/Graphic3d/Graphic3d_Texture2D.cxx b/ros/src/Graphic3d/Graphic3d_Texture2D.cxx
index 1b13cf35965bb8fbe6ea226c8f24f662b69505cc..84cf41eb459fab2ebf5e3b7f8a5c8c268b9c1534 100644 (file)
--- a/ros/src/Graphic3d/Graphic3d_Texture2D.cxx
+++ b/ros/src/Graphic3d/Graphic3d_Texture2D.cxx
@@ -28,11 +28,12 @@ static TCollection_AsciiString GetEnvir ( ) {
     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/6.5.0";
       }
+      VarName = TCollection_AsciiString  (casroot);
+      VarName += "/src/Textures" ;
+      HasDefinition = Standard_True ;
     } else {
       VarName = TCollection_AsciiString  (envir);
       HasDefinition = Standard_True ;

diff --git a/ros/src/Graphic3d/Graphic3d_TextureEnv.cxx b/ros/src/Graphic3d/Graphic3d_TextureEnv.cxx
index 229dc8f71efa10637d8dd088bb79083528daecd9..17aa6f4de8307bc7ea260ce03ff9dc441e530286 100644 (file)
--- a/ros/src/Graphic3d/Graphic3d_TextureEnv.cxx
+++ b/ros/src/Graphic3d/Graphic3d_TextureEnv.cxx
@@ -29,11 +29,12 @@ static TCollection_AsciiString GetEnvir ( ) {
     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/6.5.0";
       }
+      VarName = TCollection_AsciiString  (casroot);
+      VarName += "/src/Textures" ;
+      HasDefinition = Standard_True ;
     } else {
       VarName = TCollection_AsciiString  (envir);
       HasDefinition = Standard_True ;

diff --git a/ros/src/Resource/Resource_Manager.cxx b/ros/src/Resource/Resource_Manager.cxx
index ad9b123075ff6d19c1089eea73acc2b7fc9b001e..4670c91e97c0888bda7683af5a48f63c769b3254 100644 (file)
--- a/ros/src/Resource/Resource_Manager.cxx
+++ b/ros/src/Resource/Resource_Manager.cxx
@@ -56,10 +56,16 @@ Resource_Manager::Resource_Manager(const Standard_CString aName,
 {
   Debug = (getenv("ResourceDebug") != NULL) ;
 
-  TCollection_AsciiString EnvVar, CSF_ = "CSF_" ;
+  TCollection_AsciiString EnvVar, DefaultVar = "/usr/share/opencascade/6.5.0/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 @@ Resource_Manager::Resource_Manager(const Standard_CString aName,
     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) {

diff --git a/ros/src/UnitsAPI/UnitsAPI.cxx b/ros/src/UnitsAPI/UnitsAPI.cxx
index b08ab311cf1e6bced5b9d865a62406f459f67bd5..e016bc13038099ffcd87cf56c4fe511baa9cb240 100644 (file)
--- a/ros/src/UnitsAPI/UnitsAPI.cxx
+++ b/ros/src/UnitsAPI/UnitsAPI.cxx
@@ -35,13 +35,11 @@ void UnitsAPI::CheckLoading (const UnitsAPI_SystemUnits aSystemUnits)
     else {
       OSD_Environment CasRootEnv("CASROOT");
       TCollection_AsciiString CasRootString(CasRootEnv.Value());
-      if (CasRootString.Length() > 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/6.5.0";
       }
+      CasRootString += "/src/UnitsAPI/Lexi_Expr.dat" ;
+      Units::LexiconFile(CasRootString.ToCString());
     }
     TCollection_AsciiString sunitsfile(env2.Value());
     if( sunitsfile.Length() > 0 )
@@ -49,13 +47,11 @@ void UnitsAPI::CheckLoading (const UnitsAPI_SystemUnits aSystemUnits)
     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/6.5.0";
       }
+      CasRootString += "/src/UnitsAPI/Units.dat";
+      Units::UnitsFile(CasRootString.ToCString());
     }  
     switch (aSystemUnits) {
       case UnitsAPI_DEFAULT :

diff --git a/ros/src/ViewerTest/ViewerTest.cxx b/ros/src/ViewerTest/ViewerTest.cxx
index 5ecfa22e1ace812c83aea84d455f1c8d92182c66..444ec9f1edf7c0d05d28d427fbdcc0e83ea611f9 100644 (file)
--- a/ros/src/ViewerTest/ViewerTest.cxx
+++ b/ros/src/ViewerTest/ViewerTest.cxx
@@ -1601,11 +1601,12 @@ static TCollection_AsciiString GetEnvir (Draw_Interpretor& di) {
     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/6.5.0";
       }
+      VarName = TCollection_AsciiString  (casroot);
+      VarName += "/src/Textures" ;
+      HasDefinition = Standard_True ;
     } else {
       VarName = TCollection_AsciiString  (envir);
       HasDefinition = Standard_True ;

diff --git a/ros/src/XmlLDrivers/XmlLDrivers_DocumentStorageDriver.cxx b/ros/src/XmlLDrivers/XmlLDrivers_DocumentStorageDriver.cxx
index f664204d0bfe9c35db71d7b0f1511302e6586133..62bcf04fcb3e3a132db474bd7fe8c5ec9071bbca 100644 (file)
--- a/ros/src/XmlLDrivers/XmlLDrivers_DocumentStorageDriver.cxx
+++ b/ros/src/XmlLDrivers/XmlLDrivers_DocumentStorageDriver.cxx
@@ -181,18 +181,11 @@ Standard_Boolean XmlLDrivers_DocumentStorageDriver::WriteToDomDocument
   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/6.5.0";
     }
-#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";