Commit graph

64 commits

Author SHA1 Message Date
Joey Hess
112bb82fc2
Windows: If 64 bit git is installed, use it when installing git-annex.
However, rsync still won't work with 64 bit git and
this is still not the documented way to install it.

So, if both 64 and 32 are installed, go with 32.

And if neither git can be found, default to 32.
2019-01-21 15:51:48 -04:00
Joey Hess
c34152777b
Use http-conduit for url downloads by default, annex.web-options enables curl
* For url downloads, git-annex now defaults to using a http library,
  rather than wget or curl. But, if annex.web-options is set, it will
  use curl. To use the .netrc file, run:
    git config annex.web-options --netrc
* git-annex no longer uses wget (and wget is no longer shipped with
  git-annex builds).

Note that curl is always run in silent mode, since the new API for
download has a MeterUpdate and doesn't make way for curl progress
output. It might be worth writing a parser for curl's progress output
to update the meter when using it, but I didn't bother with this edge
case for now.

This commit was supported by the NSF-funded DataLad project.
2018-04-06 17:36:20 -04:00
Joey Hess
2b28f6130a
fix windows build 2018-01-10 13:23:10 -04:00
Joey Hess
50c0fb7336
unify stack build and stack install
For some reason, when stack install is run separately, it seems to be
installing a previous build from a different temp dir. WTF?
2017-10-26 10:10:02 -04:00
Joey Hess
edcce072a6
ln from stack install location to nsis location 2017-10-25 00:14:53 -04:00
Joey Hess
59a0308f5f
update windows build scripts to use stack
Not tested yet.

