Windows update. Cesare Guardino
This commit is contained in:
parent
ddb867ee9f
commit
fddbc789e5
3 changed files with 22 additions and 37 deletions
|
@ -85,28 +85,28 @@ mkdir $PACKAGE_DIR
|
||||||
echo "Copying bin directory ..."
|
echo "Copying bin directory ..."
|
||||||
cp -rp $FOAM_APPBIN $PACKAGE_DIR/bin
|
cp -rp $FOAM_APPBIN $PACKAGE_DIR/bin
|
||||||
|
|
||||||
echo "Copying DLLs from lib directory ..."
|
echo "Copying DLLs to lib directory ..."
|
||||||
mkdir $PACKAGE_DIR/lib
|
mkdir $PACKAGE_DIR/lib
|
||||||
cp -p $FOAM_LIBBIN/*.dll $PACKAGE_DIR/lib
|
cp -p $FOAM_LIBBIN/*.dll $PACKAGE_DIR/lib
|
||||||
|
|
||||||
echo "Copying extra files from bin directory ..."
|
echo "Copying extra files to bin directory ..."
|
||||||
cp -p $WM_PROJECT_DIR/bin/setWindowsEnvironment.bat $PACKAGE_DIR/
|
|
||||||
cp -p $WM_PROJECT_DIR/bin/foamWindowsShell.bat $PACKAGE_DIR/
|
|
||||||
cp -p $WM_PROJECT_DIR/bin/paraFoam.bat $PACKAGE_DIR/bin
|
cp -p $WM_PROJECT_DIR/bin/paraFoam.bat $PACKAGE_DIR/bin
|
||||||
unix2dos $PACKAGE_DIR/setWindowsEnvironment.bat
|
|
||||||
unix2dos $PACKAGE_DIR/foamWindowsShell.bat
|
|
||||||
unix2dos $PACKAGE_DIR/bin/paraFoam.bat
|
unix2dos $PACKAGE_DIR/bin/paraFoam.bat
|
||||||
|
|
||||||
echo "Copying extra files from etc directory ..."
|
echo "Copying extra files to etc directory ..."
|
||||||
mkdir $PACKAGE_DIR/etc
|
mkdir $PACKAGE_DIR/etc
|
||||||
cp -p $WM_PROJECT_DIR/etc/cellModels $PACKAGE_DIR/etc
|
cp -p $WM_PROJECT_DIR/etc/cellModels $PACKAGE_DIR/etc
|
||||||
cp -rp $WM_PROJECT_DIR/etc/thermoData $PACKAGE_DIR/etc
|
cp -rp $WM_PROJECT_DIR/etc/thermoData $PACKAGE_DIR/etc
|
||||||
|
cp -p $WM_PROJECT_DIR/bin/foamWindowsEnvironment.bat $PACKAGE_DIR/etc
|
||||||
|
cp -p $WM_PROJECT_DIR/bin/foamWindowsShell.bat $PACKAGE_DIR/etc
|
||||||
|
unix2dos $PACKAGE_DIR/etc/foamWindowsEnvironment.bat
|
||||||
|
unix2dos $PACKAGE_DIR/etc/foamWindowsShell.bat
|
||||||
|
|
||||||
echo "Copying doc and license files ..."
|
echo "Copying doc and license files ..."
|
||||||
cp -p $WM_PROJECT_DIR/doc/buildInstructions/Windows/READMEBinaryPackage.txt $PACKAGE_DIR/
|
cp -p $WM_PROJECT_DIR/doc/buildInstructions/Windows/READMEBinaryPackage.txt $PACKAGE_DIR/README.txt
|
||||||
cp -p $WM_PROJECT_DIR/COPYING $PACKAGE_DIR/LICENSE.txt
|
cp -p $WM_PROJECT_DIR/COPYING $PACKAGE_DIR/LICENSE.txt
|
||||||
unix2dos $PACKAGE_DIR/LICENSE.txt
|
unix2dos $PACKAGE_DIR/LICENSE.txt
|
||||||
unix2dos $PACKAGE_DIR/READMEBinaryPackage.txt
|
unix2dos $PACKAGE_DIR/README.txt
|
||||||
|
|
||||||
echo "Creating archives ..."
|
echo "Creating archives ..."
|
||||||
create_package $PACKAGE_DIR zip
|
create_package $PACKAGE_DIR zip
|
||||||
|
|
|
@ -1,12 +1,13 @@
|
||||||
@echo off
|
@echo off
|
||||||
|
|
||||||
set FOAM_HOME=%~dp0
|
set FOAM_ETC_DIR=%~dp0
|
||||||
set FOAM_HOME=%FOAM_HOME:~0,-1%
|
if #%FOAM_ETC_DIR:~-1%# == #\# set FOAM_ETC_DIR=%FOAM_ETC_DIR:~0,-1%
|
||||||
call %FOAM_HOME%\setWindowsEnvironment.bat
|
call "%FOAM_ETC_DIR%\foamWindowsEnvironment.bat"
|
||||||
mode 160,40
|
set FOAM_ETC_DIR=
|
||||||
color 81
|
mode 160,40
|
||||||
echo ---------------------------------
|
color 81
|
||||||
echo Command shell for foam-extend-4.0
|
echo ---------------------------------
|
||||||
echo ---------------------------------
|
echo Command shell for foam-extend-4.0
|
||||||
echo/
|
echo ---------------------------------
|
||||||
cmd.exe
|
echo/
|
||||||
|
cmd.exe
|
||||||
|
|
|
@ -1,16 +0,0 @@
|
||||||
@echo off
|
|
||||||
|
|
||||||
rem =========== USER EDITABLE SETTINGS ===========
|
|
||||||
rem set MPI_ROOTDIR=C:\Programs\OpenMPI_v1.6.1-x64
|
|
||||||
rem set PARAVIEW_HOME=C:\Programs\ParaView-4.3.1
|
|
||||||
rem ==============================================
|
|
||||||
|
|
||||||
set FOAM_HOME=%~dp0
|
|
||||||
set FOAM_HOME=%FOAM_HOME:~0,-1%
|
|
||||||
set WM_PROJECT_DIR=%FOAM_HOME%
|
|
||||||
|
|
||||||
set MPI_BUFFER_SIZE=20000000
|
|
||||||
|
|
||||||
if defined PARAVIEW_HOME set PATH=%PARAVIEW_HOME%\bin;%PATH%
|
|
||||||
if defined MPI_ROOTDIR set PATH=%MPI_ROOTDIR%\bin;%PATH%
|
|
||||||
set PATH=%FOAM_HOME%\lib;%FOAM_HOME%\bin;%PATH%
|
|
Reference in a new issue