Commit graph

457 commits

Author SHA1 Message Date
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