Browse Source

Tooling: run mozroot before bootstrapper in bash scripts, avoid license path redirect in Nuspec

truncatednormal
Christoph Ruegg 11 years ago
parent
commit
872780b649
  1. 3
      build.sh
  2. 2
      build/MathNet.Numerics.Extension.nuspec
  3. 2
      build/MathNet.Numerics.nuspec
  4. 37
      paket.sh

3
build.sh

@ -21,12 +21,11 @@ function run() {
fi fi
} }
run .paket/paket.bootstrapper.exe
if [[ "$OS" != "Windows_NT" ]] && [ ! -e ~/.config/.mono/certs ] if [[ "$OS" != "Windows_NT" ]] && [ ! -e ~/.config/.mono/certs ]
then then
mozroots --import --sync --quiet mozroots --import --sync --quiet
fi fi
run .paket/paket.bootstrapper.exe
run .paket/paket.exe restore run .paket/paket.exe restore
run packages/FAKE/tools/FAKE.exe "$@" $FSIARGS build.fsx run packages/FAKE/tools/FAKE.exe "$@" $FSIARGS build.fsx

2
build/MathNet.Numerics.Extension.nuspec

@ -9,7 +9,7 @@
<authors>@authors@</authors> <authors>@authors@</authors>
<projectUrl>http://numerics.mathdotnet.com/</projectUrl> <projectUrl>http://numerics.mathdotnet.com/</projectUrl>
<iconUrl>http://www.mathdotnet.com/images/MathNet128.png</iconUrl> <iconUrl>http://www.mathdotnet.com/images/MathNet128.png</iconUrl>
<licenseUrl>http://numerics.mathdotnet.com/docs/License.html</licenseUrl> <licenseUrl>http://numerics.mathdotnet.com/License.html</licenseUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance> <requireLicenseAcceptance>false</requireLicenseAcceptance>
<tags>@tags@</tags> <tags>@tags@</tags>
<releaseNotes>@releaseNotes@</releaseNotes> <releaseNotes>@releaseNotes@</releaseNotes>

2
build/MathNet.Numerics.nuspec

@ -9,7 +9,7 @@
<authors>@authors@</authors> <authors>@authors@</authors>
<projectUrl>http://numerics.mathdotnet.com/</projectUrl> <projectUrl>http://numerics.mathdotnet.com/</projectUrl>
<iconUrl>http://www.mathdotnet.com/images/MathNet128.png</iconUrl> <iconUrl>http://www.mathdotnet.com/images/MathNet128.png</iconUrl>
<licenseUrl>http://numerics.mathdotnet.com/docs/License.html</licenseUrl> <licenseUrl>http://numerics.mathdotnet.com/License.html</licenseUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance> <requireLicenseAcceptance>false</requireLicenseAcceptance>
<tags>@tags@</tags> <tags>@tags@</tags>
<releaseNotes>@releaseNotes@</releaseNotes> <releaseNotes>@releaseNotes@</releaseNotes>

37
paket.sh

@ -1,11 +1,30 @@
#!/bin/bash #!/usr/bin/env bash
if test "$OS" = "Windows_NT"
set -eu
set -o pipefail
cd `dirname $0`
FSIARGS=""
OS=${OS:-"unknown"}
if [[ "$OS" != "Windows_NT" ]]
then then
# use .Net FSIARGS="--fsiargs -d:MONO"
[ ! -f .paket/paket.exe ] && .paket/paket.bootstrapper.exe
.paket/paket.exe $@
else
# use mono
[ ! -f .paket/paket.exe ] && mono --runtime=v4.0 .paket/paket.bootstrapper.exe
mono --runtime=v4.0 .paket/paket.exe $@
fi fi
function run() {
if [[ "$OS" != "Windows_NT" ]]
then
mono "$@"
else
"$@"
fi
}
if [[ "$OS" != "Windows_NT" ]] && [ ! -e ~/.config/.mono/certs ]
then
mozroots --import --sync --quiet
fi
run .paket/paket.bootstrapper.exe
run .paket/paket.exe "$@"

Loading…
Cancel
Save