diff options
Diffstat (limited to 'standalone')
| -rwxr-xr-x | standalone/android/install-haskell-packages | 2 | ||||
| -rw-r--r-- | standalone/licences.gz | bin | 55832 -> 55882 bytes | |||
| -rwxr-xr-x | standalone/linux/skel/runshell | 4 | ||||
| -rwxr-xr-x | standalone/osx/git-annex.app/Contents/MacOS/runshell | 10 | ||||
| -rwxr-xr-x | standalone/windows/build.sh | 9 |
5 files changed, 12 insertions, 13 deletions
diff --git a/standalone/android/install-haskell-packages b/standalone/android/install-haskell-packages index f338cc6c7..ea5f160d2 100755 --- a/standalone/android/install-haskell-packages +++ b/standalone/android/install-haskell-packages @@ -65,7 +65,7 @@ patched () { installgitannexdeps () { pushd ../.. ln -sf standalone/android/cabal.config - cabal install --only-dependencies "$@" # --force-reinstalls --reinstall + cabal install --only-dependencies --flags="-magicmime -concurrent-output" "$@" # --force-reinstalls --reinstall rm -f cabal.config popd } diff --git a/standalone/licences.gz b/standalone/licences.gz Binary files differindex e85b038fb..b126f88c0 100644 --- a/standalone/licences.gz +++ b/standalone/licences.gz diff --git a/standalone/linux/skel/runshell b/standalone/linux/skel/runshell index 8c1db4247..fff0f7082 100755 --- a/standalone/linux/skel/runshell +++ b/standalone/linux/skel/runshell @@ -81,10 +81,10 @@ if [ -z "$GIT_ANNEX_PACKAGE_INSTALL" ]; then fi # Put our binaries first, to avoid issues with out of date or incompatable -# system binaries. +# system binaries. Extra binaries come after system path. ORIG_PATH="$PATH" export ORIG_PATH -PATH="$base/bin:$PATH" +PATH="$base/bin:$PATH:$base/extra" export PATH # These env vars are used by the shim wrapper around each binary. diff --git a/standalone/osx/git-annex.app/Contents/MacOS/runshell b/standalone/osx/git-annex.app/Contents/MacOS/runshell index b48017f43..17c95698c 100755 --- a/standalone/osx/git-annex.app/Contents/MacOS/runshell +++ b/standalone/osx/git-annex.app/Contents/MacOS/runshell @@ -61,10 +61,10 @@ if [ ! -e "$HOME/.ssh/git-annex-wrapper" ]; then fi # Put our binaries first, to avoid issues with out of date or incompatable -# system binaries. +# system binaries. Extra binaries come after system path. ORIG_PATH="$PATH" export ORIG_PATH -PATH="$bundle:$PATH" +PATH="$bundle:$PATH:$bundle/extra" export PATH ORIG_GIT_EXEC_PATH="$GIT_EXEC_PATH" @@ -77,7 +77,11 @@ export ORIG_GIT_TEMPLATE_DIR GIT_TEMPLATE_DIR="$bundle/templates" export GIT_TEMPLATE_DIR -# Indicate which variables were exported above. +GIT_ANNEX_DIR="$bundle" +export GIT_ANNEX_DIR + +# Indicate which variables were exported above and should be cleaned +# when running non-bundled programs. GIT_ANNEX_STANDLONE_ENV="PATH GIT_EXEC_PATH GIT_TEMPLATE_DIR" export GIT_ANNEX_STANDLONE_ENV diff --git a/standalone/windows/build.sh b/standalone/windows/build.sh index 7f577c90e..f43f041d2 100755 --- a/standalone/windows/build.sh +++ b/standalone/windows/build.sh @@ -101,10 +101,5 @@ PATH="$(pwd)/dist/build/git-annex/:$PATH" export PATH mkdir -p c:/WINDOWS/Temp/git-annex-test/ cd c:/WINDOWS/Temp/git-annex-test/ -if withcyg git-annex.exe test; then - rm -rf .t -else - rm -rf .t - echo "Test suite failure; failing build!" - false -fi +rm -rf .t +withcyg git-annex.exe test |