0024002: Overall code and build procedure refactoring -- automatic

Automatic upgrade of OCCT code by command "occt_upgrade . -nocdl":
- WOK-generated header files from inc and sources from drv are moved to src
- CDL files removed
- All packages are converted to nocdlpack

src/UTL/FILES

@@ -0,0 +1,2 @@
+UTL.cxx
+UTL.hxx

src/UTL/UTL.cdl

@@ -1,65 +0,0 @@
--- Created on: 1997-11-21
--- Created by: Mister rmi
--- Copyright (c) 1997-1999 Matra Datavision
--- Copyright (c) 1999-2014 OPEN CASCADE SAS
---
--- This file is part of Open CASCADE Technology software library.
---
--- This library is free software; you can redistribute it and/or modify it under
--- the terms of the GNU Lesser General Public License version 2.1 as published
--- by the Free Software Foundation, with special exception defined in the file
--- OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
--- distribution for complete text of the license and disclaimer of any warranty.
---
--- Alternatively, this file may be used under the terms of Open CASCADE
--- commercial license or contractual agreement.
-
-package UTL
-uses Resource, TCollection,Storage, OSD
-is
-
-    xgetenv(aCString: CString from Standard)
-    returns ExtendedString from TCollection;
-    
-    OpenFile(aFile: in out BaseDriver from Storage; aName: ExtendedString from TCollection; aMode : OpenMode from Storage)
-    returns Error from Storage;
-    
-    AddToUserInfo(aData: Data from Storage; anInfo: ExtendedString from TCollection);
-    
-    Path(aFileName: ExtendedString from TCollection) returns Path from OSD;
-
-    Disk(aPath: Path from OSD) returns ExtendedString from TCollection;
-    Trek(aPath: Path from OSD) returns ExtendedString from TCollection;
-    Name(aPath: Path from OSD) returns ExtendedString from TCollection;
-    Extension(aPath: Path from OSD) returns ExtendedString from TCollection;
-
-    FileIterator(aPath: Path from OSD; aMask:ExtendedString from TCollection) returns FileIterator from OSD;
-   
-    Extension(aFileName: ExtendedString from TCollection) returns ExtendedString from TCollection;
-    
-    LocalHost returns ExtendedString from TCollection;
-    
-    ExtendedString(anAsciiString: AsciiString from TCollection) 
-    returns ExtendedString from TCollection;
-
-
-    GUID(anXString: ExtendedString from TCollection)
-    returns GUID from Standard;
-
-    Find(aResourceManager: Manager from Resource; aResourceName: ExtendedString from TCollection)
-    returns Boolean from Standard;
-    
-    Value(aResourceManager: Manager from Resource; aResourceName: ExtendedString from TCollection)
-    returns ExtendedString from TCollection;
-    
-
-    IntegerValue(anExtendedString: ExtendedString from TCollection)
-    returns Integer from Standard;
-    
-    CString(anExtendedString: ExtendedString from TCollection)
-    returns CString from Standard;
-
-    IsReadOnly(aFileName: ExtendedString from TCollection)
-    returns Boolean from Standard;
-    
-end UTL;

src/UTL/UTL.cxx

@@ -14,17 +14,22 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#include <UTL.ixx>
+
+#include <OSD_Environment.hxx>
+#include <OSD_File.hxx>
+#include <OSD_FileIterator.hxx>
 #include <OSD_Host.hxx>
 #include <OSD_Path.hxx>
-#include <TCollection_ExtendedString.hxx>
-#include <TCollection_AsciiString.hxx>
-#include <Resource_Unicode.hxx>
-#include <OSD_Environment.hxx>
-#include <OSD_FileIterator.hxx>
-#include <OSD_File.hxx>
 #include <OSD_Protection.hxx>
 #include <OSD_SingleProtection.hxx>
