Commit graph

363 commits

Author SHA1 Message Date
Joey Hess
5aa5e92da7 git for windows includes curl, so avoid bundling it 2015-09-11 14:01:42 -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
330f671a21 remove bup from bundledprograms
It never belonged there.
2015-09-10 12:37:05 -04:00
Joey Hess
4ea33b09c9 update for ghc 7.10 2015-09-01 15:02:37 -07:00
Joey Hess
86e638567a Fix Windows build to work with ghc 7.10
It was failing at link time, some problem with terminatePID.
Re-implemented that to not use a C wrapper function, which cleared up the
problem. Removed old EvilLinker hack with must have been related to the
same problem.

Note that I have not tested this with older ghc's. In
f11f7520b5 I mention having tried this
approach before, and getting segfaults.. So, who knows. It seems to work
fine with ghc 7.10 at least.
2015-09-01 14:51:14 -07:00
Joey Hess
1de67fa46e remove unused import 2015-08-24 14:26:41 -07:00
Joey Hess
485465107a Makefile: Pass LDFLAGS, CFLAGS, and CPPFLAGS through ghc and on to ld, cc, and cpp.
As a result of the Makefile changes, the Debian package is built
with various hardening options. Although their benefit to a largely
haskell program is unknown.
2015-08-19 13:53:57 -04:00
Joey Hess
6204dcbd7b fix formatting of git-annex(1) synopsis 2015-07-09 11:22:37 -04:00
Joey Hess
eb33569f9d remove Params constructor from Utility.SafeCommand
This removes a bit of complexity, and should make things faster
(avoids tokenizing Params string), and probably involve less garbage
collection.

In a few places, it was useful to use Params to avoid needing a list,
but that is easily avoided.

Problems noticed while doing this conversion:

	* Some uses of Params "oneword" which was entirely unnecessary
	  overhead.
	* A few places that built up a list of parameters with ++
	  and then used Params to split it!

Test suite passes.
2015-06-01 13:52:23 -04:00
Joey Hess
799dc8d329 avoid unused variable 2015-05-27 17:02:23 -04:00
Joey Hess
38c8b757d8 munge NAME section of man pages to make lintian happy 2015-05-22 16:06:21 -04:00
Joey Hess
6168537c34 require RELEAEE_BUILD to be 1, not any value 2015-05-11 09:44:01 -04:00
Joey Hess
5c7cdbae46 more {-# OPTIONS_GHC -fno-warn-tabs #-} ... Forcing people who have what is merely a difference of opinion to you to do this is a bit of an asshole move. Just saying. 2015-05-10 16:38:49 -04: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
a15e1158c6 use BuildVersion in debian, which fixes windows build 2015-04-21 16:42:54 -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
2cb8fc5fee another fix 2015-04-20 16:09:24 -04:00
Joey Hess
cd2541f729 fix 2015-04-20 16:08:12 -04:00
Joey Hess
b79a3332ae typo 2015-04-20 16:04:09 -04:00
Joey Hess
e651b29e90 reuse Build.Version to generate version 2015-04-20 15:56:28 -04:00
Joey Hess
463bdd9e22 fix whatis section (hack) 2015-04-20 15:54:24 -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
5871f7abd2 put in workaround for strange version of git on the autobuilder 2015-04-14 14:44:19 -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
667e16f1b9 use signingKey 2015-04-06 18:56:38 -04:00
Joey Hess
b857253ae9 reorder params 2015-04-06 18:38:34 -04:00
Joey Hess
00b07d7155 Better fix for standalone tarball git-annex sync linker shim bug, that works for "git annex sync" as well as "git-annex sync". 2015-03-27 16:06:50 -04:00
Joey Hess
bc1c18a951 move build man pages to man/ from top dir 2015-03-23 15:43:45 -04:00
Joey Hess
5c2ad84d28 switch to pattern target to build mans 2015-03-23 12:24:20 -04:00
Joey Hess
900c50a305 fix let_do parser 2015-02-22 19:39:20 -04:00
Joey Hess
b2abf78dc5 add another lambdaparams hack, sigh 2015-02-22 19:24:47 -04:00
Joey Hess
1a1e2e8049 comment typo 2015-02-22 17:38:52 -04:00
Joey Hess
a4a18a67a5 a new hack for another ghc invalid haskell syntax in -ddump-splices .. 2015-02-22 17:35:51 -04:00
Joey Hess
0f4a0762b6 more nested instances hacks 2015-02-22 17:09:54 -04:00
Joey Hess
367cde30da accept longer prefix in case expression fixup
Eg, "Right r_a36iJ ->"
2015-02-22 16:17:32 -04:00
Joey Hess
530db25158 Database.Persist.TH.++ is Data.Text.append 2015-02-22 16:05:11 -04:00
Joey Hess
a419a56c45 EvilSplicer hacks for persistent 2015-02-22 15:43:59 -04:00
Joey Hess
21cab904a9 remove now duplicate import 2015-02-19 18:45:07 -04:00