The EvilLinker workaround is removed. That got fixed in ghc 8.0.1,
(per https://ghc.haskell.org/trac/ghc/ticket/8596)
which will finally be used by the windows autobuilder now.

I have not deleted the EvilLinker yet (or closed its bugs).

This commit was sponsored by John Peloquin on Patreon.
2017-10-17 13:00:29 -04:00
Joey Hess
b22409db38
avoid warnings about not exported System.Directory.isSymbolicLink 2016-04-28 15:18:11 -04:00
Joey Hess
5fe450514b
Fix build with directory-1.2.6.2.
It started exporting a isSymbolicLink which supports windows. But,
git-annex does no use symlinks on windows yet and this conflicts with the
function by the same name from unix-compat, so hide it.
2016-04-28 13:18:44 -04:00
Joey Hess
1355a241ea now fully working even when git is not in path
The vbs launchers now are passed the path where git-annex was installed to,
so they will work when it's not in path.
2015-09-11 13:18:21 -04:00
Joey Hess
c7a6296ef3 get git-annex working even if user doesn't add git to path
This is pretty complicated, but I have both "git-annex" and "git annex"
working both in the git bash shell even with git not added to path.
And, when git's added to path, both work from MS-DOS prompt window too.

I think that the webapp startup does still need git in path, so
instructions will keep saying to do that. But, users often disregard them,
and hopefully this will reduce support traffic.

Also, switched the wget from the cygwin one to the msys2 one, avoiding the
complication of needing to bundle any cygwin dlls.
2015-09-11 12:44:27 -04:00
Joey Hess
6158036e23 Switched to using git for Windows, rather than msysgit.
Using msysgit with git-annex is no longer supported.

At the same time, I'm updating the rsync.exe in my downloads repository
with the one from msys2.

Note that rsync is currently still being ldded and installed in Git/cmd/
like the other cygwin programs. The ldd fails and this failure is ignored.
It would be better to special case it to go in Git/usr/bin/, so that the
user can't run rsync in a dos prompt window, which doesn't work, as it needs
additional libs. However, as far as git-annex running rsync running ssh,
it works ok in this location.

Removed the ssh.cmd and ssh-keygen.cmd; these are not needed with git for
windows. Keeping them would let ssh be run manually from a dos prompt
window, but that's not really a goal.
2015-09-10 19:16:30 -04:00
Joey Hess
4ea33b09c9 update for ghc 7.10 2015-09-01 15:02:37 -07:00
Joey Hess
d32da9f9b6 add a wrapper for ssh-keygen 2015-05-08 14:55:57 -04:00
Joey Hess
38e2b95751 use a batch file to run msysgit's ssh, instead of copying
copying failed because dlls are not in path.

This batch file is based on the one msysgit uses to start gitk
2015-05-08 14:26:37 -04:00
Joey Hess
ce285ea6fa Windows: Remove cygwin ssh, the newer version of which has stopped honoring the setting of HOME. Instead, copy msysgit's ssh into PATH. 2015-05-07 15:53:03 -04:00
Joey Hess
dc6949b509 filter out non-cygwin libs 2015-04-21 16:39:44 -04:00
Joey Hess
cd4fb498a7 use cygwin ldd to find dlls to include, instead of manually listing 2015-04-21 14:36:40 -04:00
Joey Hess
10afac3fba another lib 2015-04-20 13:03:46 -04:00
Joey Hess
ed10722fae another lib 2015-04-20 12:20:42 -04:00
Joey Hess
9f4647e091 updated lib version 2015-04-20 12:09:55 -04:00
Joey Hess
7c17ad05d2 more libs 2015-04-20 12:01:26 -04:00
Joey Hess
0bc67213cc more libs 2015-04-20 11:47:58 -04:00
Joey Hess
b1cb603b6b more libs 2015-04-20 11:25:40 -04:00
Joey Hess
c1859130c2 prune old lib 2015-04-20 11:12:59 -04:00
Joey Hess
2665be44d5 update some windows libraries for newer version of cygwin 2015-04-20 11:08:32 -04:00
Joey Hess
4b6dec6a12 Windows: Renamed start menu file to avoid loop in some versions of Windows where the menu file is treated as a git-annex program. 2015-04-13 14:24:07 -04:00
Joey Hess
02cdc2f0b7 typo 2015-01-29 13:51:30 -04:00
Joey Hess
5fe41d3ef5 windows: include html help file that msysgit tries to open for git annex --help
Pointing to the website is easier than trying to format the man page to
html on windows.

Closes https://github.com/datalad/datalad/issues/39
2015-01-29 13:43:52 -04:00
Joey Hess
f61d891f2e weirdly doubled slashes 2015-01-29 13:34:14 -04:00
Joey Hess
afc5153157 update my email address and homepage url 2015-01-21 12:50:09 -04:00
Joey Hess
e292310ba3 Windows: Install ssh and other bundled programs to Git/cmd, instead of Git/bin, since the latter is not in the default msysgit PATH. 2014-12-03 13:34:13 -04:00
Joey Hess
31c2ece395 Windows: Remove Alt+A keyboard shortcut, which turns out to have scope outside the menus. 2014-11-14 13:56:05 -04:00
Joey Hess
7b50b3c057 fix some mixed space+tab indentation
This fixes all instances of " \t" in the code base. Most common case
seems to be after a "where" line; probably vim copied the two space layout
of that line.

Done as a background task while listening to episode 2 of the Type Theory
podcast.
2014-10-09 15:09:11 -04:00
Joey Hess
5afc8b28e0 move git-annex to git/cmd
This way, it works both when using msgit, which will look in both bin and
cmd, but also when using cygwin's git, which only looks in PATH, which
includes cmd but not bin.
2014-07-16 18:12:05 -04:00
Joey Hess
a6fdc4b3bc Windows: Move .vbs files out of git\bin
.. To avoid that being in the PATH, which caused some weird breakage.
(Thanks, divB)
2014-07-16 18:00:07 -04:00
Joey Hess
1fcd0c8c4d don't start minimized 2014-06-17 14:28:44 -04:00
Joey Hess
a8b6ff0ff2 crazy quote for spaces 2014-06-17 14:05:31 -04:00
Joey Hess
883aa84209 windows no-DOS-box and autostart, at last
Using the crazy but apparently best approach of a VB Script that runs
git-annex, in a hidden DOS window.

Note that currently the git-annex messages are not directed to daemon.log.
Would probably need another layer of script. Also problimatic since the
repository may not exist yet.
2014-06-17 13:57:00 -04:00
Joey Hess
fac8198a2f fix up old comments that used format=txt, which is no longer enabled 2014-03-20 12:09:09 -04:00
Joey Hess
2c27b1397b windows: add more libraries, these are used by gpg 2014-01-01 15:30:58 -04:00
Joey Hess
cb37a45e29 argh, one more 2013-12-11 11:53:56 -04:00
Joey Hess
2cca8760fc more 2013-12-11 11:49:35 -04:00
Joey Hess
a9cb8d02f6 one more lib 2013-12-11 11:44:14 -04:00
Joey Hess
439d4a8c42 yet more wget and curl libs 2013-12-11 11:34:22 -04:00
Joey Hess
174b1275ee more libs for wget and curl 2013-12-11 11:23:39 -04:00
Joey Hess
64379ff59e add libs needed by wget and curl 2013-12-11 11:10:30 -04:00
Joey Hess
8ce7b9d222 typo 2013-12-10 00:37:58 -04:00
Joey Hess
cd765576d2 remove menu item on uninstall 2013-12-10 00:37:06 -04:00
Joey Hess
db8a980c70 request admin rights at install 2013-12-10 00:32:08 -04:00
Joey Hess
29f440289b start minimized 2013-12-10 00:26:14 -04:00