mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
'rebrand' OSspecific Unix -> POSIX
- change name of environment variable from $WM_OS -> $WM_OSTYPE as a better description
This commit is contained in:
9
README
9
README
@ -14,11 +14,10 @@
|
||||
General Public License terms under which you can copy the files.
|
||||
|
||||
* System requirements
|
||||
OpenFOAM is developed and tested on Linux, but should work with other Unix
|
||||
style systems. To check your system setup, execute the foamSystemCheck script
|
||||
in the bin/ directory of the OpenFOAM installation. If no problems are
|
||||
reported, proceed to "3. Installation"; otherwise contact your system
|
||||
administrator.
|
||||
OpenFOAM is developed and tested on Linux, but should work with other POSIX
|
||||
systems. To check your system setup, execute the foamSystemCheck script in
|
||||
the bin/ directory of the OpenFOAM installation. If no problems are reported,
|
||||
proceed to "3. Installation"; otherwise contact your system administrator.
|
||||
|
||||
If the user wishes to run OpenFOAM in 32/64-bit mode they should consult the
|
||||
section "Running OpenFOAM in 32-bit mode".
|
||||
|
||||
2
applications/test/POSIX/Make/files
Normal file
2
applications/test/POSIX/Make/files
Normal file
@ -0,0 +1,2 @@
|
||||
POSIXTest.C
|
||||
EXE = $(FOAM_USER_APPBIN)/POSIXTest
|
||||
@ -1,2 +0,0 @@
|
||||
UnixTest.C
|
||||
EXE = $(FOAM_USER_APPBIN)/UnixTest
|
||||
@ -79,8 +79,8 @@ export WM_THIRD_PARTY_DIR=$WM_PROJECT_INST_DIR/ThirdParty
|
||||
|
||||
# Operating System/Platform
|
||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
# WM_OS = Unix | ????
|
||||
: ${WM_OS:=Unix}; export WM_OS
|
||||
# WM_OSTYPE = POSIX | ????
|
||||
: ${WM_OSTYPE:=POSIX}; export WM_OSTYPE
|
||||
|
||||
|
||||
# Compiler: set to Gcc, Gcc43 or Icc (for Intel's icc)
|
||||
|
||||
@ -195,6 +195,7 @@ DebugSwitches
|
||||
PatchToPatchInterpolation 0;
|
||||
Phi 0;
|
||||
PointEdgeWave 0;
|
||||
POSIX 0;
|
||||
Prandtl 0;
|
||||
PrimitivePatch 0;
|
||||
Pstream 0;
|
||||
@ -249,7 +250,6 @@ DebugSwitches
|
||||
ThermoParcel<basicThermoParcel> 0;
|
||||
UMIST 0;
|
||||
UMISTV 0;
|
||||
Unix 0;
|
||||
UpwindFitData<cubicUpwindFitPolynomial> 0;
|
||||
UpwindFitData<quadraticLinearUpwindFitPolynomial> 0;
|
||||
UpwindFitData<quadraticUpwindFitPolynomial> 0;
|
||||
|
||||
@ -73,8 +73,8 @@ setenv WM_THIRD_PARTY_DIR $WM_PROJECT_INST_DIR/ThirdParty
|
||||
|
||||
# Operating System/Platform
|
||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
# WM_OS = Unix | ????
|
||||
if ( ! $?WM_OS ) setenv WM_OS Unix
|
||||
# WM_OSTYPE = POSIX | ????
|
||||
if ( ! $?WM_OSTYPE ) setenv WM_OSTYPE POSIX
|
||||
|
||||
|
||||
# Compiler: set to Gcc, Gcc43 or Icc (for Intel's icc)
|
||||
|
||||
@ -6,10 +6,10 @@ set -x
|
||||
wmakePrintBuild -check || /bin/rm -f OpenFOAM/Make/$WM_OPTIONS/global.? 2>/dev/null
|
||||
|
||||
wmakeLnInclude -f OpenFOAM
|
||||
wmakeLnInclude -f OSspecific/$WM_OS
|
||||
wmakeLnInclude -f OSspecific/$WM_OSTYPE
|
||||
Pstream/Allwmake
|
||||
|
||||
wmake libo OSspecific/$WM_OS
|
||||
wmake libo OSspecific/$WM_OSTYPE
|
||||
wmake libso OpenFOAM
|
||||
|
||||
wmake libso lagrangian/basic
|
||||
|
||||
@ -5,14 +5,14 @@ signals/sigQuit.C
|
||||
regExp.C
|
||||
timer.C
|
||||
fileStat.C
|
||||
Unix.C
|
||||
POSIX.C
|
||||
cpuTime/cpuTime.C
|
||||
clockTime/clockTime.C
|
||||
|
||||
#ifndef SunOS64
|
||||
printStack.C
|
||||
#else
|
||||
#ifdef SunOS64
|
||||
dummyPrintStack.C
|
||||
#else
|
||||
printStack.C
|
||||
#endif
|
||||
|
||||
LIB = $(FOAM_LIBBIN)/libOSspecific
|
||||
@ -23,7 +23,7 @@ License
|
||||
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
|
||||
Description
|
||||
UNIX versions of the functions declared in OSspecific.H
|
||||
POSIX versions of the functions declared in OSspecific.H
|
||||
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
@ -32,7 +32,7 @@ Description
|
||||
#endif
|
||||
|
||||
#include "OSspecific.H"
|
||||
#include "Unix.H"
|
||||
#include "POSIX.H"
|
||||
#include "foamVersion.H"
|
||||
#include "fileName.H"
|
||||
#include "fileStat.H"
|
||||
@ -56,7 +56,7 @@ Description
|
||||
|
||||
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
|
||||
|
||||
defineTypeNameAndDebug(Foam::Unix, 0);
|
||||
defineTypeNameAndDebug(Foam::POSIX, 0);
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
@ -536,7 +536,7 @@ Foam::fileNameList Foam::readDir
|
||||
// also used as increment if initial size found to be insufficient
|
||||
static const int maxNnames = 100;
|
||||
|
||||
if (Unix::debug)
|
||||
if (POSIX::debug)
|
||||
{
|
||||
Info<< "readDir(const fileName&, const fileType, const bool filtergz)"
|
||||
<< " : reading directory " << directory << endl;
|
||||
@ -557,7 +557,7 @@ Foam::fileNameList Foam::readDir
|
||||
{
|
||||
dirEntries.setSize(0);
|
||||
|
||||
if (Unix::debug)
|
||||
if (POSIX::debug)
|
||||
{
|
||||
Info<< "readDir(const fileName&, const fileType, "
|
||||
"const bool filtergz) : cannot open directory "
|
||||
@ -690,7 +690,7 @@ bool Foam::cp(const fileName& src, const fileName& dest)
|
||||
fileNameList contents = readDir(src, fileName::FILE, false);
|
||||
forAll(contents, i)
|
||||
{
|
||||
if (Unix::debug)
|
||||
if (POSIX::debug)
|
||||
{
|
||||
Info<< "Copying : " << src/contents[i]
|
||||
<< " to " << destFile/contents[i] << endl;
|
||||
@ -704,7 +704,7 @@ bool Foam::cp(const fileName& src, const fileName& dest)
|
||||
fileNameList subdirs = readDir(src, fileName::DIRECTORY);
|
||||
forAll(subdirs, i)
|
||||
{
|
||||
if (Unix::debug)
|
||||
if (POSIX::debug)
|
||||
{
|
||||
Info<< "Copying : " << src/subdirs[i]
|
||||
<< " to " << destFile << endl;
|
||||
@ -722,7 +722,7 @@ bool Foam::cp(const fileName& src, const fileName& dest)
|
||||
// Create a softlink. dst should not exist. Returns true if successful.
|
||||
bool Foam::ln(const fileName& src, const fileName& dst)
|
||||
{
|
||||
if (Unix::debug)
|
||||
if (POSIX::debug)
|
||||
{
|
||||
Info<< "Create softlink from : " << src << " to " << dst
|
||||
<< endl;
|
||||
@ -759,7 +759,7 @@ bool Foam::ln(const fileName& src, const fileName& dst)
|
||||
// Rename srcFile dstFile
|
||||
bool Foam::mv(const fileName& srcFile, const fileName& dstFile)
|
||||
{
|
||||
if (Unix::debug)
|
||||
if (POSIX::debug)
|
||||
{
|
||||
Info<< "Move : " << srcFile << " to " << dstFile << endl;
|
||||
}
|
||||
@ -784,7 +784,7 @@ bool Foam::mv(const fileName& srcFile, const fileName& dstFile)
|
||||
// Remove a file returning true if successful otherwise false
|
||||
bool Foam::rm(const fileName& file)
|
||||
{
|
||||
if (Unix::debug)
|
||||
if (POSIX::debug)
|
||||
{
|
||||
Info<< "Removing : " << file << endl;
|
||||
}
|
||||
@ -804,7 +804,7 @@ bool Foam::rm(const fileName& file)
|
||||
// Remove a dirctory and its contents
|
||||
bool Foam::rmDir(const fileName& directory)
|
||||
{
|
||||
if (Unix::debug)
|
||||
if (POSIX::debug)
|
||||
{
|
||||
Info<< "rmDir(const fileName&) : "
|
||||
<< "removing directory " << directory << endl;
|
||||
@ -23,18 +23,18 @@ License
|
||||
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
|
||||
Namespace
|
||||
Foam::Unix
|
||||
Foam::POSIX
|
||||
|
||||
Description
|
||||
UNIX versions of OS-specific functions.
|
||||
OS-specific functions implemented in POSIX.
|
||||
|
||||
SourceFiles
|
||||
Unix.C
|
||||
POSIX.C
|
||||
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#ifndef Unix_H
|
||||
#define Unix_H
|
||||
#ifndef POSIX_H
|
||||
#define POSIX_H
|
||||
|
||||
#include "className.H"
|
||||
|
||||
@ -45,10 +45,10 @@ namespace Foam
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
namespace Unix
|
||||
namespace POSIX
|
||||
{
|
||||
//- Declare name of the class and its debug switch
|
||||
NamespaceName("Unix");
|
||||
NamespaceName("POSIX");
|
||||
}
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
@ -26,11 +26,11 @@ InNamespace
|
||||
Foam
|
||||
|
||||
Description
|
||||
Functions used by OpenFOAM that are specific to the UNIX operating system
|
||||
and need to be replaced or emulated on other systems.
|
||||
Functions used by OpenFOAM that are specific to POSIX compliant
|
||||
operating systems and need to be replaced or emulated on other systems.
|
||||
|
||||
SourceFiles
|
||||
Unix.C
|
||||
POSIX.C
|
||||
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
|
||||
@ -63,7 +63,7 @@ CLASSES_DIR = $(MAKE_DIR)/classes
|
||||
SYS_INC =
|
||||
SYS_LIBS =
|
||||
|
||||
PROJECT_INC = -I$(LIB_SRC)/$(WM_PROJECT)/lnInclude -I$(LIB_SRC)/OSspecific/$(WM_OS)/lnInclude
|
||||
PROJECT_INC = -I$(LIB_SRC)/$(WM_PROJECT)/lnInclude -I$(LIB_SRC)/OSspecific/$(WM_OSTYPE)/lnInclude
|
||||
PROJECT_LIBS = -l$(WM_PROJECT)
|
||||
##
|
||||
## unused:
|
||||
|
||||
Reference in New Issue
Block a user