Commit graph

57 commits

Author SHA1 Message Date
Dominik Christ
adc2bbb081 Updated documentation in comments to include 'SYSTEMOPENMPI' again 2014-02-25 09:36:02 +01:00
Dominik Christ
e50d7c4dcc Added #!/bin/bash ; serial compile for swak4Foam 2014-02-17 15:19:04 +00:00
Hrvoje Jasak
aac5de5e16 Renamed and cleaned foam-extend 2013-12-11 16:09:41 +00:00
Hrvoje Jasak
77983dc2ee Add Intel CC compilation 2013-11-29 17:21:10 +00:00
Bernhard F.W. Gschaider
2c4e17cdbf Modify Mac-stuff to use CLang from MacPort (still got issues: seems that CLang can't handle the output from flex)
--HG--
branch : bgschaid/minorAdditionsBranch
rename : wmake/rules/darwinIntel64Gcc/ARCHITECTURE_TESTED => wmake/rules/darwinIntel64Clang/ARCHITECTURE_TESTED
rename : wmake/rules/darwinIntel64Gcc/X => wmake/rules/darwinIntel64Clang/X
rename : wmake/rules/darwinIntel64Gcc/c => wmake/rules/darwinIntel64Clang/c
rename : wmake/rules/darwinIntel64Gcc/c++ => wmake/rules/darwinIntel64Clang/c++
rename : wmake/rules/darwinIntel64Gcc/c++Debug => wmake/rules/darwinIntel64Clang/c++Debug
rename : wmake/rules/darwinIntel64Gcc/c++Opt => wmake/rules/darwinIntel64Clang/c++Opt
rename : wmake/rules/darwinIntel64Gcc/c++Prof => wmake/rules/darwinIntel64Clang/c++Prof
rename : wmake/rules/darwinIntel64Gcc/cDebug => wmake/rules/darwinIntel64Clang/cDebug
rename : wmake/rules/darwinIntel64Gcc/cOpt => wmake/rules/darwinIntel64Clang/cOpt
rename : wmake/rules/darwinIntel64Gcc/cProf => wmake/rules/darwinIntel64Clang/cProf
rename : wmake/rules/darwinIntel64Gcc/general => wmake/rules/darwinIntel64Clang/general
rename : wmake/rules/darwinIntel64Gcc/mplib => wmake/rules/darwinIntel64Clang/mplib
rename : wmake/rules/darwinIntel64Gcc/mplibMACPORTOPENMPI => wmake/rules/darwinIntel64Clang/mplibMACPORTOPENMPI
rename : wmake/rules/darwinIntel64Gcc/mplibOPENMPI => wmake/rules/darwinIntel64Clang/mplibOPENMPI
rename : wmake/rules/darwinIntel64Gcc/mplibSYSTEMOPENMPI => wmake/rules/darwinIntel64Clang/mplibSYSTEMOPENMPI
2013-11-07 10:38:49 +01:00
Bernhard F.W. Gschaider
002822076a Merge in fixes
--HG--
branch : bgschaid/minorAdditionsBranch
2013-11-06 17:28:06 +01:00
Hrvoje Jasak
b476189438 Mac Maverick re-port 2013-11-04 14:10:04 +00:00
Bernhard F.W. Gschaider
40f9c7af23 Merge latest nextRelease
--HG--
branch : bgschaid/minorAdditionsBranch
2013-10-10 16:14:21 +02:00
Dominik Christ
755a78d0ce Changed bashrc 2013-09-19 09:33:55 +01:00
Bernhard F.W. Gschaider
fdcfb61f0b Distinguish different bash-versions and how they find out about the source file
--HG--
branch : bgschaid/minorAdditionsBranch
2013-09-05 01:29:18 +02:00
Bernhard F.W. Gschaider
af4c60ef56 Replace shell-based auto-detection with a singe Python-oneliner that should be more stable (at least it doesn't choke on symbolic links anymore)
--HG--
branch : bgschaid/minorAdditionsBranch
2013-09-04 23:47:55 +02:00
Henrik Rusche
e83ac65b74 Backporting prefs treatment 2013-08-30 11:21:40 +02:00
Bernhard F.W. Gschaider
51a28461e9 Work around a problem when the absolute path is specified
--HG--
branch : bgschaid/minorAdditionsBranch
2013-08-21 00:58:36 +02:00
Bernhard F.W. Gschaider
93e80e2c87 Automatically determine the additional version specification from the directory name of the installation
--HG--
branch : bgschaid/minorAdditionsBranch
2013-07-22 13:43:34 +02:00
Bernhard F.W. Gschaider
a10196a180 Make sure that WM_PROJECT_VERSION_ADDITION is unset at the start of the script
--HG--
branch : bgschaid/minorAdditionsBranch
2013-07-21 19:31:41 +02:00
Bernhard F.W. Gschaider
194418bc0c Add possibility of preset to cshrc
--HG--
branch : bgschaid/minorAdditionsBranch
2013-07-19 01:44:58 +02:00
Bernhard F.W. Gschaider
72c243a96f Merge
--HG--
branch : bgschaid/minorAdditionsBranch
2013-07-19 00:36:27 +02:00
Henrik Rusche
8141282b1d Convert tabs to fours spaces systematically 2013-07-18 10:50:29 +02:00
Bernhard F.W. Gschaider
aa7910714e WM_DIR is not set at that time
--HG--
branch : bgschaid/minorAdditionsBranch
2013-07-15 20:47:27 +02:00
Bernhard F.W. Gschaider
2a75032491 MacPorts-specific. Set WM_FC (needed by two ThirdParty-packages)
--HG--
branch : bgschaid/minorAdditionsBranch
2013-07-15 17:49:24 +02:00
Bernhard F.W. Gschaider
a4c378a31f On Mac: asume that we want to use the OpenMPI from MacPorts if it is present and the user doesn't say otherwise
--HG--
branch : bgschaid/minorAdditionsBranch
2013-07-12 01:12:50 +02:00
Bernhard F.W. Gschaider
93f583fd97 Remove extra lines introduced by last merge
--HG--
branch : bgschaid/minorAdditionsBranch
2013-07-12 01:04:45 +02:00
Bernhard F.W. Gschaider
164b6639fe Automated merge with git+ssh://git.code.sf.net/p/openfoam-extend/OpenFOAM-1.6-ext
--HG--
branch : bgschaid/minorAdditionsBranch
2013-07-12 01:01:57 +02:00
Bernhard F.W. Gschaider
1713e3dcf9 On Mac use different compilers with the same settings if no separate configuration directory is set
--HG--
branch : bgschaid/minorAdditionsBranch
2013-07-12 00:58:42 +02:00
Bernhard F.W. Gschaider
2f0ecfd98f Allow having a second installation of the same version without touching the sources
--HG--
branch : bgschaid/minorAdditionsBranch
2013-07-11 16:48:40 -04:00
Bernhard F.W. Gschaider
6732db815e Move the site configuration up so that WM_THIRD_PARTY_DIR can be unset
before it is set

--HG--
branch : bgschaid/minorAdditionsBranch
2013-07-11 16:47:30 -04:00
Bernhard F.W. Gschaider
6036337395 Add the possibility to inject variables BEFORE WM_PROJECT_DIR is set
--HG--
branch : bgschaid/minorAdditionsBranch
2013-07-11 16:41:08 -04:00
Martin Beaudoin
6aebefdeae Remove comments 2013-07-11 15:31:01 -04:00
Bernhard F.W. Gschaider
751568a632 Fix strange results when using a zsh
--HG--
branch : bgschaid/minorAdditionsBranch
2013-07-11 15:28:56 -04:00
Martin Beaudoin
912e758cc7 Using complete path for foamGetSystemInfo. Bug reported by Bernhard Gschaider 2013-07-11 10:47:31 -07:00
Bernhard F.W. Gschaider
7ac8e597de Fix strange results when using a zsh
--HG--
branch : bgschaid/minorAdditionsBranch
2013-07-11 19:19:57 +02:00
Bernhard F.W. Gschaider
e17e20289a Add the possibility to inject variables BEFORE WM_PROJECT_DIR is set
--HG--
branch : bgschaid/minorAdditionsBranch
2013-07-11 18:22:11 +02:00
Bernhard F.W. Gschaider
9bfd822a9b Move the site configuration up so that WM_THIRD_PARTY_DIR can be unset
before it is set

--HG--
branch : bgschaid/minorAdditionsBranch
2013-07-11 18:21:35 +02:00
Bernhard F.W. Gschaider
bcaaa26a75 Allow having a second installation of the same version without touching the sources
--HG--
branch : bgschaid/minorAdditionsBranch
2013-07-11 17:46:01 +02:00
Martin Beaudoin
0cd1ffc04d Fixing initialization of environment variable MACOSX_DEPLOYMENT_TARGET 2013-07-10 09:14:21 -04:00
Martin Beaudoin
f3234e58f7 Initialization of WM_NCOMPPROCS using foamGetSystemInfo 2013-07-07 13:02:10 -04:00
Henrik Rusche
5891662bc3 for Max: hw.ncpu --> hw.physicalcpu 2013-07-05 19:34:09 +02:00
Henrik Rusche
ac008a3ca0 Compatibility: auto NCOMPPROCS for Mac 2013-07-05 18:15:23 +02:00
Henrik Rusche
c262140556 Determine NCOMPPROCS automatically 2013-07-05 17:15:35 +02:00
Martin Beaudoin
779fcf8a8f Mac OS X: removing the revision number from 10.7 2013-07-04 22:08:36 -04:00
Henrik Rusche
09fbf2ef28 Fixes to previous merge commits 2013-07-03 19:43:31 +02:00
Martin Beaudoin
4dba7ce12b Test harness: adjustments to compiler related environment variables 2011-05-22 16:43:46 -04:00
Hrvoje Jasak
86f0eaae45 Bug fix - lines commented out 2011-01-31 12:21:32 +00:00
Oliver Borm (boroli)
31a8b096f1 Initial patched files for debian package 2010-11-29 17:14:51 +01:00
Martin Beaudoin
63a1e2fac3 New ThirdParty packs suite: compilation from original source tarballs 2010-11-24 00:49:05 -05:00
Hrvoje Jasak
e7a95c8e72 Update to release docs 2010-11-18 19:31:44 +00:00
Bernhard F.W. Gschaider
051cb20e5b Merge with master. Only conflicts in etc/bashrc. Resolved I hope
--HG--
branch : macMerge
2010-10-19 17:20:34 +02:00
Hrvoje Jasak
0700e50f9f Updates for easier external scripting. Philippose Rajan 2010-10-15 22:27:05 +01:00
Bernhard F.W. Gschaider
9d39b30c49 Align the different Darwin architectures. Add stub-file about untested
--HG--
branch : macMerge
rename : wmake/rules/darwinIntel64/X => wmake/rules/darwinIntel/X
rename : wmake/rules/darwinIntel64/c => wmake/rules/darwinIntel/c
rename : wmake/rules/darwinIntel64/c++ => wmake/rules/darwinIntel/c++
rename : wmake/rules/darwinIntel64/c++Debug => wmake/rules/darwinIntel/c++Debug
rename : wmake/rules/darwinIntel64/c++Opt => wmake/rules/darwinIntel/c++Opt
rename : wmake/rules/darwinIntel64/c++Prof => wmake/rules/darwinIntel/c++Prof
rename : wmake/rules/darwinIntel64/cDebug => wmake/rules/darwinIntel/cDebug
rename : wmake/rules/darwinIntel64/cOpt => wmake/rules/darwinIntel/cOpt
rename : wmake/rules/darwinIntel64/cProf => wmake/rules/darwinIntel/cProf
rename : wmake/rules/darwinIntel64/general => wmake/rules/darwinIntel/general
rename : wmake/rules/darwinIntel64/mplib => wmake/rules/darwinIntel/mplib
rename : wmake/rules/darwinIntel64/mplibOPENMPI => wmake/rules/darwinIntel/mplibOPENMPI
rename : wmake/rules/darwinIntel64/mplibSYSTEMOPENMPI => wmake/rules/darwinIntel/mplibSYSTEMOPENMPI
2010-10-06 00:18:13 +02:00
Hrvoje Jasak
08511f1e51 Reverting garbage 2010-10-04 16:37:40 +01:00