From: Debian Science Maintainers Date: Fri, 6 May 2011 13:52:41 +0000 (+0100) Subject: casroot X-Git-Tag: archive/raspbian/7.3.0+dfsg1-4+rpi1~1^2^2~9 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=81297d38171d266366bc8485aca3802e7ab2e4c4;p=opencascade.git 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 46597e435..f6fe92ef2 100644 --- 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 625ccdad9..b5fa5e97c 100644 --- 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 b9ca5e765..475ea48f9 100644 --- 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 960cc7575..1c261da53 100644 --- 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 124ed18d6..3b6b4d3f7 100644 --- 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 939861206..48eba6aaa 100644 --- 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 1e2e329be..491377257 100644 --- 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 1b13cf359..84cf41eb4 100644 --- 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 229dc8f71..17aa6f4de 100644 --- 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 ad9b12307..4670c91e9 100644 --- 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 b08ab311c..e016bc130 100644 --- 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 5ecfa22e1..444ec9f1e 100644 --- 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 f664204d0..62bcf04fc 100644 --- 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";