Commit graph

31082 commits

Author SHA1 Message Date
Joey Hess
0156ea7f53
expand comment 2017-10-25 14:02:49 -04:00
Joey Hess
54e596894f
Windows: Remove wget from bundle; it needs libraries that are not included, and git for windows includes curl which git-annex will use instead.
wget was broken even in the previous old release of the windows bundle,
this is not new breakage. msys-idn-11.dll and probably more would be needed
to use it. git for windows includes msys-idn2-0.dll instead.
2017-10-25 13:51:31 -04:00
Joey Hess
7dc477a4fc
fix build-version creation 2017-10-25 13:37:51 -04:00
Joey Hess
dd6d0cc9af
fix path
git-annex is installed into . by Build/NullSoftInstaller, so use that
for running git-annex test
2017-10-25 00:23:18 -04:00
Joey Hess
2a2e30f729
make dir 2017-10-25 00:19:10 -04:00
Joey Hess
edcce072a6
ln from stack install location to nsis location 2017-10-25 00:14:53 -04:00
Joey Hess
3761f5a052
try different path 2017-10-25 00:09:58 -04:00
Joey Hess
cea1fed395
try different path 2017-10-25 00:07:39 -04:00
Joey Hess
71e68621b4
Merge branch 'master' of ssh://git-annex.branchable.com 2017-10-25 00:02:53 -04:00
Joey Hess
7688d64564
add bin path 2017-10-25 00:02:25 -04:00
yarikoptic
b5eb77f1ce asking about "Grafts" 2017-10-25 01:49:24 +00:00
ynikitenko
5387c04712 2017-10-24 19:55:06 +00:00
Joey Hess
c03c1d800e
avoid stack runghc
Seems to want to recompile git-annex before running unrelated program.

stack ghc does not have that problem
2017-10-24 13:46:53 -04:00
Joey Hess
0804599941
--no-haddock 2017-10-24 13:37:57 -04:00
Joey Hess
21d6df8f91
use windows stack.yaml for additional stack commands 2017-10-24 13:30:51 -04:00
Joey Hess
7224a58e5d
ding dong, the witch is dead
Which old witch? The EvilLinker witch!

This commit was sponsored by Thom May on Patreon.
2017-10-24 13:24:42 -04:00
Joey Hess
78b5e759a5
fix 2017-10-24 13:20:26 -04:00
Joey Hess
3e839ab327
temporary hack to get windows build working
Code for terminating processes on Windows is not linking anymore;
made a warning be displayed instead. This breaks restarting the
assistant and git annex assistant --stop.

I hope to see the code added to the Win32 library, where it should fit
better and should avoid whatever problem is making the linker not like it
when included in git-annex. I opened an issue requesting its addition,
here: https://github.com/haskell/win32/issues/91

This commit was sponsored by Thomas Hochstein on Patreon.
2017-10-24 13:16:40 -04:00
Joey Hess
901807cf75
Revert "try to avoid TerminateProcess link error on windows"
This reverts commit 839ec7e26c.

Neither way is working.. The other way failed:

.stack-work\dist\5f9bc736\build\git-annex\git-annex-tmp\Assistant.o:fake:(.text+0x6bb3): undefined reference to `terminatepid'

Seems that winprocess.c is not getting linked in.
2017-10-24 13:05:24 -04:00
Joey Hess
bcd394657f
indentation 2017-10-24 12:54:33 -04:00
Joey Hess
75dc8230e1
add includes to cabal 2017-10-24 12:52:21 -04:00
Joey Hess
24ba7c4296
add winprocess.h 2017-10-24 12:48:04 -04:00
Joey Hess
839ec7e26c
try to avoid TerminateProcess link error on windows
Building with stack, it failed:

`_TerminateProcess' referenced in section `.text' of .stack-work\dist\5f9bc736\build\git-annex\git-annex-tmp\Utility\WinProcess.o: defined in discarded section `.text' of C:/Users/jenkins/AppData/Local/Programs/stack/i386-windows/ghc-8.0.2/mingw/bin/../lib/gcc/i686-w64-mingw32/5.2.0/../../../../i686-w64-mingw32/lib/../lib/libkernel32.a(dacgs01154.o)

This is a reversion of 86e638567a,
to try the other way to implement it, which will hopefully avoid the problem.
2017-10-24 12:33:44 -04:00
Joey Hess
e696b086dc
avoid build warning on windows 2017-10-24 12:24:06 -04:00
Joey Hess
42a9555d9f
windows build fix 2017-10-24 12:17:38 -04:00
Joey Hess
92c7e67022
temporarily import from win32-extras 2017-10-24 12:06:41 -04:00
Joey Hess
2c71f4a3a8
remove unncessary withcyg 2017-10-24 12:05:00 -04:00
Joey Hess
bc82d226b6
Merge branch 'master' of ssh://git-annex.branchable.com 2017-10-24 12:02:44 -04:00
Joey Hess
6f7db3df09
add to PATH 2017-10-24 12:02:14 -04:00
ynikitenko
19e9576289 Added a comment: same problem 2017-10-24 09:31:07 +00:00
seantparsons
76e0af3153 Added a comment: Since the attachment doesn't appear to be there, here's the content. 2017-10-22 20:32:22 +00:00
seantparsons
138c9efec1 2017-10-22 20:04:43 +00:00
Joey Hess
a732dbee31
get rsync before build 2017-10-22 15:22:24 -04:00
Joey Hess
c745480882
typo 2017-10-22 15:20:26 -04:00
Joey Hess
008e991ff5
run only 1 job
Seeing interrmittent build failures that may be related to stack's
concurrency
2017-10-22 15:02:43 -04:00
Joey Hess
87c6f506e7
disable haddock 2017-10-22 14:50:09 -04:00
Joey Hess
0e766a41c6
try lts-9.10 with old win32
toolchain issue is preventing nightly from building anything on windows
2017-10-22 14:20:54 -04:00
Joey Hess
2412744e0b
temporarily remove custom-setup stanza
This needs to include unix except on windows, but when I tried
an if (! os(windows)) cabal crashed:

'parseField' called on a non-field. This is possibly a bug in Cabal.

Cabal is able to configure w/o the custom-setup stanza, so omit it.
2017-10-22 14:08:55 -04:00
Joey Hess
11928ae432
add IfElse version 2017-10-22 14:08:45 -04:00
Joey Hess
fda47b0a01
switch to nightly-2017-10-22 for newer win32 2017-10-22 14:03:10 -04:00
Joey Hess
79f56fd449
point packages dir at top 2017-10-22 13:59:42 -04:00
Joey Hess
84a517dbcb
windows-specific stack.yaml to enable Win32 2017-10-22 13:58:21 -04:00
Joey Hess
7391c49305
temporarily disable rm to get building 2017-10-22 13:42:46 -04:00
Joey Hess
bc08ef886d
better fix for rm path 2017-10-22 13:40:01 -04:00
Joey Hess
836e70424d
add cygwin bin to path 2017-10-22 13:39:26 -04:00
Joey Hess
35c807b5bc
remove msysgit cruft 2017-10-22 13:38:11 -04:00
Joey Hess
b744588459
remove ghc --version
using stack, version is pinned
2017-10-22 13:37:18 -04:00
Joey Hess
f00996a1c3
try using cygwin bin/sh
msysgit not used for a long time
2017-10-22 13:35:53 -04:00
Joey Hess
67f15844e5
Merge branch 'master' of ssh://git-annex.branchable.com 2017-10-22 13:23:21 -04:00
Joey Hess
122205e99d
force update 2017-10-22 13:22:55 -04:00