Skip to content

Commit 8111c63

Browse files
committed
Merge pull request #500 from baronfel/travis_multiarch
Travis multiarch
2 parents 51704bd + 80db5be commit 8111c63

File tree

4 files changed

+24
-2
lines changed

4 files changed

+24
-2
lines changed

.travis.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,21 @@
11
language: csharp
22

3+
os:
4+
- linux
5+
- osx
6+
7+
mono:
8+
- latest
9+
310
install:
411

12+
before_script:
13+
- chmod +x travis-autogen.sh
14+
515
script:
6-
- ./autogen.sh --prefix=/usr
16+
- ./travis-autogen.sh
717
- make
818
- sudo make install
919
- xbuild ./src/fsharp-library-unittests-build.proj /p:TargetFramework=net40 /p:Configuration=Release
1020
- (cd tests/projects; ./build.sh)
1121
- (cd tests/fsharp/core; ./run-opt.sh)
12-

appveyor.ps1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,4 @@ function pack($nuspec){
3030

3131
pack(gi .\FSharp.Core.Nuget\FSharp.Core.nuspec)
3232
pack(gi .\FSharp.Compiler.Tools.Nuget\FSharp.Compiler.Tools.nuspec)
33+

autogen.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
#!/usr/bin/env sh
2+
23
which autoreconf > /dev/null || (echo "Please install autoconf" && exit 1)
34
autoreconf && ./configure $@

travis-autogen.sh

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#!/usr/bin/env sh
2+
3+
if [[ $TRAVIS_OS_NAME == osx ]];
4+
then
5+
monoVer=$(mono --version | head -n 1 | cut -d' ' -f 5)
6+
prefix="/Library/Frameworks/Mono.framework/Versions/$monoVer";
7+
else
8+
prefix="/usr";
9+
fi
10+
11+
./autogen.sh --prefix=$prefix

0 commit comments

Comments
 (0)