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

Build the new (not yet finished) release of swak

Browse source 
--HG--
branch : bgschaid/foam3FixesBranch
This commit is contained in:
Bernhard F.W. Gschaider 2013-12-28 17:08:01 +01:00
parent eede987516
commit 59440c94d9
2 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ThirdParty/AllClean.stage5 vendored
View file

@ -50,7 +50,7 @@ echo ========================================
echo echo
# swak4foam # swak4foam
pkg=swak4Foam-0.2.4 pkg=swak4Foam-0.3.0
set -x set -x
rm -rf $WM_THIRD_PARTY_DIR/rpmBuild/BUILD/${pkg}* rm -rf $WM_THIRD_PARTY_DIR/rpmBuild/BUILD/${pkg}*
set +x set +x
@ -62,5 +62,3 @@ echo ========================================
echo echo
# ----------------------------------------------------------------- end-of-file # ----------------------------------------------------------------- end-of-file

13
ThirdParty/AllMake.stage5 vendored
View file

@ -55,12 +55,12 @@ echo "Starting ThirdParty AllMake: Stage5 "
echo "========================================" echo "========================================"
echo echo
# swak4Foam - Version 0.2.4 # swak4Foam - Version 0.3.0
# In fact, we are basically tracking the head branch from the Mercurial repository # In fact, we are basically tracking the head branch from the Mercurial repository
# which is also replicated under the Breeder_1.7 section of the Subversion repository # which is also replicated under the Breeder_2.0 section of the Subversion repository
# #
SWAK_RELEASE_VERSION=0.2.4 SWAK_RELEASE_VERSION=0.3.0
if [ -z "$SWAK4FOAM_SYSTEM" ] if [ -z "$SWAK4FOAM_SYSTEM" ]
then then
@ -79,7 +79,7 @@ then
cd ./rpmBuild/BUILD; cd ./rpmBuild/BUILD;
hg clone http://hg.code.sf.net/p/openfoam-extend/swak4Foam swak4Foam-$SWAK_RELEASE_VERSION; hg clone http://hg.code.sf.net/p/openfoam-extend/swak4Foam swak4Foam-$SWAK_RELEASE_VERSION;
cd swak4Foam-$SWAK_RELEASE_VERSION; cd swak4Foam-$SWAK_RELEASE_VERSION;
hg checkout version_$SWAK_RELEASE_VERSION hg checkout version_${SWAK_RELEASE_VERSION}_v2.x
) )
else 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"
@ -87,6 +87,8 @@ then
if [ $? -eq 0 ]; if [ $? -eq 0 ];
then then
echo "Using Subversion/svn to download the source code for swak4Foam" 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_1.7/libraries/swak4Foam swak4Foam-$SWAK_RELEASE_VERSION)
else else
echo "Error: Please install either a Mercurial or Subversion client in order to download the source code for swak4Foam" echo "Error: Please install either a Mercurial or Subversion client in order to download the source code for swak4Foam"
@ -98,7 +100,6 @@ then
# comment out the next two lines # 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 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 options | xargs -n 1 sed -i.old "s/FOAM_USER/FOAM_SITE/g")
(cd ./rpmBuild/BUILD/swak4Foam-$SWAK_RELEASE_VERSION; sed -i.old "s|// #define FOAM_SYMMTENSOR_WORKAROUND|#define FOAM_SYMMTENSOR_WORKAROUND|g" Libraries/swak4FoamParsers/include/swak.H )
# We recompile everything # We recompile everything
(cd ./rpmBuild/BUILD/swak4Foam-$SWAK_RELEASE_VERSION; ./Allwclean; ./Allwmake) (cd ./rpmBuild/BUILD/swak4Foam-$SWAK_RELEASE_VERSION; ./Allwclean; ./Allwmake)
@ -118,5 +119,3 @@ echo "========================================"
echo echo
# ----------------------------------------------------------------- end-of-file # ----------------------------------------------------------------- end-of-file