mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
Start-up scripts: The environment variables are now set unconditionally as in 1.7.x
This commit is contained in:
@ -50,9 +50,9 @@ do
|
|||||||
done
|
done
|
||||||
|
|
||||||
|
|
||||||
# set VERSION and MAJOR (version) variables if not already set
|
# set VERSION and MAJOR (version) variables
|
||||||
[ -n "$ParaView_VERSION" ] || ParaView_VERSION=3.8.0
|
ParaView_VERSION=3.8.0
|
||||||
[ -n "$ParaView_MAJOR" ] || ParaView_MAJOR=unknown
|
ParaView_MAJOR=unknown
|
||||||
|
|
||||||
# if needed, set MAJOR version to correspond to VERSION
|
# if needed, set MAJOR version to correspond to VERSION
|
||||||
# ParaView_MAJOR is "<digits>.<digits>" from ParaView_VERSION
|
# ParaView_MAJOR is "<digits>.<digits>" from ParaView_VERSION
|
||||||
@ -95,4 +95,5 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
unset cleaned cmake paraviewInstDir paraviewPython
|
unset cleaned cmake paraviewInstDir paraviewPython
|
||||||
|
|
||||||
# -----------------------------------------------------------------------------
|
# -----------------------------------------------------------------------------
|
||||||
|
|||||||
@ -48,9 +48,9 @@ foreach cmake ( cmake-2.8.1 cmake-2.8.0 cmake-2.6.4 )
|
|||||||
endif
|
endif
|
||||||
end
|
end
|
||||||
|
|
||||||
# set VERSION and MAJOR (version) variables if not already set
|
# set VERSION and MAJOR (version) variables
|
||||||
if ( ! $?ParaView_VERSION ) setenv ParaView_VERSION 3.8.0
|
setenv ParaView_VERSION 3.8.0
|
||||||
if ( ! $?ParaView_MAJOR ) setenv ParaView_MAJOR unknown
|
setenv ParaView_MAJOR unknown
|
||||||
|
|
||||||
# if needed, set MAJOR version to correspond to VERSION
|
# if needed, set MAJOR version to correspond to VERSION
|
||||||
# ParaView_MAJOR is "<digits>.<digits>" from ParaView_VERSION
|
# ParaView_MAJOR is "<digits>.<digits>" from ParaView_VERSION
|
||||||
@ -91,4 +91,5 @@ endif
|
|||||||
|
|
||||||
|
|
||||||
unset cleaned cmake paraviewInstDir paraviewPython
|
unset cleaned cmake paraviewInstDir paraviewPython
|
||||||
|
|
||||||
# -----------------------------------------------------------------------------
|
# -----------------------------------------------------------------------------
|
||||||
|
|||||||
@ -32,7 +32,7 @@
|
|||||||
#------------------------------------------------------------------------------
|
#------------------------------------------------------------------------------
|
||||||
|
|
||||||
export WM_PROJECT=OpenFOAM
|
export WM_PROJECT=OpenFOAM
|
||||||
[ -z "$WM_PROJECT_VERSION" ] && export WM_PROJECT_VERSION=dev
|
export WM_PROJECT_VERSION=dev
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
# USER EDITABLE PART. Note changes made here may be lost with the next upgrade
|
# USER EDITABLE PART. Note changes made here may be lost with the next upgrade
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
/*--------------------------------*- C++ -*----------------------------------*\
|
/*--------------------------------*- C++ -*----------------------------------*\
|
||||||
| ========= | |
|
| ========= | |
|
||||||
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
|
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
|
||||||
| \\ / O peration | Version: 1.6 |
|
| \\ / O peration | Version: 1.7 |
|
||||||
| \\ / A nd | Web: www.OpenFOAM.com |
|
| \\ / A nd | Web: www.OpenFOAM.com |
|
||||||
| \\/ M anipulation | |
|
| \\/ M anipulation | |
|
||||||
\*---------------------------------------------------------------------------*/
|
\*---------------------------------------------------------------------------*/
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
/*--------------------------------*- C++ -*----------------------------------*\
|
/*--------------------------------*- C++ -*----------------------------------*\
|
||||||
| ========= | |
|
| ========= | |
|
||||||
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
|
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
|
||||||
| \\ / O peration | Version: 1.6 |
|
| \\ / O peration | Version: 1.7 |
|
||||||
| \\ / A nd | Web: www.OpenFOAM.com |
|
| \\ / A nd | Web: www.OpenFOAM.com |
|
||||||
| \\/ M anipulation | |
|
| \\/ M anipulation | |
|
||||||
\*---------------------------------------------------------------------------*/
|
\*---------------------------------------------------------------------------*/
|
||||||
|
|||||||
@ -31,7 +31,7 @@
|
|||||||
#------------------------------------------------------------------------------
|
#------------------------------------------------------------------------------
|
||||||
|
|
||||||
setenv WM_PROJECT OpenFOAM
|
setenv WM_PROJECT OpenFOAM
|
||||||
if ( ! $?WM_PROJECT_VERSION ) setenv WM_PROJECT_VERSION dev
|
setenv WM_PROJECT_VERSION dev
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
# USER EDITABLE PART. Note changes made here may be lost with the next upgrade
|
# USER EDITABLE PART. Note changes made here may be lost with the next upgrade
|
||||||
|
|||||||
Reference in New Issue
Block a user