mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
33377 commits 13 branches 442 tags 103 MiB
Commit graph

647 commits

Author SHA1 Message Date
Joey Hess
276a67184c
fix typo in flags 2016-03-09 13:39:00 -04:00
Joey Hess
40c15871d5
remove LGPL, after removing the LGPLed file 2016-03-05 11:24:05 -04:00
Joey Hess
471a211d21
Include magic database in the linux and OSX standalone builds. 2016-02-26 11:54:15 -04:00
Joey Hess
67dc0d238f
disable new build flags for android build 2016-02-23 10:59:59 -04:00
Joey Hess
5f11e3cd26
fix path to extra dir 2016-02-19 16:51:40 -04:00
Joey Hess
398d93d4d2
Linux and OSX standalone builds put the bundled gpg last in PATH, so any system gpg will be preferred over it. 2016-02-19 16:19:19 -04:00
Joey Hess
95bbdb8680
Revert "workaround try #3" 
This reverts commit 3fe79c0d1b.

Didn't cause the overall build to fail either.
 2016-02-17 14:07:54 -04:00
Joey Hess
3fe79c0d1b
workaround try #3 2016-02-16 17:07:17 -04:00
Joey Hess
cceff0e46c
wow, this windows sh is super busted. try another hack 2016-02-15 16:15:23 -04:00
Joey Hess
7d4b4a77b1
seems false didn't cause windows shell to propigate test suite failure 2016-02-15 15:23:17 -04:00
Joey Hess
927e1a067e
fix import warnings 2016-01-14 10:30:54 -04:00
Joey Hess
d9d87fdbc9
Make the git-annex-standalone.deb prevent runshell from installing wrappers into $HOME/.ssh 2015-11-10 12:53:46 -04:00
Joey Hess
3e49f9fcab
runshell: Avoid failing when $HOME/.ssh does not exist and cannot be created. 2015-11-10 11:42:06 -04:00
Joey Hess
a4a9be9004
remove verbose flag; aws deps fixed 2015-10-19 13:54:10 -04:00
Joey Hess
3c6f314545 be verbose to debug problem with aws 2015-10-06 19:56:25 -04:00
Joey Hess
5d36efef20 force installing older warp; current fails to build 2015-10-06 16:54:41 -04:00
Joey Hess
dd38d01a11 sed out the filename from sha1sum output 2015-10-06 16:53:24 -04:00
Joey Hess
c83472145c hopefuly fix sha1sum calling; also refactor and check downloaded program's sha before using it 2015-10-06 16:44:12 -04:00
Joey Hess
d9a3ae23c5 remove workaround 2015-10-04 15:04:52 -04:00
Joey Hess
65bb52bc3b force installing older warp; current fails to build 2015-10-04 14:51:23 -04:00
Joey Hess
64a1f6d4d7 fix PATH 
zcat is needed from cygwin to build
 2015-09-11 13:46:29 -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
1bef0d9053 add \usr\bin to path 
This is where these commands are installed by the new "git for windows".
Kept the old paths too, so msysgit will still work.

This was enough to get ssh and ssh-keygen working when run at the DOS
prompt with the new git for windows installed. However, for some reason,
rsync still fails to find ssh in path when that version of git is used.
 2015-09-10 13:28:32 -04:00
Joey Hess
538ff09477 no warn tabs when building the EvilLinker and NullSoftInstaller 2015-09-01 15:07:35 -07:00
Joey Hess
a8f3f04768 No need to add HP to PATH 2015-09-01 15:05:15 -07:00
Joey Hess
4ee9cb9c6d decruft 2015-09-01 09:43:46 -07:00
Joey Hess
7133b68afe Linux standalone: Work around problem that prevented it from working properly if unpacked into a directory that contains ":" or ";" in its name. 2015-08-04 16:08:19 -04:00
Joey Hess
e320df005e allow any version of ansi-terminal 2015-08-03 13:36:26 -04:00
Joey Hess
c196f474b6 avoid pinning tasty to old version 
Newer version is needed for new version of optparse-applicative,
and any version will do.
 2015-08-03 13:22:34 -04:00
