1 diff -uNr OpenCASCADE6.3.0-old/ros/src/Aspect/Aspect_Driver.cxx OpenCASCADE6.3.0/ros/src/Aspect/Aspect_Driver.cxx
2 --- OpenCASCADE6.3.0-old/ros/src/Aspect/Aspect_Driver.cxx 2001-11-15 18:01:55.000000000 +0100
3 +++ OpenCASCADE6.3.0/ros/src/Aspect/Aspect_Driver.cxx 2008-10-02 23:38:50.000000000 +0200
5 fontdir = getenv("CSF_MDTVFontDirectory" );
7 casroot = getenv("CASROOT");
9 - TCollection_AsciiString CasRootString (casroot);
10 - CasRootString += "/src/FontMFT" ;
11 - CSF_MDTVFontDirectory = OSD_Environment(CasRootString.ToCString());
13 - cout << " CASROOT or CSF_MDTVFontDirectory are mandatory to use this fonctionnality " << endl;
14 - Standard_Failure::Raise ( "CSF_MDTVTexturesDirectory and CASROOT not setted " );
16 + casroot = "/usr/share/OpenCASCADE";
18 + TCollection_AsciiString CasRootString (casroot);
19 + CasRootString += "/src/FontMFT" ;
20 + CSF_MDTVFontDirectory = OSD_Environment(CasRootString.ToCString());
22 CSF_MDTVFontDirectory = OSD_Environment("CSF_MDTVFontDirectory");
24 diff -uNr OpenCASCADE6.3.0-old/ros/src/DPrsStd/DPrsStd.cxx OpenCASCADE6.3.0/ros/src/DPrsStd/DPrsStd.cxx
25 --- OpenCASCADE6.3.0-old/ros/src/DPrsStd/DPrsStd.cxx 2005-07-08 15:51:41.000000000 +0200
26 +++ OpenCASCADE6.3.0/ros/src/DPrsStd/DPrsStd.cxx 2008-10-02 23:38:50.000000000 +0200
28 Standard_Boolean hasPlugin = Standard_False;
29 TCollection_AsciiString PluginName ;
32 - PluginName = TCollection_AsciiString (casroot);
33 - PluginName+="/src/StdResource" ;
34 - hasPlugin = Standard_True ;
36 + casroot = "/usr/share/OpenCASCADE";
38 + PluginName = TCollection_AsciiString (casroot);
39 + PluginName+="/src/StdResource" ;
40 + hasPlugin = Standard_True ;
42 PluginName = TCollection_AsciiString (plugin);
43 hasPlugin = Standard_True ;
44 diff -uNr OpenCASCADE6.3.0-old/ros/src/Draw/Draw.cxx OpenCASCADE6.3.0/ros/src/Draw/Draw.cxx
45 --- OpenCASCADE6.3.0-old/ros/src/Draw/Draw.cxx 2008-07-25 16:03:00.000000000 +0200
46 +++ OpenCASCADE6.3.0/ros/src/Draw/Draw.cxx 2008-10-02 23:38:50.000000000 +0200
49 ReadInitFile("ddefault");
51 - cout << " the CASROOT variable is mandatory to Run OpenCascade "<<endl;
52 - cout << "No default file" << endl;
53 + ReadInitFile("/usr/share/OpenCASCADE/src/DrawResources/DrawDefault");
57 diff -uNr OpenCASCADE6.3.0-old/ros/src/Draw/Draw_PloadCommands.cxx OpenCASCADE6.3.0/ros/src/Draw/Draw_PloadCommands.cxx
58 --- OpenCASCADE6.3.0-old/ros/src/Draw/Draw_PloadCommands.cxx 2008-08-15 15:57:21.000000000 +0200
59 +++ OpenCASCADE6.3.0/ros/src/Draw/Draw_PloadCommands.cxx 2008-10-02 23:38:50.000000000 +0200
62 aPluginDir = getenv("CASROOT");
64 - if ( !aPluginDir.IsEmpty() ) {
65 - aPluginDir +="/src/DrawResources" ;
66 - aToSetCSFVariable = Standard_True; //CSF variable to be set later
68 - aResult = aDirFound = Standard_False;
69 - cout << FAILSTR "Neither " << aCSFVariable.ToCString() << ", nor CASROOT variables have been set" << endl;
70 + if ( aPluginDir.IsEmpty() ) {
71 + aPluginDir = "/usr/share/OpenCASCADE";
73 + aPluginDir +="/src/DrawResources" ;
74 + aToSetCSFVariable = Standard_True; //CSF variable to be set later
78 diff -uNr OpenCASCADE6.3.0-old/ros/src/DrawResources/DrawDefault OpenCASCADE6.3.0/ros/src/DrawResources/DrawDefault
79 --- OpenCASCADE6.3.0-old/ros/src/DrawResources/DrawDefault 2003-10-03 19:01:22.000000000 +0200
80 +++ OpenCASCADE6.3.0/ros/src/DrawResources/DrawDefault 2008-10-02 23:38:50.000000000 +0200
82 if { [info exists env(DRAWHOME) ] } {
83 set dir $env(DRAWHOME)
85 - if { [info exists env(CASROOT) ] } {
86 - set dir [file join $env(CASROOT) src DrawResources]
88 - puts " CASROOT is Mandatory to Run OpenCascade"
89 + if { ![info exists env(CASROOT) ] } {
90 + set env(CASROOT) "/usr/share/OpenCASCADE"
92 + set dir [file join $env(CASROOT) src DrawResources]
95 # san - 02/08/2002 - In Tcl8.3 it is no longer necessary to load Tix explicitly on WNT
96 diff -uNr OpenCASCADE6.3.0-old/ros/src/Graphic3d/Graphic3d_GraphicDevice.cxx OpenCASCADE6.3.0/ros/src/Graphic3d/Graphic3d_GraphicDevice.cxx
97 --- OpenCASCADE6.3.0-old/ros/src/Graphic3d/Graphic3d_GraphicDevice.cxx 2008-07-04 17:36:54.000000000 +0200
98 +++ OpenCASCADE6.3.0/ros/src/Graphic3d/Graphic3d_GraphicDevice.cxx 2008-10-02 23:38:50.000000000 +0200
102 glshr = getenv("CSF_GraphicShr");
103 - } else if (! BAD(casroot)) {
104 - glshr = (char *) malloc (128);
105 - /* Pour faire plaisir a Purify */
107 - strcat(glshr, casroot);
108 - struct utsname info;
111 - strcat(glshr,info.sysname);
112 -#if defined(__hpux) || defined(HPUX)
113 - strcat (glshr, "/lib/libTKOpenGl.sl");
115 - strcat (glshr, "/TKOpenGl.dll");
116 -#elif defined(__APPLE__)
117 - strcat (glshr, "/lib/libTKOpenGl.dylib");
119 - strcat (glshr, "/lib/libTKOpenGl.so");
121 -// printf("You have not defined CSF_GraphicShr, defaulting to %s",glshr);
124 - printf("You have not defined CSF_GraphicShr or CASROOT, aborting...");
125 - return Standard_False;
126 + glshr = "/usr/lib/libTKOpenGl.so";
130 diff -uNr OpenCASCADE6.3.0-old/ros/src/Graphic3d/Graphic3d_Texture1D.cxx OpenCASCADE6.3.0/ros/src/Graphic3d/Graphic3d_Texture1D.cxx
131 --- OpenCASCADE6.3.0-old/ros/src/Graphic3d/Graphic3d_Texture1D.cxx 2008-07-04 17:39:03.000000000 +0200
132 +++ OpenCASCADE6.3.0/ros/src/Graphic3d/Graphic3d_Texture1D.cxx 2008-10-02 23:38:50.000000000 +0200
134 Standard_Boolean HasDefinition = Standard_False ;
136 casroot = getenv("CASROOT");
138 - VarName = TCollection_AsciiString (casroot);
139 - VarName += "/src/Textures" ;
140 - HasDefinition = Standard_True ;
142 + casroot = "/usr/share/OpenCASCADE";
144 + VarName = TCollection_AsciiString (casroot);
145 + VarName += "/src/Textures" ;
146 + HasDefinition = Standard_True ;
148 VarName = TCollection_AsciiString (envir);
149 HasDefinition = Standard_True ;
150 diff -uNr OpenCASCADE6.3.0-old/ros/src/Graphic3d/Graphic3d_Texture2D.cxx OpenCASCADE6.3.0/ros/src/Graphic3d/Graphic3d_Texture2D.cxx
151 --- OpenCASCADE6.3.0-old/ros/src/Graphic3d/Graphic3d_Texture2D.cxx 2008-07-04 17:39:03.000000000 +0200
152 +++ OpenCASCADE6.3.0/ros/src/Graphic3d/Graphic3d_Texture2D.cxx 2008-10-02 23:38:50.000000000 +0200
154 Standard_Boolean HasDefinition = Standard_False ;
156 casroot = getenv("CASROOT");
158 - VarName = TCollection_AsciiString (casroot);
159 - VarName += "/src/Textures" ;
160 - HasDefinition = Standard_True ;
162 + casroot = "/usr/share/OpenCASCADE";
164 + VarName = TCollection_AsciiString (casroot);
165 + VarName += "/src/Textures" ;
166 + HasDefinition = Standard_True ;
168 VarName = TCollection_AsciiString (envir);
169 HasDefinition = Standard_True ;
170 diff -uNr OpenCASCADE6.3.0-old/ros/src/Graphic3d/Graphic3d_TextureEnv.cxx OpenCASCADE6.3.0/ros/src/Graphic3d/Graphic3d_TextureEnv.cxx
171 --- OpenCASCADE6.3.0-old/ros/src/Graphic3d/Graphic3d_TextureEnv.cxx 2008-07-04 17:39:03.000000000 +0200
172 +++ OpenCASCADE6.3.0/ros/src/Graphic3d/Graphic3d_TextureEnv.cxx 2008-10-02 23:38:50.000000000 +0200
174 Standard_Boolean HasDefinition = Standard_False ;
176 casroot = getenv("CASROOT");
178 - VarName = TCollection_AsciiString (casroot);
179 - VarName += "/src/Textures" ;
180 - HasDefinition = Standard_True ;
182 + casroot = "/usr/share/OpenCASCADE";
184 + VarName = TCollection_AsciiString (casroot);
185 + VarName += "/src/Textures" ;
186 + HasDefinition = Standard_True ;
188 VarName = TCollection_AsciiString (envir);
189 HasDefinition = Standard_True ;
190 diff -uNr OpenCASCADE6.3.0-old/ros/src/UnitsAPI/UnitsAPI.cxx OpenCASCADE6.3.0/ros/src/UnitsAPI/UnitsAPI.cxx
191 --- OpenCASCADE6.3.0-old/ros/src/UnitsAPI/UnitsAPI.cxx 2006-08-04 19:03:13.000000000 +0200
192 +++ OpenCASCADE6.3.0/ros/src/UnitsAPI/UnitsAPI.cxx 2008-10-02 23:38:50.000000000 +0200
195 OSD_Environment CasRootEnv("CASROOT");
196 TCollection_AsciiString CasRootString(CasRootEnv.Value());
197 - if (CasRootString.Length() > 0 ) {
198 - CasRootString += "/src/UnitsAPI/Lexi_Expr.dat" ;
199 - Units::LexiconFile(CasRootString.ToCString());
202 - Standard_NoSuchObject::Raise("environment variable CSF_UnitsLexicon undefined");
203 + if (CasRootString.Length() == 0 ) {
204 + CasRootString = "/usr/share/OpenCASCADE";
206 + CasRootString += "/src/UnitsAPI/Lexi_Expr.dat" ;
207 + Units::LexiconFile(CasRootString.ToCString());
209 TCollection_AsciiString sunitsfile(env2.Value());
210 if( sunitsfile.Length() > 0 )
213 OSD_Environment CasRootEnv("CASROOT");
214 TCollection_AsciiString CasRootString(CasRootEnv.Value());
215 - if (CasRootString.Length() > 0 ) {
216 - CasRootString += "/src/UnitsAPI/Units.dat";
217 - Units::UnitsFile(CasRootString.ToCString());
220 - Standard_NoSuchObject::Raise("environment variable CSF_UnitsDefinition undefined");
221 + if (CasRootString.Length() == 0 ) {
222 + CasRootString = "/usr/share/OpenCASCADE";
224 + CasRootString += "/src/UnitsAPI/Units.dat";
225 + Units::UnitsFile(CasRootString.ToCString());
227 switch (aSystemUnits) {
228 case UnitsAPI_DEFAULT :
229 diff -uNr OpenCASCADE6.3.0-old/ros/src/ViewerTest/ViewerTest.cxx OpenCASCADE6.3.0/ros/src/ViewerTest/ViewerTest.cxx
230 --- OpenCASCADE6.3.0-old/ros/src/ViewerTest/ViewerTest.cxx 2008-08-15 15:57:34.000000000 +0200
231 +++ OpenCASCADE6.3.0/ros/src/ViewerTest/ViewerTest.cxx 2008-10-02 23:38:50.000000000 +0200
232 @@ -1566,11 +1566,12 @@
233 Standard_Boolean HasDefinition = Standard_False ;
235 casroot = getenv("CASROOT");
237 - VarName = TCollection_AsciiString (casroot);
238 - VarName += "/src/Textures" ;
239 - HasDefinition = Standard_True ;
241 + casroot = "/usr/share/OpenCASCADE";
243 + VarName = TCollection_AsciiString (casroot);
244 + VarName += "/src/Textures" ;
245 + HasDefinition = Standard_True ;
247 VarName = TCollection_AsciiString (envir);
248 HasDefinition = Standard_True ;
249 diff -uNr OpenCASCADE6.3.0-old/ros/src/XmlLDrivers/XmlLDrivers_DocumentStorageDriver.cxx OpenCASCADE6.3.0/ros/src/XmlLDrivers/XmlLDrivers_DocumentStorageDriver.cxx
250 --- OpenCASCADE6.3.0-old/ros/src/XmlLDrivers/XmlLDrivers_DocumentStorageDriver.cxx 2008-07-04 17:39:02.000000000 +0200
251 +++ OpenCASCADE6.3.0/ros/src/XmlLDrivers/XmlLDrivers_DocumentStorageDriver.cxx 2008-10-02 23:38:50.000000000 +0200
252 @@ -183,18 +183,11 @@
253 if (aResourceDir.IsEmpty()) {
254 // now try by CASROOT
255 aResourceDir = getenv (aCSFVariable[1]);
256 - if ( !aResourceDir.IsEmpty() ) {
257 - aResourceDir += "/src/XmlOcafResource" ;
258 - aToSetCSFVariable = Standard_True; //CSF variable to be set later
259 + if ( aResourceDir.IsEmpty() ) {
260 + aResourceDir = "/usr/share/OpenCASCADE";
264 - TCollection_ExtendedString aWarn = FAILSTR "Neither ";
265 - aWarn = (aWarn + aCSFVariable[0] + ", nor " + aCSFVariable[1]
266 - + " variables have been set");
267 - aMessageDriver->Write (aWarn.ToExtString());
270 + aResourceDir += "/src/XmlOcafResource" ;
271 + aToSetCSFVariable = Standard_True; //CSF variable to be set later
273 if (!aResourceDir.IsEmpty()) {
274 TCollection_AsciiString aResourceFileName = aResourceDir + "/XmlOcaf.xsd";
275 Index: opencascade/ros/src/Resource/Resource_Manager.cxx
276 ===================================================================
277 --- opencascade.orig/ros/src/Resource/Resource_Manager.cxx
278 +++ opencascade/ros/src/Resource/Resource_Manager.cxx
281 Debug = (getenv("ResourceDebug") != NULL) ;
283 - TCollection_AsciiString EnvVar, CSF_ = "CSF_" ;
284 + TCollection_AsciiString EnvVar, DefaultVar = "/usr/share/OpenCASCADE/src/", CSF_ = "CSF_" ;
285 + TCollection_AsciiString Name = aName ;
286 TCollection_AsciiString Directory ;
287 Standard_CString dir ;
289 + if ( Name.IsEqual("STEP") || Name.IsEqual("IGES"))
290 + DefaultVar += "XSTEPResource";
292 + DefaultVar += "StdResource";
294 if ( getenv ("CSF_ResourceVerbose") != NULL )
295 myVerbose = Standard_True;
298 Load(Directory,myName,myRefMap);
303 cout << "Resource Manager Warning: Environment variable \"" << EnvVar
304 - << "\" not set." << endl;
305 + << "\" not set, using default value \"" << DefaultVar << "\"." << endl;
306 + Load(DefaultVar,myName,myRefMap);
309 EnvVar = CSF_ + aName + "UserDefaults" ;
310 if ((dir = getenv (EnvVar.ToCString())) != NULL) {