From 56cebd6a39f7df22169dc21e5a53062df774f7b0 Mon Sep 17 00:00:00 2001 From: wyldckat Date: Sun, 13 Apr 2014 09:52:16 +0100 Subject: [PATCH 1/2] README.ThirdParty and AllMake.stage5: Changed tabs to spaces, for editing coherence. --- ThirdParty/AllMake.stage5 | 48 ++++++++++++++++++------------------ ThirdParty/README.ThirdParty | 4 +-- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/ThirdParty/AllMake.stage5 b/ThirdParty/AllMake.stage5 index 2db7ef8b5..ef9d5ad42 100755 --- a/ThirdParty/AllMake.stage5 +++ b/ThirdParty/AllMake.stage5 @@ -70,42 +70,42 @@ then # centralized under the same scratch area if [ ! -e ./rpmBuild/BUILD/swak4Foam-$SWAK_RELEASE_VERSION ]; then - echo "Checking for a Mercurial client: hg" + echo "Checking for a Mercurial client: hg" command -v hg >/dev/null if [ $? -eq 0 ]; - then - echo "Using Mercurial/hg to download the source code for swak4Foam" - ( - cd ./rpmBuild/BUILD; - hg clone http://hg.code.sf.net/p/openfoam-extend/swak4Foam swak4Foam-$SWAK_RELEASE_VERSION; - cd swak4Foam-$SWAK_RELEASE_VERSION; - hg checkout version_${SWAK_RELEASE_VERSION}_v2.x - ) + then + echo "Using Mercurial/hg to download the source code for swak4Foam" + ( + cd ./rpmBuild/BUILD; + hg clone http://hg.code.sf.net/p/openfoam-extend/swak4Foam swak4Foam-$SWAK_RELEASE_VERSION; + cd swak4Foam-$SWAK_RELEASE_VERSION; + hg checkout version_${SWAK_RELEASE_VERSION}_v2.x + ) else - echo "Warning: Mercurial/hg is not installed. Switching to an alternate Subversion repository" + echo "Warning: Mercurial/hg is not installed. Switching to an alternate Subversion repository" command -v svn >/dev/null if [ $? -eq 0 ]; - then - echo "Using Subversion/svn to download the source code for swak4Foam" - echo "Error: current Subversion-version does not support foam3. Please install mercurial" - exit -1 - (cd ./rpmBuild/BUILD; svn checkout svn://svn.code.sf.net/p/openfoam-extend/svn/trunk/Breeder_1.7/libraries/swak4Foam swak4Foam-$SWAK_RELEASE_VERSION) + then + echo "Using Subversion/svn to download the source code for swak4Foam" + echo "Error: current Subversion-version does not support foam3. Please install mercurial" + exit -1 + (cd ./rpmBuild/BUILD; svn checkout svn://svn.code.sf.net/p/openfoam-extend/svn/trunk/Breeder_1.7/libraries/swak4Foam swak4Foam-$SWAK_RELEASE_VERSION) else - echo "Error: Please install either a Mercurial or Subversion client in order to download the source code for swak4Foam" - exit -1 - fi - fi + echo "Error: Please install either a Mercurial or Subversion client in order to download the source code for swak4Foam" + exit -1 + fi + fi # We move the compilation results directly to $FOAM_SITE_APPBIN and $FOAM_SITE_LIBBIN # If you prefer to keep the libraries and tools under $FOAM_USER_LIBBIN and $FOAM_USER_APPBIN, simply # comment out the next two lines - (cd ./rpmBuild/BUILD/swak4Foam-$SWAK_RELEASE_VERSION; find . -name files | xargs -n 1 sed -i.old "s/FOAM_USER/FOAM_SITE/g") - (cd ./rpmBuild/BUILD/swak4Foam-$SWAK_RELEASE_VERSION; find . -name options | xargs -n 1 sed -i.old "s/FOAM_USER/FOAM_SITE/g") + (cd ./rpmBuild/BUILD/swak4Foam-$SWAK_RELEASE_VERSION; find . -name files | xargs -n 1 sed -i.old "s/FOAM_USER/FOAM_SITE/g") + (cd ./rpmBuild/BUILD/swak4Foam-$SWAK_RELEASE_VERSION; find . -name options | xargs -n 1 sed -i.old "s/FOAM_USER/FOAM_SITE/g") # We recompile everything - (cd ./rpmBuild/BUILD/swak4Foam-$SWAK_RELEASE_VERSION; ./Allwclean; ./Allwmake) + (cd ./rpmBuild/BUILD/swak4Foam-$SWAK_RELEASE_VERSION; ./Allwclean; ./Allwmake) else - echo "The source code for swak4Foam is already present under ./rpmBuild/BUILD/swak4Foam-$SWAK_RELEASE_VERSION" - echo "Please remove this directory if you want to refresh your installation of swak4Foam" + echo "The source code for swak4Foam is already present under ./rpmBuild/BUILD/swak4Foam-$SWAK_RELEASE_VERSION" + echo "Please remove this directory if you want to refresh your installation of swak4Foam" fi echo "" else diff --git a/ThirdParty/README.ThirdParty b/ThirdParty/README.ThirdParty index d7c141b0a..4381be5e7 100644 --- a/ThirdParty/README.ThirdParty +++ b/ThirdParty/README.ThirdParty @@ -136,7 +136,7 @@ through when starting the compilation from scratch: - The .rpm files will be located under the directory $WM_THIRD_PARTY_DIR/rpmBuild/RPMS - - The .tgz files will be located under the directory + - The .tgz files will be located under the directory $WM_THIRD_PARTY_DIR/rpmBuild/TGZS e: The default installation root directory is "$WM_THIRD_PARTY_DIR". @@ -158,7 +158,7 @@ Warning: This section is a bit advanced, and as of yet, I have no evidence that this feature has ever been used by anybody. So please feel free to skip this section if you don't need to relocate your ThirdParty packages installation directory, which you should not have do on most - installation anyway. + installation anyway. a: All the generated RPMs can be relocated, meaning that you can override the hard-coded root installation directory when using those RPMs for From 2301f8e58f55a8d793c236a3d1d8d1c3eca1d6a6 Mon Sep 17 00:00:00 2001 From: wyldckat Date: Sun, 13 Apr 2014 09:54:23 +0100 Subject: [PATCH 2/2] AllMake.stage5: Changed SVN repo for swak4Foam to 2.0, since it's the one to be used for FOAM-Extend 3.0. --- ThirdParty/AllMake.stage5 | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ThirdParty/AllMake.stage5 b/ThirdParty/AllMake.stage5 index ef9d5ad42..ef6ca0cdc 100755 --- a/ThirdParty/AllMake.stage5 +++ b/ThirdParty/AllMake.stage5 @@ -87,9 +87,7 @@ then if [ $? -eq 0 ]; then echo "Using Subversion/svn to download the source code for swak4Foam" - echo "Error: current Subversion-version does not support foam3. Please install mercurial" - exit -1 - (cd ./rpmBuild/BUILD; svn checkout svn://svn.code.sf.net/p/openfoam-extend/svn/trunk/Breeder_1.7/libraries/swak4Foam swak4Foam-$SWAK_RELEASE_VERSION) + (cd ./rpmBuild/BUILD; svn checkout svn://svn.code.sf.net/p/openfoam-extend/svn/trunk/Breeder_2.0/libraries/swak4Foam swak4Foam-$SWAK_RELEASE_VERSION) else echo "Error: Please install either a Mercurial or Subversion client in order to download the source code for swak4Foam" exit -1