Joey Hess
8b22e1df9c last changes to fix android build 2015-08-02 23:02:53 -04:00
androidbuilder
fd982ad43f bump optparse-applicative version 2015-08-02 23:11:22 +00:00
androidbuilder
ce93ba24d4 update android patches for new version of shakespeare 2015-08-02 22:52:22 +00:00
androidbuilder
34c6e0ea1a reverted updates to new lib versions that broke android build 
I ran into several evilsplicer problems with the new lib versions, most notably including a problem with encoding of embedded binary files
 2015-08-02 19:48:36 +00:00
Joey Hess
c4bb2cb927 module name changed 2015-07-03 12:57:22 -04:00
Joey Hess
3284e177c8 modify pins to allow building on debian jessie 
Debian testing is currently a little broken for use for the android
autobuilder.
 2015-07-03 12:48:49 -04:00
Joey Hess
64b0030acc Merge orca:/tmp/android 2015-07-02 23:04:35 -04:00
Joey Hess
20be770a77 update patches for newer package versions 2015-07-02 23:03:34 -04:00
Joey Hess
b98fecc888 remove some patches that are no longer used 2015-07-02 23:02:48 -04:00
Joey Hess
ecedab0120 patch needed for new entropy version 2015-07-02 17:16:52 -04:00
Joey Hess
4b14877c19 persistent no longer needs no-th patch 2015-07-02 16:53:00 -04:00
Joey Hess
77cabc07ed update vector patch; only needed for android cross build now 2015-07-02 16:50:26 -04:00
Joey Hess
4ada52698a android: install exact same package versions for host and cross compiler 2015-07-02 15:46:05 -04:00
Joey Hess
928e291ba9 remove old patches for hamlet 2015-06-06 14:17:43 -04:00
Joey Hess
7bf40863d7 update cabal pin file for linux standalone to current stackage 2015-05-31 14:36:12 -04:00
Joey Hess
7dd1e364b2 update for TH-capable arm autobuilder 
Only 1 patched haskell package is needed on arm now.
 2015-05-31 14:05:05 -04:00
Joey Hess
5e1f1bd252 Linux standalone, OSX app: Improve runshell script to always quote shell vars, so that it will work when eg, untarred into a directory path with spaces in its name. 2015-05-26 15:38:54 -04:00
Joey Hess
5de2d147d3 update android patches 2015-05-22 14:39:50 -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
54bee7dad4 Revert "Android: Updated bundled ssh from 6.1p1 to 6.4p1." 
This reverts commit 27836a2af9.

Build didn't actually seem to succeed, for both versions of android, so
I'll need to revisit this later.
 2015-05-08 13:05:33 -04:00
Joey Hess
3cc76e3666 fix git rev for openssh on android 2015-05-08 12:59:21 -04:00
Joey Hess
4aba1c74bd remaining dataenc to sandi conversions 
I've tested all the dataenc to sandi conversions except Assistant.XMPP,
and all have unchanged behavior, including behavior on large unicode code
points.
 2015-05-07 18:07:13 -04:00
Joey Hess
c89d64d396 set rsync executable 2015-05-07 16:12:05 -04:00
Joey Hess
721d32422e typo 2015-05-07 16:11:30 -04:00
Joey Hess
41302bf6e4 fix path to wget 2015-05-07 16:05:46 -04:00
Joey Hess
18fc05ff04 Windows: Roll back to an older version of rsync from cygwin. The newer version has some dependency on a newer ssh from cygwin. 2015-05-07 15:56:40 -04:00
Joey Hess
27836a2af9 Android: Updated bundled ssh from 6.1p1 to 6.4p1. 
Tested it builds, but have not run it yet.
 2015-05-01 15:33:29 -04:00
Joey Hess
e506070646 avoid cabal update every time 2015-04-21 14:10:30 -04:00
Joey Hess
140cb56b2e add msysgit to PATH, before cyg git 2015-04-21 14:08:04 -04:00
Joey Hess
552ed5433f add NSIS to path 2015-04-21 01:28:47 -04:00
Joey Hess
d2ba5fb506 fix windows simple build script 2015-04-21 01:01:16 -04:00
Joey Hess
911335247c if ~/.ssh does not exist and cannot be created, avoid failing 2015-04-20 13:15:01 -04:00
Joey Hess
5f73bc3a12 Removed dependency on haskell SHA library, instead using cryptohash >= 0.11.0. 2015-04-19 11:05:32 -04:00
Joey Hess
cfe20dd788 update pinned versions for android and armel to use new enough http-client for proxy support 
I have not updated the autobuilder yet; these versions seem ok by
inspection.
 2015-04-18 12:44:44 -04:00