+#include <Resource_Manager.hxx>
+#include <Resource_Unicode.hxx>
+#include <Standard_GUID.hxx>
+#include <Storage_BaseDriver.hxx>
+#include <Storage_Data.hxx>
+#include <TCollection_AsciiString.hxx>
+#include <TCollection_ExtendedString.hxx>
+#include <UTL.hxx>
 
 TCollection_ExtendedString UTL::xgetenv(const Standard_CString aCString) {
   TCollection_ExtendedString x;

src/UTL/UTL.hxx

@@ -0,0 +1,106 @@
+// Created on: 1997-11-21
+// Created by: Mister rmi
+// Copyright (c) 1997-1999 Matra Datavision
+// Copyright (c) 1999-2014 OPEN CASCADE SAS
+//
+// This file is part of Open CASCADE Technology software library.
+//
+// This library is free software; you can redistribute it and/or modify it under
+// the terms of the GNU Lesser General Public License version 2.1 as published
+// by the Free Software Foundation, with special exception defined in the file
+// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
+// distribution for complete text of the license and disclaimer of any warranty.
+//
+// Alternatively, this file may be used under the terms of Open CASCADE
+// commercial license or contractual agreement.
+
+#ifndef _UTL_HeaderFile
+#define _UTL_HeaderFile
+
+#include <Standard.hxx>
+#include <Standard_DefineAlloc.hxx>
+#include <Standard_Handle.hxx>
+
+#include <Standard_CString.hxx>
+#include <Storage_Error.hxx>
+#include <Storage_OpenMode.hxx>
+#include <Standard_Boolean.hxx>
+#include <Standard_Integer.hxx>
+class TCollection_ExtendedString;
+class Storage_BaseDriver;
+class Storage_Data;
+class OSD_Path;
+class OSD_FileIterator;
+class TCollection_AsciiString;
+class Standard_GUID;
+class Resource_Manager;
+
+
+
+class UTL 
+{
+public:
+
+  DEFINE_STANDARD_ALLOC
+
+  
+  Standard_EXPORT static TCollection_ExtendedString xgetenv (const Standard_CString aCString);
+  
+  Standard_EXPORT static Storage_Error OpenFile (Storage_BaseDriver& aFile, const TCollection_ExtendedString& aName, const Storage_OpenMode aMode);
+  
+  Standard_EXPORT static void AddToUserInfo (const Handle(Storage_Data)& aData, const TCollection_ExtendedString& anInfo);
+  
+  Standard_EXPORT static OSD_Path Path (const TCollection_ExtendedString& aFileName);
+  
+  Standard_EXPORT static TCollection_ExtendedString Disk (const OSD_Path& aPath);
+  
+  Standard_EXPORT static TCollection_ExtendedString Trek (const OSD_Path& aPath);
+  
+  Standard_EXPORT static TCollection_ExtendedString Name (const OSD_Path& aPath);
+  
+  Standard_EXPORT static TCollection_ExtendedString Extension (const OSD_Path& aPath);
+  
+  Standard_EXPORT static OSD_FileIterator FileIterator (const OSD_Path& aPath, const TCollection_ExtendedString& aMask);
+  
+  Standard_EXPORT static TCollection_ExtendedString Extension (const TCollection_ExtendedString& aFileName);
+  
+  Standard_EXPORT static TCollection_ExtendedString LocalHost();
+  
+  Standard_EXPORT static TCollection_ExtendedString ExtendedString (const TCollection_AsciiString& anAsciiString);
+  
+  Standard_EXPORT static Standard_GUID GUID (const TCollection_ExtendedString& anXString);
+  
+  Standard_EXPORT static Standard_Boolean Find (const Handle(Resource_Manager)& aResourceManager, const TCollection_ExtendedString& aResourceName);
+  
+  Standard_EXPORT static TCollection_ExtendedString Value (const Handle(Resource_Manager)& aResourceManager, const TCollection_ExtendedString& aResourceName);
+  
+  Standard_EXPORT static Standard_Integer IntegerValue (const TCollection_ExtendedString& anExtendedString);
+  
+  Standard_EXPORT static Standard_CString CString (const TCollection_ExtendedString& anExtendedString);
+  
+  Standard_EXPORT static Standard_Boolean IsReadOnly (const TCollection_ExtendedString& aFileName);
+
+
+
+
+protected:
+
+
+
+
+
+private:
+
+
+
+
+
+};
+
+
+
+
+
+
+
+#endif // _UTL_HeaderFile