summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/devblog/day_477__windows_build_fixed.mdwn10
-rwxr-xr-xstandalone/windows/build.sh2
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/