Joey Hess
e0a840e735 FORCE_GIT_VERSION hack no longer needed; windows autobuilder fixed 2015-04-18 12:19:32 -04:00
Joey Hess
b46d37a76c remove unnecessary clean 2015-04-14 15:18:23 -04:00
Joey Hess
a0b2c76deb export UPGRADE_LOCATION too 2015-04-14 15:07:12 -04:00
Joey Hess
f613827772 argh, why u no version? 2015-04-14 15:03:08 -04:00
Joey Hess
a5963bb321 clean harder 2015-04-14 15:00:39 -04:00
Joey Hess
daa8cc298d force clean 2015-04-14 14:54:49 -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
eebd62d2bc yet more autobuilder debugging 2015-04-14 14:35:32 -04:00
Joey Hess
cd5a669e05 more autobuilder debugging 2015-04-14 14:28:17 -04:00
Joey Hess
86ef14ecf0 try different path to msysgit 2015-04-14 14:19:27 -04:00
Joey Hess
b909b3ccbb remove one-off clean 2015-04-06 14:11:43 -04:00
Joey Hess
4ca5370980 force rebuild 2015-04-06 14:07:02 -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
5be536e523 Fix bug introduced in the last release that broke git-annex sync when git-annex was installed from the standalone tarball. 
This was introduced by commit 450ee53ab6

However, the same problem could affect other calls to programPath,
specifically some on the assistant. So, I fixed it at a deeper level.
 2015-03-27 12:55:18 -04:00
Joey Hess
8fa2b0e8b8 run cabal update before trying to install build deps 2015-03-19 15:55:21 -04:00
Joey Hess
ea8bba4211 correct out of date comment 2015-03-19 15:52:32 -04:00
Joey Hess
76cde095fe Linux standalone: Set LOCPATH=/dev/null to work around https://ghc.haskell.org/trac/ghc/ticket/7695 
This prevents localization from working, but git-annex is not localized anyway.
 2015-02-25 16:31:01 -04:00
Joey Hess
802e210275 more headers 2015-02-22 17:26:16 -04:00
Joey Hess
59a1430fb2 add a few exports used by generated code 2015-02-22 17:25:57 -04:00
Joey Hess
66804e14c1 get fromPersistValue imported 2015-02-22 15:55:00 -04:00
Joey Hess
eb158aa26c fix import name 2015-02-22 15:49:34 -04:00
Joey Hess
a419a56c45 EvilSplicer hacks for persistent 2015-02-22 15:43:59 -04:00
Joey Hess
52cba8242b update headers to work with spliced TH from persistent 2015-02-22 15:28:09 -04:00
Joey Hess
961f812e35 export Database.Persist.TH 2015-02-22 15:22:24 -04:00
Joey Hess
88fbb13ee3 Linux standalone: Improved process names of linker shimmed programs. 2015-02-16 19:36:26 -04:00
Joey Hess
576acece27 Merge branch 'master' of ssh://git-annex.branchable.com into relativepaths 2015-01-07 17:26:05 -04:00
Joey Hess
bfa6d17e00 remove debug prints; even going to stderr that breaks gnupg's configure script 2015-01-07 16:00:31 -04:00
Joey Hess
51684dc600 typo 2015-01-07 15:50:10 -04:00
Joey Hess
51dd68a28c smarter wrapper; detect -r link option 
/home/builder/.ghc/android-14/arm-linux-androideabi-4.8/bin/../lib/gcc/arm-linux-androideabi/4.8/../../../../arm-linux-androideabi/bin/ld: fatal error: -pie and -r are incompatible
 2015-01-07 15:48:11 -04:00
