From 31a8b096f1f8b76ff2650cebff7134f0db2c024f Mon Sep 17 00:00:00 2001 From: "Oliver Borm (boroli)" Date: Mon, 29 Nov 2010 17:14:51 +0100 Subject: [PATCH] Initial patched files for debian package --- Allwmake | 2 +- etc/bashrc | 7 ++++--- etc/cshrc | 3 ++- etc/settings.csh | 12 ++++++------ etc/settings.sh | 14 +++++++------- src/decompositionMethods/metisDecomp/Make/options | 6 ++---- .../parMetisDecomp/Make/options | 6 +++--- src/decompositionMethods/scotchDecomp/Make/options | 6 +++--- .../meshMotion/mesquiteMotionSolver/Make/options | 3 +-- .../MGridGenGamgAgglomeration/Make/options | 6 +++--- wmake/Makefile | 2 +- 11 files changed, 33 insertions(+), 34 deletions(-) diff --git a/Allwmake b/Allwmake index 2458a1916..66fc2737d 100755 --- a/Allwmake +++ b/Allwmake @@ -14,7 +14,7 @@ fi # build ThirdParty sources #( cd $WM_THIRD_PARTY_DIR && ./Allwmake ) -( cd $WM_THIRD_PARTY_DIR && ./AllMake ) +# ( cd $WM_THIRD_PARTY_DIR && ./AllMake ) # build OpenFOAM libraries and applications src/Allwmake diff --git a/etc/bashrc b/etc/bashrc index 7cc0e191f..92c0fe6f9 100644 --- a/etc/bashrc +++ b/etc/bashrc @@ -50,6 +50,7 @@ foamInstall=$HOME/$WM_PROJECT # foamInstall=~$WM_PROJECT # foamInstall=/usr/local/$WM_PROJECT # foamInstall=/opt/$WM_PROJECT +# foamInstall=/usr/lib # # END OF (NORMAL) USER EDITABLE PART ################################################################################ @@ -77,7 +78,7 @@ export WM_PROJECT_DIR=$WM_PROJECT_INST_DIR/$WM_PROJECT-$WM_PROJECT_VERSION # Location of third-party software # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ #: ${WM_THIRD_PARTY_DIR=$WM_PROJECT_INST_DIR/ThirdParty-$WM_PROJECT_VERSION}; export WM_THIRD_PARTY_DIR -: ${WM_THIRD_PARTY_DIR=$WM_PROJECT_DIR/ThirdParty}; export WM_THIRD_PARTY_DIR +# : ${WM_THIRD_PARTY_DIR=$WM_PROJECT_DIR/ThirdParty}; export WM_THIRD_PARTY_DIR # Source files, possibly with some verbosity _foamSource() @@ -312,14 +313,14 @@ export PATH LD_LIBRARY_PATH MANPATH # ~~~~~~~~~~~~~~~~~~~~~~~~~~ _foamSource $WM_PROJECT_DIR/etc/settings.sh -_foamSource $WM_PROJECT_DIR/etc/aliases.sh +# _foamSource $WM_PROJECT_DIR/etc/aliases.sh # Source user setup files for optional packages # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # _foamSource $WM_PROJECT_DIR/etc/apps/paraview/bashrc # _foamSource $WM_PROJECT_DIR/etc/apps/paraview3/bashrc -_foamSource $WM_PROJECT_DIR/etc/apps/ensight/bashrc +# _foamSource $WM_PROJECT_DIR/etc/apps/ensight/bashrc # Clean environment paths again. Only remove duplicates diff --git a/etc/cshrc b/etc/cshrc index ae0a4f792..c3244dce1 100644 --- a/etc/cshrc +++ b/etc/cshrc @@ -49,6 +49,7 @@ set foamInstall = $HOME/$WM_PROJECT # set foamInstall = ~$WM_PROJECT # set foamInstall = /usr/local/$WM_PROJECT # set foamInstall = /opt/$WM_PROJECT +# set foamInstall = /usr/lib # # END OF (NORMAL) USER EDITABLE PART ############################################################################### @@ -304,7 +305,7 @@ setenv MANPATH `$cleanProg "$MANPATH" "$foamOldDirs"` # Source project setup files # ~~~~~~~~~~~~~~~~~~~~~~~~~~ _foamSource $WM_PROJECT_DIR/etc/settings.csh -_foamSource $WM_PROJECT_DIR/etc/aliases.csh +# _foamSource $WM_PROJECT_DIR/etc/aliases.csh # Source user setup files for optional packages # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/etc/settings.csh b/etc/settings.csh index dfcda917b..ccf5dda59 100644 --- a/etc/settings.csh +++ b/etc/settings.csh @@ -37,7 +37,7 @@ alias _foamAddPath 'set path=(\!* $path)' alias _foamAddLib 'setenv LD_LIBRARY_PATH \!*\:${LD_LIBRARY_PATH}' # location of the jobControl directory -setenv FOAM_JOB_DIR $WM_PROJECT_INST_DIR/jobControl +setenv FOAM_JOB_DIR $HOME/$WM_PROJECT/jobControl # wmake configuration setenv WM_DIR $WM_PROJECT_DIR/wmake @@ -52,18 +52,18 @@ setenv WM_DECOMP_LIBS "-lfaceDecompFiniteElement -lfaceDecompositionMotionSolver # base configuration setenv FOAM_APP $WM_PROJECT_DIR/applications -setenv FOAM_APPBIN $WM_PROJECT_DIR/applications/bin/$WM_OPTIONS +setenv FOAM_APPBIN $WM_PROJECT_DIR/applications/bin setenv FOAM_LIB $WM_PROJECT_DIR/lib setenv FOAM_LIBBIN $WM_PROJECT_DIR/lib/$WM_OPTIONS setenv FOAM_SRC $WM_PROJECT_DIR/src # shared site configuration - similar naming convention as ~OpenFOAM expansion -setenv FOAM_SITE_APPBIN $WM_PROJECT_INST_DIR/site/$WM_PROJECT_VERSION/bin/$WM_OPTIONS -setenv FOAM_SITE_LIBBIN $WM_PROJECT_INST_DIR/site/$WM_PROJECT_VERSION/lib/$WM_OPTIONS +setenv FOAM_SITE_APPBIN $WM_PROJECT_INST_DIR/site/$WM_PROJECT_VERSION/bin +setenv FOAM_SITE_LIBBIN $WM_PROJECT_INST_DIR/site/$WM_PROJECT_VERSION/lib # user configuration -setenv FOAM_USER_APPBIN $WM_PROJECT_USER_DIR/applications/bin/$WM_OPTIONS -setenv FOAM_USER_LIBBIN $WM_PROJECT_USER_DIR/lib/$WM_OPTIONS +setenv FOAM_USER_APPBIN $WM_PROJECT_USER_DIR/applications/bin +setenv FOAM_USER_LIBBIN $WM_PROJECT_USER_DIR/lib # convenience setenv FOAM_TUTORIALS $WM_PROJECT_DIR/tutorials diff --git a/etc/settings.sh b/etc/settings.sh index e0d2d6831..30ae6865d 100644 --- a/etc/settings.sh +++ b/etc/settings.sh @@ -57,7 +57,7 @@ _foamAddLib() # location of the jobControl directory -export FOAM_JOB_DIR=$WM_PROJECT_INST_DIR/jobControl +export FOAM_JOB_DIR=$HOME/$WM_PROJECT/jobControl # wmake configuration export WM_DIR=$WM_PROJECT_DIR/wmake @@ -72,18 +72,18 @@ export WM_DECOMP_LIBS="-lfaceDecompFiniteElement -lfaceDecompositionMotionSolver # base configuration export FOAM_APP=$WM_PROJECT_DIR/applications -export FOAM_APPBIN=$WM_PROJECT_DIR/applications/bin/$WM_OPTIONS +export FOAM_APPBIN=$WM_PROJECT_DIR/applications/bin export FOAM_LIB=$WM_PROJECT_DIR/lib -export FOAM_LIBBIN=$WM_PROJECT_DIR/lib/$WM_OPTIONS +export FOAM_LIBBIN=$WM_PROJECT_DIR/lib export FOAM_SRC=$WM_PROJECT_DIR/src # shared site configuration - similar naming convention as ~OpenFOAM expansion -export FOAM_SITE_APPBIN=$WM_PROJECT_INST_DIR/site/$WM_PROJECT_VERSION/bin/$WM_OPTIONS -export FOAM_SITE_LIBBIN=$WM_PROJECT_INST_DIR/site/$WM_PROJECT_VERSION/lib/$WM_OPTIONS +export FOAM_SITE_APPBIN=$WM_PROJECT_INST_DIR/site/$WM_PROJECT_VERSION/bin +export FOAM_SITE_LIBBIN=$WM_PROJECT_INST_DIR/site/$WM_PROJECT_VERSION/lib # user configuration -export FOAM_USER_APPBIN=$WM_PROJECT_USER_DIR/applications/bin/$WM_OPTIONS -export FOAM_USER_LIBBIN=$WM_PROJECT_USER_DIR/lib/$WM_OPTIONS +export FOAM_USER_APPBIN=$WM_PROJECT_USER_DIR/applications/bin +export FOAM_USER_LIBBIN=$WM_PROJECT_USER_DIR/lib # convenience export FOAM_TUTORIALS=$WM_PROJECT_DIR/tutorials diff --git a/src/decompositionMethods/metisDecomp/Make/options b/src/decompositionMethods/metisDecomp/Make/options index 788f28f38..9ba9acce1 100644 --- a/src/decompositionMethods/metisDecomp/Make/options +++ b/src/decompositionMethods/metisDecomp/Make/options @@ -1,10 +1,8 @@ EXE_INC = \ - -I$(METIS_DIR)/include \ + -I/usr/include/metis \ -I../decompositionMethods/lnInclude \ -I../scotchDecomp/lnInclude LIB_LIBS = \ -L$(FOAM_LIBBIN)/dummy \ - -L$(METIS_DIR)/lib -lmetis \ - -L$(METIS_DIR)/lib -lGKlib - + -L$(METIS_DIR)/lib -lmetis diff --git a/src/decompositionMethods/parMetisDecomp/Make/options b/src/decompositionMethods/parMetisDecomp/Make/options index 976c5f208..1a0f524aa 100644 --- a/src/decompositionMethods/parMetisDecomp/Make/options +++ b/src/decompositionMethods/parMetisDecomp/Make/options @@ -2,13 +2,13 @@ include $(RULES)/mplib$(WM_MPLIB) EXE_INC = \ $(PFLAGS) $(PINC) \ - -I$(PARMETIS_DIR)/include/ParMETISLib \ - -I$(PARMETIS_DIR)/include \ + -I/usr/include/parmetis \ + -I/usr/include/metis \ -I../decompositionMethods/lnInclude \ -I../metisDecomp/lnInclude \ -I../scotchDecomp/lnInclude LIB_LIBS = \ -L$(FOAM_MPI_LIBBIN) \ - -L$(PARMETIS_DIR)/lib -lmetis-parmetis \ + -L$(PARMETIS_DIR)/lib -lmetis \ -L$(PARMETIS_DIR)/lib -lparmetis diff --git a/src/decompositionMethods/scotchDecomp/Make/options b/src/decompositionMethods/scotchDecomp/Make/options index 41a8d9c0c..55737f93a 100644 --- a/src/decompositionMethods/scotchDecomp/Make/options +++ b/src/decompositionMethods/scotchDecomp/Make/options @@ -1,7 +1,7 @@ EXE_INC = \ - -I$(SCOTCH_DIR)/include \ + -I/usr/include/scotch \ -I../decompositionMethods/lnInclude LIB_LIBS = \ - -L$(SCOTCH_DIR)/lib -lscotch \ - -L$(SCOTCH_DIR)/lib -lscotcherrexit + -lscotch \ + -lscotcherrexit diff --git a/src/dynamicMesh/meshMotion/mesquiteMotionSolver/Make/options b/src/dynamicMesh/meshMotion/mesquiteMotionSolver/Make/options index 47b48f53e..882526480 100644 --- a/src/dynamicMesh/meshMotion/mesquiteMotionSolver/Make/options +++ b/src/dynamicMesh/meshMotion/mesquiteMotionSolver/Make/options @@ -1,9 +1,8 @@ EXE_INC = \ - -I$(MESQUITE_DIR)/include \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/dynamicMesh/dynamicMesh/lnInclude \ LIB_LIBS = \ -lmeshTools \ -ldynamicMesh \ - -L$(MESQUITE_DIR)/lib -lmesquite + -lmesquite diff --git a/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/Make/options b/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/Make/options index 0ced04b6d..54c517b0e 100644 --- a/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/Make/options +++ b/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/Make/options @@ -7,9 +7,9 @@ TYPE_REAL=-DTYPE_REAL EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(PARMGRIDGEN_DIR)/include/Lib \ - -I$(PARMGRIDGEN_DIR)/include/IMlib \ + -I/usr/include/mgridgen \ $(TYPE_REAL) LIB_LIBS = \ - -L$(PARMGRIDGEN_DIR)/lib -lMGridGen + -lMGridGen \ + -lIMlib diff --git a/wmake/Makefile b/wmake/Makefile index b4b90e091..b2752c03e 100644 --- a/wmake/Makefile +++ b/wmake/Makefile @@ -58,7 +58,7 @@ WM_SCRIPTS = $(WM_DIR)/scripts LIB_SRC = $(WM_PROJECT_DIR)/src LIB_DIR = $(WM_PROJECT_DIR)/lib -LIB_WM_OPTIONS_DIR = $(LIB_DIR)/$(WM_OPTIONS) +LIB_WM_OPTIONS_DIR = $(LIB_DIR) OBJECTS_DIR = $(MAKE_DIR)/$(WM_OPTIONS) CLASSES_DIR = $(MAKE_DIR)/classes