Commit graph

306 commits

Author SHA1 Message Date
Joey Hess
596b8e1e04 fix DistributionUpdate incompatability
Since DistributionUpdate builds an Annex object, the new relative paths
code caused it to make a git object with paths like ../lib/downloads.
However, it actually runs the system's installed git-annex, and that old
version did not like being run in this situation. Probably it was buggy.

Fixed by chdir to the downloads repo before doing anything else.
2015-01-13 12:43:22 -04:00
Joey Hess
3bab5dfb1d revert parentDir change
Reverts 965e106f24

Unfortunately, this caused breakage on Windows, and possibly elsewhere,
because parentDir and takeDirectory do not behave the same when there is a
trailing directory separator.
2015-01-09 13:11:56 -04:00
Joey Hess
08a26575e3 added android 5.0 build 2015-01-08 19:29:17 -04:00
Joey Hess
965e106f24 made parentDir return a Maybe FilePath; removed most uses of it
parentDir is less safe than takeDirectory, especially when working
with relative FilePaths. It's really only useful in loops that
want to terminate at /

This commit was sponsored by Audric SCHILTKNECHT.
2015-01-06 18:55:56 -04:00
Joey Hess
c64ede23cd Use wget -q --show-progress for less verbose wget output, when built with wget 1.16. 2014-12-16 14:04:40 -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
10b139956a Windows: ssh is no longer included in the git-annex bundle, since msysgit includes it. 2014-12-03 13:26:05 -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
c9c01680e6 annex new files 2014-11-11 16:49:24 -04:00
Joey Hess
04ca336b8e OSX autobuilder updated to 10.10 2014-11-11 16:18:51 -04:00
Joey Hess
9fd95d9025 indent with tabs not spaces
Found these with:
git grep "^  " $(find -type  f -name \*.hs) |grep -v ':  where'

Unfortunately there is some inline hamlet that cannot use tabs for
indentation.

Also, Assistant/WebApp/Bootstrap3.hs is a copy of a module and so I'm
leaving it as-is.
2014-10-09 15:09:26 -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
2815a34baf fix build 2014-08-31 07:57:07 -07:00
Joey Hess
6eb5c3f479 Do not preserve permissions and acls when copying files from one local git repository to another. Timestamps are still preserved as long as cp --preserve=timestamps is supported.
This avoids cp -a overriding the default mode acls that the user might have
set in a git repository.

With GNU cp, this behavior change should not be a breaking change, because
git-anex also uses rsync sometimes in the same situation, and has only ever
preserved timestamps when using rsync.

Systems without GNU cp will no longer use cp -a, but instead just cp.
So, timestamps will no longer be preserved. Preserving timestamps when
copying between repos is not guaranteed anyway.

Closes: #729757
2014-08-26 17:10:25 -07:00
Joey Hess
b3a9d41910 fix build 2014-08-10 19:44:09 -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
3a7ae6f144 indentation 2014-07-13 22:33:27 -04:00
Joey Hess
4396d3100c typo 2014-07-07 14:30:38 -04:00
Joey Hess
4a86430567 windows autobuild images now available from downloads.kitenet.net
The autobuilder's own https cert is expired.
2014-06-19 14:21:34 -04:00
Joey Hess
c7cbd6488c
fix generation of infor files
Now have files relative to the top of the repo.
2014-06-18 16:34:28 -04:00
Joey Hess
77e490108b
fix build-version url 2014-06-18 16:24:46 -04:00
Joey Hess
4797db5c8f silence curl 2014-06-18 16:17:57 -04:00
Joey Hess
90933360de
couple bug fixes in build-version code 2014-06-18 16:11:20 -04:00
Joey Hess
0994f4a814 fix filenames 2014-06-18 15:50:54 -04:00
Joey Hess
bd49b63aa1 fix url 2014-06-18 15:49:05 -04:00
Joey Hess
45f06f61ba better warnings 2014-06-18 15:44:16 -04:00
Joey Hess
a8daa18759 clean up unused import 2014-06-18 15:40:44 -04:00
Joey Hess
5b478722da make DistributionUpdate download build-version files and use them in the info files
Also automated downloading the builds, finally. I had done it by hand until
now.

Note that the Windows autobuilder has an expired cert, so it will refuse to
download from it currently. I have emailed its admin to get that fixed,
hopefully.

This commit was sponsored by Peter Hogg.
2014-06-18 15:24:18 -04:00
Joey Hess
a615817ab1 add Build/BuildVersion, for use by autobuilders 2014-06-18 14:29:39 -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
84227bd21c fix build 2014-06-13 11:14:50 -04:00
Joey Hess
4dd6938850 make EvilSplicer re-box file-embed's ByteStrings
The armel autobuilder started failing:

Assistant/WebApp/Types.hs:128:14:
    primitive string literal must contain only characters <= '\xFF'

This fixes that.
2014-06-13 02:18:31 -04:00
Joey Hess
37da3d7b5d
better heuristic for what is a package-qualified symbol
Hopefully this will avoid mangling css files embedded in strings inside
spliced code.
2014-05-27 20:12:16 -04:00
Joey Hess
346112d49a
proper fix for "foo"# -- need MagicHash extension 2014-05-25 23:27:48 -04:00
Joey Hess
062e37d201
typo 2014-05-25 23:09:45 -04:00
Joey Hess
9b7fa4ad07 put in hack for weird new problem with ghc's emitted splices 2014-05-25 23:03:44 -04:00
Joey Hess
4e987d05a8 work around an EvilSplicer bug
This should fix the android build. The EvilSplicer cannot fix up ghc's
misformatting of a case expression with a construstor with a lot of
parameters, which spans multiple lines.
2014-05-10 12:27:21 -03:00
Joey Hess
dc0a8b7618 Revert "add debugging for odd OOM or hang on 5 architectures, all where configure runs sha224sum"
This reverts commit 238a935f9c.

The OOM was cabal's way of telling us it couldn't resolve dependencies.
2014-04-22 20:23:37 -04:00
Joey Hess
1cd169e0c8
--detach-sign 2014-04-21 11:56:06 -04:00
Joey Hess
78d6aa1a49 sign files 2014-04-21 11:24:34 -04:00
Joey Hess
a10d3731b8 fix distributionupdate build
Including avoiding needing cabal's defines for Utility.URI
2014-04-21 10:47:26 -04:00
Joey Hess
238a935f9c add debugging for odd OOM or hang on 5 architectures, all where configure runs sha224sum 2014-04-20 19:55:08 -04:00
Joey Hess
8d45a82988 use ustar format and omit filnames with colons. new hackage requirements
The tarball on hackage will no longer correspond to the git tag. Oh well.
2014-04-11 18:45:46 -04:00
Joey Hess
407d60ca5d Remove wget from OSX dmg, due to issues with cert paths that broke git-annex automatic upgrading. Instead, curl is used, unless the OSX system has wget installed, which will then be used. 2014-04-10 12:54:58 -04:00
Joey Hess
611e060385 factor out library code (also used by propellor) 2014-04-03 21:25:59 -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
b04f62a962 make configure -Wall clean 2014-03-10 16:59:38 -04:00