Joey Hess
a3ec1d9c12 minor typo 2015-01-07 15:37:22 -04:00
Joey Hess
605600afdb add $@ to wrapper 2015-01-07 15:36:19 -04:00
Joey Hess
508692f110 more PATH typos 2015-01-07 15:35:08 -04:00
Joey Hess
9b5ef546b9 fix path 2015-01-07 15:33:12 -04:00
Joey Hess
c5775455e7 fix -fPIE option 2015-01-07 15:30:50 -04:00
Joey Hess
fc6506b041 subshells for cd && 2015-01-07 15:11:10 -04:00
Joey Hess
0ca73b51b6 typos 2015-01-07 15:08:52 -04:00
Joey Hess
997c4575e0 fix BIGNUM related openssh build breakage 2015-01-07 14:49:04 -04:00
Joey Hess
edf48524da typo 2015-01-07 14:22:02 -04:00
Joey Hess
7ea4cd1688 fix dir name 2015-01-07 14:20:26 -04:00
Joey Hess
f6fa2e6296 typo 2015-01-07 14:17:36 -04:00
Joey Hess
06d1ccd2c7 android binary compatability is so bad we have to build all utilities twice 2015-01-07 14:14:37 -04:00
Joey Hess
550f269828 now I know why the test suite failed on the autobuilder.. MAX_PATH 2015-01-06 14:52:43 -04:00
Joey Hess
bbd5812ab0 iupdate licenses file, removing ASPL 
The git-annex dmg used to include some OSX system libraries, but it doesn't
anymore.
 2015-01-05 15:47:02 -04:00
Joey Hess
342f97159c fix cd issue 2015-01-05 12:57:54 -04:00
Joey Hess
5c77cef271 Android: Provide a version built with -fPIE -pie to support Android 5.0. 2015-01-05 12:29:20 -04:00
Joey Hess
ae72e4a62a fail windows build if test suite doesn't pass 2014-12-30 17:16:57 -04:00
Joey Hess
ed21043ab7 typo 2014-12-30 15:33:42 -04:00
Joey Hess
8428e36661 try running test in a different directory 
I have a theory that something is deleting the .t directory
or it doesn't get made in the location tried.

The last test showed:

  add:  ("recordedInodeCache",Key {keyName = "e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77", keyBackendName = "SHA256E", keySize = Just 20, keyMtime = Nothing, keyChunkSize = Nothing, keyChunkNum = Nothing},"start")
("recordedInodeCache",Key {keyName = "e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77", keyBackendName = "SHA256E", keySize = Just 20, keyMtime = Nothing, keyChunkSize = Nothing, keyChunkNum = Nothing},"end")
("writeInodeCache",Key {keyName = "e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77", keyBackendName = "SHA256E", keySize = Just 20, keyMtime = Nothing, keyChunkSize = Nothing, keyChunkNum = Nothing},"start")
git-annex: c:\jenkins\workspace\msysgit-git-annex-assistant-test\git-annex\.t\repo\.git\annex\objects\6cd\e82\SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77\SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77.cache: openFile: does not exist (No such file or directory)
FAIL
    add failed

So writeInodeCache is what's failing, and it seems to fail to write the file
despite having made the parent directory.
 2014-12-30 15:26:34 -04:00
Joey Hess
c0a10d5907 add missing patches 2014-12-04 13:50:41 -04:00
Joey Hess
33d6057ca3 cabal unpack --pristine 
Without --pristine, cabal will update the package's cabal file if a newer
one is available in hackage. But that can break applying patches.
Especially since the new version from hackage can apparently have dos line
endings, while the version from the tarball doesn't.
 2014-12-04 01:02:36 -04:00
Joey Hess
9dbd2ff6c2 convert no-th linux build to use cabal.config with pinned versions for reproducability of builds 2014-12-03 21:25:46 -04:00
Joey Hess
068b99f09f cabal install with -j1 to work around ghc qemu threading bug 2014-12-03 21:11:22 -04:00
Joey Hess
c1c096c7a5 update for debian jessie, which has libgnutls28-dev, not libgnutls-dev 2014-12-03 19:21:29 -04:00
Joey Hess
4a51016cfc update licenses file for nsis and NullSoft licences used by windows installer 2014-12-03 14:54:52 -04:00
Joey Hess
fc073b05b0 clarify where host libs come from 2014-12-03 14:51:29 -04:00
Joey Hess
c994d73fcf force recompilation of the nullsoft installer; it does not seem to be noticing changes somehow 2014-12-03 14:00:22 -04:00
Joey Hess
e3672dbe17 update license file, adding licenses of all haskell library dependencies 
This only includes dependencies from the git-annex.cabal file,
not dependencies of dependencies etc. I need some kind of automated system to
make sure I get all of those. TTBOMK, all of them are free software,
generally released under a BSD license.
 2014-12-01 17:07:11 -04:00
