diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2017-10-25 00:23:18 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-10-25 00:23:18 -0400 |
| commit | 0edc3c5549f3e1ccb35857482028c16a211015f0 (patch) | |
| tree | b16fa3b165df0b1e742efafb8564ff038e778a81 | |
| parent | bcd100860ad3733a25f769e2874c2024a22bb9b8 (diff) | |
fix path
git-annex is installed into . by Build/NullSoftInstaller, so use that
for running git-annex test
| -rw-r--r-- | doc/devblog/day_477__windows_build_fixed.mdwn | 10 | ||||
| -rwxr-xr-x | standalone/windows/build.sh | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/doc/devblog/day_477__windows_build_fixed.mdwn b/doc/devblog/day_477__windows_build_fixed.mdwn new file mode 100644 index 000000000..c957815a1 --- /dev/null +++ b/doc/devblog/day_477__windows_build_fixed.mdwn @@ -0,0 +1,10 @@ +Got the Windows build fixed, with help from Yury. The toolchain had been +broken for months. We switched to using stack, which should make the +Windows build more reproducible and easy to manage. + +Unfortunately, there was a link problem, and I had to disable some FFI code +that was needed to terminate processes on Windows. Until that gets fixed, +restarting and stopping the assistant won't work right on Windows. + +Aaand: The EvilLinker is not needed any longer, so I was very happy to be +able to delete that hack. \o/ diff --git a/standalone/windows/build.sh b/standalone/windows/build.sh index b8a47944b..39edf93e9 100755 --- a/standalone/windows/build.sh +++ b/standalone/windows/build.sh @@ -78,7 +78,7 @@ stack ghc --stack-yaml standalone/windows/stack.yaml --no-haddock \ # Test git-annex # The test is run in c:/WINDOWS/Temp, because running it in the autobuilder # directory runs afoul of Windows's short PATH_MAX. -PATH="$(pwd)/dist/build/git-annex/:$PATH" +PATH="$(pwd):$PATH" export PATH mkdir -p c:/WINDOWS/Temp/git-annex-test/ cd c:/WINDOWS/Temp/git-annex-test/ |