exaFOAM/foam-extend4.1-coherent-io
Archived
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Updated windows scripts

Browse source
This commit is contained in:
Dominik Christ 2015-08-05 13:49:55 +01:00
parent 285e65073c
commit eaefc6583b
5 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bin/createWindowsBinaryPackage
View file

@ -66,8 +66,8 @@ cp -p $FOAM_MPI_LIBBIN/*.dll $RELEASE_DIR/lib/$MPI_VERSION
echo "Copying extra files from etc directory ..." echo "Copying extra files from etc directory ..."
mkdir $RELEASE_DIR/etc mkdir $RELEASE_DIR/etc
cp -p $WM_PROJECT_DIR/setWindowsEnvironment.bat $RELEASE_DIR/ cp -p $WM_PROJECT_DIR/bin/setWindowsEnvironment.bat $RELEASE_DIR/
cp -p $WM_PROJECT_DIR/foamWindowsShell.bat $RELEASE_DIR/ cp -p $WM_PROJECT_DIR/bin/foamWindowsShell.bat $RELEASE_DIR/
cp -p $WM_PROJECT_DIR/etc/controlDict-EXAMPLE $RELEASE_DIR/etc cp -p $WM_PROJECT_DIR/etc/controlDict-EXAMPLE $RELEASE_DIR/etc
cp -p $WM_PROJECT_DIR/etc/cellModels $RELEASE_DIR/etc cp -p $WM_PROJECT_DIR/etc/cellModels $RELEASE_DIR/etc
cp -rp $WM_PROJECT_DIR/etc/thermoData $RELEASE_DIR/etc cp -rp $WM_PROJECT_DIR/etc/thermoData $RELEASE_DIR/etc

4
bin/foamWindowsShell.bat
View file

@ -1,7 +1,7 @@
@echo off @echo off
set FOAM_ETC=%~dp0 set FOAM_HOME=%~dp0
call %FOAM_ETC%\env.bat call %FOAM_HOME%\setWindowsEnvironment.bat
mode 160,40 mode 160,40
color 81 color 81
echo --------------------------------- echo ---------------------------------

4
doc/buildInstructions/Windows/README.txt
View file

@ -53,9 +53,9 @@ already have some of these system tools.
3) Download and install MSYS (see reference list below). 3) Download and install MSYS (see reference list below).
4) Download the foam-extend source code from as described on http://wikki.gridcore.se 4) Download the foam-extend source code from http://sourceforge.net/projects/openfoam-extend/
5) Open a new MSYS shell and chdir to your foam-extend-3.1 source directory 5) Open a new MSYS shell and chdir to your foam-extend-3.1 source directory.
6) Edit the user-modifiable entries in etc/bashrc.mingw to point to the 6) Edit the user-modifiable entries in etc/bashrc.mingw to point to the
locations where you have installed the required system tools in the first two locations where you have installed the required system tools in the first two

6
doc/buildInstructions/Windows/READMEBinaryPackage.txt
View file

@ -58,11 +58,11 @@ INSTRUCTIONS ON HOW TO INSTALL AND RUN THE WINDOWS VERSION OF FOAM-EXTEND
installation directory where you install ParaView. installation directory where you install ParaView.
4) Start a new CMD (DOS) prompt, and run the following command: 4) Start a new CMD (DOS) prompt, and run the following command:
call <PATH_TO_FOAM>\bin\setWindowsEnvironment.bat call <PATH_TO_FOAM>\setWindowsEnvironment.bat
where <PATH_TO_FOAM> is the full path of the directory where you unzipped the package. where <PATH_TO_FOAM> is the full path of the directory where you unzipped the package.
The foam environment is now configured correctly for use within this CMD prompt only. The foam environment is now configured correctly for use within this CMD prompt only.
Alternatively, create a desktop shortcut to <PATH_TO_FOAM>\bin\foamWindowsShell.bat Alternatively, create a desktop shortcut to <PATH_TO_FOAM>\foamWindowsShell.bat
When you double-click this shortcut, a new CMD prompt is open with the foam environment automatically set. When you double-click this shortcut, a new CMD prompt is open with the foam environment automatically set.
5) From the CMD prompts opened in the previous step, you can now run the usual foam applications, for example: 5) From the CMD prompts opened in the previous step, you can now run the usual foam applications, for example:
@ -88,3 +88,5 @@ NOTES
explicitly load the required DLL using the "libs" function in system/controlDict, for example: explicitly load the required DLL using the "libs" function in system/controlDict, for example:
libs ("liblduSolvers.dll"); libs ("liblduSolvers.dll");
2) foam-extend is licensed under GPL v3. The source code is available from http://sourceforge.net/projects/openfoam-extend/

11
etc/bashrc.mingw
View file

@ -39,7 +39,7 @@ export PROGRAMS_HOME=/c/Programs
# {{{ DEFINE USER EDITABLE FUNCTIONS # {{{ DEFINE USER EDITABLE FUNCTIONS
set_system_paths() { set_system_paths() {
echo "Setting installations directories of required tools ..." echo "Setting environment variables for user-defined installed system tools and utilities ..."
export CMAKE_HOME=$PROGRAMS_HOME/cmake-3.2.3-win32-x86 export CMAKE_HOME=$PROGRAMS_HOME/cmake-3.2.3-win32-x86
export GIT_HOME=$PROGRAMS_HOME/Git export GIT_HOME=$PROGRAMS_HOME/Git
export MINGW_HOME=$PROGRAMS_HOME/mingw64 export MINGW_HOME=$PROGRAMS_HOME/mingw64
@ -53,7 +53,8 @@ set_system_paths() {
} }
add_to_path() { add_to_path() {
echo "Adding required tools to PATH ..." echo
echo "Adding user-defined installed system tools to PATH ..."
export PATH=$ZIP_HOME:$PATH export PATH=$ZIP_HOME:$PATH
export PATH=$WGET_HOME/bin:$PATH export PATH=$WGET_HOME/bin:$PATH
export PATH=$PYTHON_HOME:$PATH export PATH=$PYTHON_HOME:$PATH
@ -69,12 +70,14 @@ add_to_path() {
# {{{ DEFINE PROCESS FUNCTIONS # {{{ DEFINE PROCESS FUNCTIONS
setup_foam_env() { setup_foam_env() {
: ${WM_OSTYPE:=MSWindows}; export WM_OSTYPE echo
export export FLEX_DIR=$(echo $WD\.. | sed 's/\\/\//g' | sed 's/\(.*\):/\/\1/') export export FLEX_DIR=$(echo $WD\.. | sed 's/\\/\//g' | sed 's/\(.*\):/\/\1/')
FOAM_ETC_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) FOAM_ETC_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
export FOAM_INST_DIR=$(readlink -f $FOAM_ETC_DIR/../..) export FOAM_INST_DIR=$(readlink -f $FOAM_ETC_DIR/../..)
export FOAM_VERBOSE=1
export WM_OSTYPE=MSWindows
echo "Sourcing: $FOAM_ETC_DIR/bashrc"
. $FOAM_ETC_DIR/bashrc . $FOAM_ETC_DIR/bashrc
. $FOAM_ETC_DIR/prefs.sh.mingw
} }
set_OMPI_env() { set_OMPI_env() {