Joey Hess
79b33297d9 avoid false build failure in android log 2014-11-05 11:40:36 -04:00
Joey Hess
11dea710cd deal with android SDK change 
No longer has android-18 target, now it's android-19.
 2014-10-20 13:16:59 -04:00
Joey Hess
2a68655d65 pin git to known working version 2014-10-16 12:56:15 -04:00
Joey Hess
d89da41855 update git patch to current git 2014-10-16 12:30:52 -04:00
Joey Hess
05efd0c1d7 jessie has a new enough automake, so it doesn't need to be cloned here 2014-10-16 12:15:38 -04:00
Joey Hess
076e9c55ba finished convering android build to pinned packages 
Package versions match Debian jessie, except for a few differences
needed due to the different version of ghc pulling in a few buildin
packages with other versions.

Most of the patches were cherry-picked from past commits, since these are
older versions.
 2014-10-16 00:31:59 -04:00
Joey Hess
4f62c5358c android rebuild WIP 2014-10-15 14:37:21 -04:00
Joey Hess
6b08fdc818 fix build failure with empty parameter 2014-10-15 11:19:14 -04:00
Joey Hess
3332c4289b no more need for .cabal/bin in PATH 2014-10-15 01:17:17 -04:00
Joey Hess
797301b285 switching android builder to debian jessie 2014-10-14 19:21:26 -04:00
Joey Hess
352e53cc57 avoid pinning some core libs 
These vary depending on ghc version, so need to be different
in the native and android ghc cabals.
 2014-10-14 17:27:47 -04:00
Joey Hess
580b41850f avoid pinning more ghc builtins 2014-10-14 17:11:28 -04:00
Joey Hess
dadb152988 fix path 2014-10-14 17:04:39 -04:00
Joey Hess
a6d73bb8fe don't pin base 2014-10-14 17:04:33 -04:00
Joey Hess
395371ea37 make cabal.config be available whenever cabal install is run 
Ensures the constraints are consistently applied.
 2014-10-14 16:02:02 -04:00
Joey Hess
cf005058e4 use cabal.config when installing native 2014-10-14 15:34:06 -04:00
Joey Hess
7a78d111fc use pinned package versions from cabal.config 2014-10-14 15:25:02 -04:00
Joey Hess
9fd3e657e3 actual bounds from android autobuilder 2014-10-14 15:08:15 -04:00
Joey Hess
bd8ecd48b1 de-qualify import 
still building with old yesod on android and armel
 2014-10-14 14:45:15 -04:00
Joey Hess
ccc45dae92 typo 2014-10-14 12:20:37 -04:00
Joey Hess
a8b2568531 package-qualified import needed by new yesod 2014-10-14 01:25:37 -04:00
Joey Hess
375158f6b5 refresh android and no-th haskell patches to latest package versions from cabal 
Added a cabal.config file; the result of running cabal freeze.
It's not used yet (needs a newer cabal than is in debian stable),
but the plan is that once the autbuilders are swiched to jessie,
this can be used to make cabal install the same versions of packages
that this patch got building, and so avoid breaking every time eg, yesod is
upgraded.

This commit was sponsored by Daniel Atlas.
 2014-10-14 00:19:07 -04:00
Joey Hess
5cd59f896d update for yesod-form-1.4.0.2 2014-10-13 17:09:12 -04:00
Joey Hess
a1186238dc manual fixups of spices etc 2014-10-13 17:08:29 -04:00
Joey Hess
f025e825f6 build bootstrap3 module 2014-10-13 15:49:59 -04:00
Joey Hess
8362723571 update for yesod-form-1.3.15.4 2014-09-12 22:35:36 -04:00
Joey Hess
748e21c69e fix params 2014-09-12 21:01:40 -04:00
Joey Hess
3eab72d13c refresh patch 
Odd, it should have been against 0.0.6 before, but fails to apply now
 2014-09-12 20:53:54 -04:00