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

688 commits

Author SHA1 Message Date
Joey Hess
7ab5c346ff typo 2014-08-13 13:03:46 -04:00
Joey Hess
75b69dca58 work aroud ongong transformers-compat cabal issue 2014-08-13 13:02:35 -04:00
Joey Hess
77d55672a9 remove old ghc libs 2014-08-13 12:48:20 -04:00
Yury V. Zaytsev
e93f3b99e2 Update build.sh 
Haskell Platform now lives in C:/haskell and is on %PATH% by default, msysgit/bin (and msysgit/mingw/bin) directory is also on %PATH% (last)
 2014-08-13 11:56:47 +02:00
Joey Hess
6bfc3cf3be re-evil-splicved new version of DAV 2014-08-10 20:01:54 -04:00
Joey Hess
800f8f1028 giving up on windows autobuilder until its HP can be upgraded 2014-08-10 19:56:55 -04:00
Joey Hess
29aa5e82dc trying to work around a dep problem on windows 2014-08-10 19:26:03 -04:00
Joey Hess
f709c786d9 stop nuking cabal 2014-08-10 16:23:25 -04:00
Joey Hess
d8240ca1c1 nuke cabal on windows, so it will build new DAV 2014-08-10 16:06:20 -04:00
Joey Hess
c17bac346f provide utf-8 locale to avoid silly build failure 2014-07-14 21:18:24 -04:00
Joey Hess
6bff8291f1 Merge orca:/tmp/build 2014-07-14 17:57:50 -04:00
Joey Hess
4aa9265042 refresh haskell patches 2014-07-14 17:58:13 -04:00
Joey Hess
f268c2c8ee remove bloomfilter patch no longer needed 2014-07-14 16:55:48 -04:00
Joey Hess
5d2759aa82
fix logic 2014-07-04 13:58:09 -04:00
Joey Hess
08a737c3df
deal with android SDK change 
No longer has android-17 target, now it's android-18.
 2014-07-04 01:12:13 -04:00
Joey Hess
995cb05408 update android haskell patches 2014-07-04 00:47:49 +01:00
Joey Hess
ecddaffd3e Android: patch git to avoid fchmod, which fails on /sdcard. 2014-07-03 16:02:42 -04:00
Joey Hess
08f1f7a697 generate build-version file on windows autobuilder 2014-06-18 15:21:03 -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
2d142b4368 Merge orca:tmp/f/build 2014-06-10 22:36:12 -04:00
Joey Hess
2b8dbfe7ab refreshed haskell patches 2014-06-11 03:35:19 +01:00
Joey Hess
d4e71929ba figured out this patch 2014-06-10 16:33:47 -04:00
Joey Hess
d86b8368db skein patch seems to be needed for arm as well as android 
I don't understand why this patch is needed.
 2014-06-10 14:13:50 -04:00
Joey Hess
0fcc805bc9 vector patch also needed for arm 2014-06-10 12:42:09 -04:00
Joey Hess
2a9f78b6c8
comment back out library removal line 2014-05-29 14:13:41 -04:00
Joey Hess
68a56a691f forcing windows autobuilder to rebootstrap cabal libs 2014-05-29 13:45:30 -04:00
Joey Hess
ba1e14d502
fix gnutls to link, again 
I don't know why, but I keep finding that the way I hacked this to work
before doesn't work and a new way is needed. Perhaps changes to cabal made
my old hacks break?
 2014-05-26 17:56:41 -04:00
Joey Hess
69f793a2b2
update path to gnutls etc libs 2014-05-26 15:51:21 -04:00
Joey Hess
6dbff11251
another include needed by TH 2014-05-26 15:24:31 -04:00
Joey Hess
7145d25972
work around another dep problem 2014-05-26 13:53:53 -04:00
Joey Hess
70fd42521f
remove patch that turns out to be unnecessary 2014-05-26 13:14:50 -04:00
Joey Hess
8886ccb102 export PATH to alex and happy 2014-05-26 13:13:33 -04:00
Joey Hess
6c1ed6ed4b add imports needed for android with current ghc and libs 2014-05-25 23:00:42 -04:00
Joey Hess
fb3b1fac54 Merge orca:/tmp/build 2014-05-25 22:51:57 -04:00
androidbuilder
0f5b40a106 update remaining android patches 2014-05-26 02:47:15 +00:00
Joey Hess
ddd1a888a7 more work around for cabal dependency mess 2014-05-25 22:20:11 -04:00
Joey Hess
ddb1f25209 network-protocol-xmpp patch no longer needed 2014-05-25 21:59:13 -04:00
Joey Hess
1f05bcea98 libxml-sax patch no longer needed 2014-05-25 21:57:53 -04:00
Joey Hess
8abaafaf6d set unicode locale when building 
some packages, particularly unix-compat, fail to install in a C
locale. wow
 2014-05-25 21:44:28 -04:00
Joey Hess
6052486dc3 work around recent cabal dependency mess 2014-05-25 21:25:04 -04:00
Joey Hess
89f6f3347d Merge commit '5e9e9d3cc7f54d7aaa835ef7842a9d7a444c3fda' 2014-05-25 12:02:48 -04:00
Sören Brunk
5e9e9d3cc7 update android haskell patches 2014-05-25 10:04:37 +02:00
Joey Hess
1ce222efe9
fix abiversion lookup to work when propellor is running this script 2014-05-25 01:37:22 -04:00
Joey Hess
5ad87aae41
turn on -x debugging in these scripts 2014-05-24 14:44:20 -04:00
Joey Hess
44a3e76115 android: Run busybox install with -s, since some versions of Android prohibit making hard links. 2014-05-23 16:18:55 -04:00
Joey Hess
cb906524a6 update patch to export one more module used by TH 2014-05-22 16:31:40 -04:00
Joey Hess
f70b2a53e8 fix QuickCheck install w/o TH 2014-05-22 15:23:50 -04:00
Joey Hess
e1a17fee88 updating haskell patches, part 2 2014-05-21 12:50:08 -04:00
Your Name
5dfc43915a update haskell patches (incomplete) 2014-05-20 22:12:29 +00:00
Joey Hess
5903d20d5e Support symlinking git-annex and git-annex-shell from the Linux standalone bundle into PATH. 
Unless busybox doesn't support readlink -f, then it just uses readlink and
symlinking won't work. Also, OSX has no readlink -f so not done there.

Thanks, jlebar.
 2014-05-16 16:22:56 -04:00
Joey Hess
2aed2d8510 Merge branch 'master' into bootstrap3 
Conflicts:
	debian/changelog
 2014-05-02 15:32:49 -03:00
Joey Hess
2920554787 updated license for bootstrap 3 2014-04-29 15:03:18 -04:00
Joey Hess
ca496b6a97 Standalone builds now check gpg signatures before upgrading. 2014-04-23 13:30:30 -04:00
Joey Hess
4887f8f860 this keyring contains keys that git-annex should trust to sign upgrades 
Currently, that is the git-annex distribution signing key, 89C809CB

I have also included my personal gpg key, 2512E3C7. This is in case
something goes wrong with the other key (perhaps it gets lost), we'll
hopefully avoid locking everything out of upgradng.
 2014-04-23 12:49:09 -04:00
Joey Hess
eba3a28a28 webapp: Support using git-annex on a remote server, which was installed from the standalone tarball or OSX app, and so does not have git-annex in PATH (and may also not have git or rsync in PATH). 
* webapp: Support using git-annex on a remote server, which was installed
  from the standalone tarball or OSX app, and so does not have
  git-annex in PATH (and may also not have git or rsync in PATH).
* standalone tarball, OSX app: Install a ~/.ssh/git-annex-wrapper, which
  can be used to run git-annex, git, rsync, etc.
 2014-04-20 18:39:10 -04:00
Joey Hess
4e601cf124 more idempotency fixes 2014-04-05 13:29:17 -04:00
Joey Hess
0d965885b7
idempotency fixes 2014-04-04 19:07:53 -04:00
Joey Hess
15dc2e950b renaming build user for consistency 2014-04-04 19:00:28 -04:00
Joey Hess
2b75beaf4f got tasty-rerun working on android 2014-03-12 12:25:32 -04:00
Joey Hess
9fef973293 patch out another file perm check that does not make sense on android 2014-03-10 16:50:56 -04:00
Joey Hess
6f9f9739eb
actually use patches from linux/haskell-patches 2014-03-10 13:53:01 -04:00
Joey Hess
f7cd43cfd0 really add patch.. 2014-03-10 13:31:23 -04:00
Joey Hess
35aa055039 add a patch to disable accept4, for compatability with older systems 2014-03-10 13:29:24 -04:00
Joey Hess
efafaec3c2 update 2014-03-07 02:23:56 -04:00
Joey Hess
6c3542a1cb Merge remote-tracking branch 'orca/master' 2014-03-07 02:23:51 -04:00
Joey Hess
92aadb2865 refreshed patches 2014-03-07 06:23:03 +00:00
Joey Hess
7d2fed5810 windows build script back to normal 2014-03-01 00:33:50 -04:00
Joey Hess
9046136dd6 retrying windows yesod-static 2014-03-01 00:32:08 -04:00
Joey Hess
2fd72fc2fd Revert "force cabal rebuild on windows for warp-tls" 
This reverts commit 92ced6d0fd.
 2014-02-28 23:07:54 -04:00
Joey Hess
92ced6d0fd
force cabal rebuild on windows for warp-tls 2014-02-28 23:06:41 -04:00
Joey Hess
5df3db9027 remove hack 2014-02-25 17:56:49 -04:00
Joey Hess
6e19552c40
force DAV upgrade 2014-02-25 17:54:58 -04:00
Joey Hess
8101b964b7
fix filename 2014-02-11 01:18:29 -04:00
Joey Hess
b914620264 remove no longer needed patch 2014-02-10 23:32:56 -04:00
Joey Hess
f271d86ef6 add android patch for x509-system cert store 2014-02-11 02:50:51 +00:00
Joey Hess
e3a50f4abb refresh patches 2014-02-08 13:26:54 -04:00
Joey Hess
5f0b3b4d4e DAV fixed 2014-02-08 13:03:44 -04:00
Joey Hess
9a5f360f93 fix syntax 2014-02-07 18:38:46 -04:00
Joey Hess
a23d7abfcc avoid broken version of DAV on android 2014-02-07 17:57:04 -04:00
Joey Hess
7791060310 reorder 2014-02-07 14:52:17 -04:00
Joey Hess
e0c4b52996 added back lost certificate path fix for Android 2014-02-07 14:20:35 -04:00
Joey Hess
192d991c43 work around windows apparent random dislike of removing files 2013-12-30 14:11:40 -04:00
Joey Hess
b520aa64da fix order 2013-12-29 22:13:19 -04:00
Joey Hess
8d3dc1bfbc disable NODELAY on android 
and also refresh another patch
 2013-12-30 00:41:19 +00:00
Joey Hess
1ed415690d pin busybox at known-good version for android build 2013-12-29 16:56:01 -04:00
Joey Hess
4124a27ec9 make wrappers run git-shell, now that it's included, rather than git shell 2013-12-27 16:36:48 -04:00
Joey Hess
307c57b29b add git-shell wrappers 2013-12-27 16:06:11 -04:00
Joey Hess
01bd650e2d refreshed android patches 2013-12-27 00:32:29 -04:00
Joey Hess
b09613ebc7 update haskell patches for new versions in hackage 2013-12-26 16:17:31 -04:00
Joey Hess
7ec27d8d57 install happy and alex into android build chroot 2013-12-26 12:08:29 -04:00
Joey Hess
706c74aa98 Include git-receive-pack, git-upload-pack, and git wrappers in the Linux standalone build, and OSX app, so they will be available when it's added to PATH. 2013-12-24 16:28:10 -04:00
Joey Hess
ccef06da41 allow building webapp with EvilSplicer for non-android arm 
Was able to reuse many of the android patches, but several had to be
re-done. On Android, ghc is a stage2 build, so can compile, but not run TH
code. But debian's ghc on armel cannot even compile TH code, so it has
to be patched out.

Some haskell packages have been updated to new versions, including yesod
and DAV, and their patches had to be redone.

The Makefile now has 2 new targets. The first is run on a companion x86
system to do the build and get TH splices. Then the second target is run
the same source tree on the arm system to build without needing TH.

This commit was sponsored by Svenne Krap.
 2013-12-18 21:41:17 +00:00
Joey Hess
13b0bf17d9 begin work on installing TH-using dependencies of webapp, for standalone armel build 
Will move common patches out of android/haskell-patches.
 2013-12-16 23:05:00 -04:00
Joey Hess
c26734c7da make linker path absolute 2013-12-16 02:17:15 -04:00
Joey Hess
99f6dd01b4 Linux standalone build now includes its own glibc and forces the linker to use it, to remove dependence on the host glibc. 2013-12-16 01:51:19 -04:00
Joey Hess
e7739cb011 add linux-gate and linux-vdso dummy libs 
Just fixes a build warning; these files don't exist they are virtual DSOs
provided by the linux kernel.
 2013-12-15 19:16:44 -04:00
Joey Hess
f4e0eec2a2 Include man pages in Linux and OSX standalone builds. 2013-12-15 16:27:46 -04:00
Joey Hess
6be19b0070 Programs from Linux and OSX standalone builds can now be symlinked into a directory in PATH as an alternative installation method, and will use readlink to find where the build was unpacked. 2013-12-15 15:57:41 -04:00
Joey Hess
7f0cc0d840 update 2013-12-11 11:23:34 -04:00
Joey Hess
a319f17220 try to get it to include the cygwin ssh, not the msysgit one 2013-12-11 11:16:11 -04:00
Joey Hess
63bd83458c probing 2013-12-11 11:13:04 -04:00
Joey Hess
4a769c6d8d clean 2013-12-10 14:33:36 -04:00
Joey Hess
c1c1171ee9 update warp to fixed version 2013-12-10 14:31:47 -04:00
Joey Hess
2779e7902a remove debug 2013-12-10 14:22:17 -04:00
Joey Hess
6c1a50b4ea fix EvilLinker to not stomp on environment 2013-12-10 14:21:22 -04:00
Joey Hess
012b31548b try setting even more variables, surely one must control the tmp dir 2013-12-10 14:09:11 -04:00
Joey Hess
147349057e argh 2013-12-10 14:07:18 -04:00
Joey Hess
880aeafed8 debug 2013-12-10 14:00:22 -04:00
Joey Hess
ccb944c85a didn't work 2013-12-10 13:16:44 -04:00
Joey Hess
656ae5f823 try setting TMPDIR for collect2 to not use C:\Windows 2013-12-10 12:53:37 -04:00
Joey Hess
540d4a05fe build installer 2013-12-10 00:45:21 -04:00
Joey Hess
c1bf27ecff avoid using EvilLinker when regular cabal build succeeds 2013-12-09 15:38:57 -04:00
Joey Hess
1c22c7486b trying again for webapp in windows autobuild 2013-12-09 15:04:57 -04:00
Joey Hess
fe7d6d524e temporarily disable the evilelinker on the autobuilder, since it seems to be hanging inexplicably 2013-12-07 11:24:18 -04:00
Joey Hess
c97b53b924 windooows 2013-12-07 11:21:41 -04:00
Joey Hess
d0e21b1b68 temporarily disable webapp on autobuilder, as it's for some reason hanging the build 2013-12-07 10:54:48 -04:00
Joey Hess
456a82965e avoid re-configuring 2013-12-06 21:12:47 -04:00
Joey Hess
bac31e9d30 remove debug 2013-12-06 19:06:56 -04:00
Joey Hess
6906810b82 test 2013-12-06 15:19:54 -04:00
Joey Hess
b370f52f88 use EvilLinker on autobuilder (will probably need some more horrible path fixes) 2013-12-06 15:08:30 -04:00
Joey Hess
da644c65cf try to fix cygwin path 2013-12-06 14:56:12 -04:00
Joey Hess
3694d5efe8 yay Yury fixed it! 2013-12-06 14:53:56 -04:00
Joey Hess
4be2184e2e test 2013-12-06 14:51:09 -04:00
Joey Hess
6f408e050b test 2013-12-06 14:43:28 -04:00
Joey Hess
54f3f00fc8 test 2013-12-06 14:42:42 -04:00
Joey Hess
9ab8e146bb test 2013-12-06 14:41:33 -04:00
Joey Hess
899def82cf test 2013-12-06 14:41:01 -04:00
Joey Hess
b4f8e10e1f test 2013-12-06 14:38:31 -04:00
Joey Hess
4190d00a0f test 2013-12-06 14:37:18 -04:00
Joey Hess
1b1ea33dc9 try to fix msysgit path 2013-12-06 14:33:22 -04:00
Joey Hess
76fcf3adca stop nuking cabal again 2013-12-06 13:58:28 -04:00
Joey Hess
f977c2b8fa allow dep install to fail 
(eg, webdav is broken right now, this should not defeat the build)
 2013-12-06 13:57:33 -04:00
Joey Hess
01799cafc3 EvilLinker, stage 1 2013-12-06 12:27:21 -04:00
Joey Hess
415b316205 switching to newer haskell platform 2013-12-06 11:34:27 -04:00
Joey Hess
d6963e46d0 fixes 2013-12-05 23:08:59 -04:00
Joey Hess
a5c83e5679 fix 2013-12-05 21:37:05 -04:00
Joey Hess
416a1d0cf0 ignore expected failure 
autobuilder must have a *really* weird sh
 2013-12-05 21:28:34 -04:00
Joey Hess
7abdc55dfd fixes 2013-12-05 21:02:27 -04:00
Joey Hess
4d3c134b4a windows build foo 2013-12-05 20:40:28 -04:00
Joey Hess
b2e56dab52 temporarily disable webapp on windows; re-enable webdav on windows 
The gcc response file should make it build with webdav (fingers crossed).

webapp is waiting on a haskell platform upgrade on the autobuilder.
Current one has a too old version of network for hxt to install.
 2013-12-05 19:15:23 -04:00
Joey Hess
3e3c2bd7b6 remove -v3 2013-12-05 19:07:45 -04:00
Joey Hess
079ff2b27b -v3 2013-12-05 19:04:30 -04:00
Joey Hess
cff5b1c830 verbose 2013-12-05 18:56:33 -04:00
Joey Hess
4e5dc9a004 stop nuking cabal now ;) 2013-12-05 18:07:44 -04:00
Joey Hess
94d59d96fb rm -rf 2013-12-05 17:56:57 -04:00
Joey Hess
fee598ad43 nuke ghc too 2013-12-05 17:56:25 -04:00
Joey Hess
fef3c0a901 try fresh cabal 2013-12-05 17:55:22 -04:00
Joey Hess
c4486026e7 try to run the right gcc 2013-12-05 17:29:21 -04:00
Joey Hess
618f17b5d1 Revert "cat build.log" 
This reverts commit 70ab15cfc6.
 2013-12-05 17:25:25 -04:00
Joey Hess
70ab15cfc6 cat build.log 2013-12-05 17:24:07 -04:00
Joey Hess
0a8191dc8c run gcc in cygwin 2013-12-05 17:20:24 -04:00
Joey Hess
7208663b5c try to build with a gcc response file 2013-12-05 17:17:35 -04:00
Joey Hess
e36ee808a4 fix build 2013-12-05 13:55:01 -04:00
Joey Hess
4ebb35dc59 explicitly disable WebDAV on Windows 
For reasons suspiciously similar to 342d508e -- ie, building with it
enabled crashes the compiler, at least in my development VM.. dunno why.
 2013-12-04 17:14:24 -04:00
Joey Hess
b2e9339b57 Android: Fix SRV record lookups for XMPP to use android getprop command to find DNS server, since there is no resolv.conf. 2013-12-03 13:14:49 -04:00
Joey Hess
857548e1b7 fix gnutls 2013-11-26 19:19:47 +00:00
Joey Hess
22462ed891 fix ugly hardcoded library path to libgnutls and libnettle 2013-11-26 13:45:09 -04:00
Joey Hess
1e515b76b3 2 android bug fixes 2013-11-26 13:24:24 -04:00
Joey Hess
f5066d788a set UPGRADE_LOCATION for Windows build 2013-11-22 15:25:15 -04:00
Joey Hess
de3411bca8 re-disable assistant on Windows 
Linking dist\build\git-annex\git-annex.exe ...
ghc.exe: could not execute: C:\Program Files (x86)\Haskell
Platform\2012.4.0.0\lib/../mingw/bin/gcc.exe

What a unhelpful failure mode. Possibly argument list too long or
something?
 2013-11-12 17:44:47 -04:00
Joey Hess
9a58de553c remove -Assistant from windows build flag 2013-11-12 17:39:11 -04:00
Joey Hess
16fa980689 separate android 4.0 and 4.3 builds needed 
Also, parameterize the abdroid abi version
 2013-11-12 14:24:53 -04:00
Joey Hess
d128d1aae6 update to arm-linux-androideabi-4.8 and current cabal 2013-11-11 00:04:04 -04:00
Joey Hess
acd28220c7 refresh patches to current hackage versions 2013-10-18 22:44:06 -04:00
Joey Hess
41f80fef9f remove patches that have been applied upstream 
WTF?! My birthday is not until April 11th
 2013-10-18 21:59:48 -04:00
Joey Hess
bfc7fb817c remove no longer needed patch 2013-10-18 19:15:04 -04:00
Joey Hess
9701b9b142 comonad now depends on distributive 2013-10-18 19:11:39 -04:00
Joey Hess
ebd9f70ceb remove patch that is no longer needed 2013-10-18 19:05:33 -04:00
Joey Hess
eeb4182cb2 update some patches for new versions 2013-10-18 16:19:22 -04:00
Joey Hess
36ebf86469 add python, needed for ghc fingerprinting 2013-10-17 22:39:56 -04:00
Joey Hess
3bd3c62c0f updated android gpg version 2013-10-12 12:08:18 -04:00
Joey Hess
2943592f51 Remove bogus runshell loop check. 
git-annex.linux/git-annex can legitimately try to run itself -- this
happens when the programfile is used. So this check was bogus.
 2013-10-11 01:24:13 -04:00
Joey Hess
c869005231 future work 2013-09-23 17:39:53 -04:00
Joey Hess
5600aee90b move stuff into .android 
This simplifies my schroot bind mounts
 2013-09-23 14:20:13 -04:00
Joey Hess
ccf95fb2a2 java needs /proc mounted in the chroot? why am I surprised? 2013-09-23 13:35:49 -04:00
Joey Hess
ecd2ccb87c env sanitization 2013-09-23 13:15:34 -04:00
Joey Hess
5a99ae9511 fix cd 2013-09-23 10:25:21 -04:00
Joey Hess
420a2fc898 work around stupid licence prompt 2013-09-22 22:55:40 -04:00
Joey Hess
96b8224b63 pin term 2013-09-22 22:47:20 -04:00
Joey Hess
3b992c5b97 need gettext to build gnupg 2013-09-22 22:43:09 -04:00
Joey Hess
e1a0ae3bc6 pin rsync 2013-09-22 22:40:36 -04:00
Joey Hess
b9d5a3e9f3 grr 2013-09-22 22:39:29 -04:00
Joey Hess
9e0398e31d pin openssh 2013-09-22 22:36:00 -04:00
Joey Hess
5cce5b36f2 fix clones 2013-09-22 22:27:02 -04:00
Joey Hess
51cc760e06 working on getting make androidapp to work now 2013-09-22 22:23:08 -04:00
Joey Hess
929aa1452d fix cd 2013-09-22 21:36:45 -04:00
Joey Hess
8375e5f06d Merge remote-tracking branch 'orca/android-rebuild' into android-rebuild 2013-09-22 20:17:49 -04:00
Joey Hess
b30437b57e Merge remote-tracking branch 'in/android-rebuild' into android-rebuild 2013-09-23 01:16:42 +01:00
Joey Hess
6515ea8dde Merge remote-tracking branch 'in/master' into android-rebuild 2013-09-23 01:16:21 +01:00
Joey Hess
31b5ef6463 fix unix-time 2013-09-23 00:14:48 +00:00
Joey Hess
5e8bac96f1 cabal install from local git-annex cabal file 2013-09-22 19:30:44 -04:00
Joey Hess
e86cbcd631 reorder 2013-09-22 18:17:46 -04:00
Joey Hess
66631b4092 add 2013-09-22 17:30:04 -04:00
Joey Hess
140c69899a hamlet requires shapespeare 
also, disable forced reinstalls, which hide such problems
 2013-09-22 17:25:30 -04:00
Joey Hess
30a121b805 set git config stuff so it can commit (hate hate hate that) 2013-09-22 16:32:19 -04:00
Joey Hess
920e1a8923 cd to work dir 2013-09-22 15:58:13 -04:00
Joey Hess
ca0cd2dacc cd to home 2013-09-22 14:29:22 -04:00
Joey Hess
9a295c0653 Merge branch 'android-rebuild' of git://git-annex.branchable.com into android-rebuild 2013-09-22 19:14:10 +01:00
Joey Hess
00a12afffe successfully builds (except XMPP) 2013-09-22 19:13:31 +01:00
Joey Hess
5d052d3f9f create home dir 2013-09-22 13:52:26 -04:00
Joey Hess
a37ec465f7 apt-get clean 2013-09-22 13:15:25 -04:00
Joey Hess
c4074961c4 umount /proc 2013-09-22 13:06:32 -04:00
Joey Hess
a9881b9d0b new buildchroot script to automate android chroot setup 2013-09-22 13:03:34 -04:00
Joey Hess
7719abc044 fix typo in runshell (will update standalone builds for last release) 2013-09-22 09:45:50 -04:00
Joey Hess
6e4c1413a8 didn't need to install cabal here 2013-09-22 01:50:01 -04:00
Joey Hess
f10bae49d4 remove unused patches (2000+ lines!) 2013-09-22 01:43:52 -04:00
foo
2889211efd refresh haskell package patches for new android build 
Android build is now almost entirely automated, except for the installation
of cross-built libs needed for XMPP.

Haskell packages updated to current newest versions. Am not currently
pinning the versions, as that didn't work out last time I tried it
(must have missed some pins before).
 2013-09-22 01:43:28 -04:00
Joey Hess
94fd1eb3d5 guard against runshell loop 2013-09-19 13:33:00 -04:00
Joey Hess
5652bc6bfa add gcrypt license info 2013-09-13 12:09:48 -04:00
Joey Hess
9e8521910d Android: Fix bug in terminal app that caused it to spin using much CPU and battery. This problem was introduced in version 4.20130601. 2013-08-26 22:00:16 -04:00
Joey Hess
ff27326376 shouldn't need separate missingh install step anymore 2013-08-24 09:50:43 -04:00
Yury V. Zaytsev
7d1ba504b1 windows: MissingH-1.2.0.2 has been released and it no longer needs patching 
Signed-off-by: Yury V. Zaytsev <yury@shurup.com>
 2013-08-24 11:06:10 +02:00
Yury V. Zaytsev
16c181f257 windows: refresh missingh patch from https://github.com/jgoerzen/missingh/pull/14 
Signed-off-by: Yury V. Zaytsev <yury@shurup.com>
 2013-08-09 09:40:17 +02:00
Yury V. Zaytsev
5cf5885895 windows: bump missingh version in the autobuilder script 
Signed-off-by: Yury V. Zaytsev <yury@shurup.com>
 2013-08-09 08:51:17 +02:00
Joey Hess
f55dc1b64f OSX: Make git-annex-webapp run in the background, so that the app icon can be clicked on the open a new webapp when the assistant is already running. 2013-07-30 15:04:31 -04:00
Joey Hess
54e0bd55b4 fun with exec 2013-07-23 17:31:51 -04:00
Jimmy Tang
8ea1f3012b Update icon for osx, include a bunch of sized png's for other platforms to use 2013-07-22 16:35:34 +01:00
Joey Hess
ab7cd3435c update android icons to use new version of logo 2013-07-21 18:54:25 -04:00
Joey Hess
00f52d9e53 Android: gpg is built without --enable-minimal, so it interoperates better with other gpg builds that may default to using other algorithms for encryption. 2013-07-08 16:00:40 -04:00
Joey Hess
9f89133260 typo 2013-06-22 13:47:19 -04:00
Joey Hess
ce80b59152 re-disable test suite on Windows, still not there on autobuilder 
The autobuilder is still failing, despite it working for me locally.
Disabling the test so builds get generated.

add foo (checksum...)
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)
failed
git-annex: add: 1 failed
 2013-06-21 11:42:43 -04:00
Joey Hess
bab49ac7c6 few final bits for fully working test suite on windows 2013-06-18 16:37:54 -04:00
Joey Hess
7ccbd77b6a hack to deal with minor version skew in Data.Map when using EvilSplicer 2013-06-10 23:55:53 -04:00
Joey Hess
a48d340abd Android: Work around Android devices where the am command doesn't work. 2013-05-31 21:30:21 -04:00
Joey Hess
66ba80ac04 add git-annex-shell wrapper to linux and OSX standalone bundles 
This can be useful when not using the assistant, and putting the bundle in
PATH. This way, git-annex-shell is available for use by anything that ssh's
in.
 2013-05-31 17:02:09 -04:00
Joey Hess
24d40b9cb4 make webapp menu item be visible in all languages 2013-05-29 19:22:16 -04:00
Joey Hess
3e2d50a336 Android: Added an "Open WebApp" item to the terminal's menu. Should work for Android devices that cannot auto-open the webapp on start. 2013-05-28 18:25:27 -04:00
Joey Hess
4713f0c89d Android app: Avoid using hard links to app's lib directory, which is sometimes on a different filesystem than the data directory. 
Assumes symlinks work on all android. If not, this would need to be adapted
to try both. This worked for me.
 2013-05-23 13:54:49 -04:00
Joey Hess
e89c5b467f avoid failing build if cabal failed to update 2013-05-19 21:12:46 -04:00
Joey Hess
920c81ca14 stupid windows.. 2013-05-19 21:02:50 -04:00
Joey Hess
5b09b8d6bf seems windows sh doesn't properly handle set -e in functions 2013-05-19 20:45:54 -04:00
Joey Hess
5fbe3bc756 hmm 2013-05-19 20:41:44 -04:00
Joey Hess
0bc43407e5 do a clean build if incremental fails 2013-05-19 20:35:33 -04:00
Joey Hess
0db3e02088 ignore test suite failure until it has been gotten to work on windows 2013-05-17 19:59:54 -04:00
Joey Hess
ba49fc74c8 clean up test dir 2013-05-17 17:01:20 -04:00
Joey Hess
cbed6fe65f run test suite in cygwin so it can find utilities etc 2013-05-17 16:58:36 -04:00
Joey Hess
1e7682cf0d update 2013-05-17 16:35:35 -04:00
Joey Hess
29615eb311 run test suite on windows autobuilder 2013-05-17 16:34:19 -04:00
Joey Hess
67dfd3b4c6 cleanup 2013-05-17 14:26:29 -04:00
Joey Hess
c2e279b6ce don't hardcode path to cygwin stuff, look for it in PATH 2013-05-17 14:19:08 -04:00
Joey Hess
b1b332592f specify makensis path in build script 2013-05-17 14:06:47 -04:00
Joey Hess
cfae7841a4 export 2013-05-17 13:38:40 -04:00
Joey Hess
3b87732166 disable cygwin warnings 2013-05-17 13:23:05 -04:00
Joey Hess
ca66b64056 fixes 2013-05-17 13:16:21 -04:00
Joey Hess
5589991993 bad hunk 2013-05-17 13:12:17 -04:00
Joey Hess
00aa861b39 work around strange MissingH build fail on windows, that I cannot reproduce here 2013-05-17 13:10:41 -04:00
Joey Hess
74529501ba disable xmpp 2013-05-17 12:31:19 -04:00
Joey Hess
eec98c8655 fix path to cabal 2013-05-17 12:03:20 -04:00
Joey Hess
e4fe40da6e update 2013-05-17 11:54:36 -04:00
Joey Hess
054422b12f fix path 2013-05-17 11:38:29 -04:00
Joey Hess
61a540e1d9 reorg 2013-05-16 20:18:01 -04:00
Joey Hess
87c54deb8f update for windows 2013-05-16 19:52:23 -04:00
Joey Hess
66b1493f78 patched DNS library to use getprop to find the DNS server (dunno if it will work) 2013-05-15 20:55:32 -04:00
Joey Hess
991d09139d add DNS library to Android build environment 2013-05-15 19:11:09 -04:00
Joey Hess
f2118ab6be bugfix 2013-05-09 16:09:43 -04:00
Joey Hess
fa1f3cdb9e typo 2013-05-09 14:07:53 -04:00
Joey Hess
c113d9eee9 add cleancross target 2013-05-09 13:08:24 -04:00
Joey Hess
f19e0d9f80 fix TLS certificate handling on Android 2013-05-09 12:38:26 -04:00
Joey Hess
78e1cd172e forgot inotify 2013-05-09 11:35:01 -04:00
Joey Hess
d935314473 last few fixes to install-haskell-packages 2013-05-08 22:33:30 -04:00
Joey Hess
c9d7a8cc51 more fixes 2013-05-08 16:48:29 -04:00
Joey Hess
94d9caf1f7 Merge branch 'master' of ssh://git-annex.branchable.com 2013-05-08 14:02:25 -04:00
Joey Hess
8fe53c78c9 fix unix-time build to include cbits, and fix cbits to build 2013-05-08 14:01:47 -04:00
Joey Hess
48ce4c0597 install xmpp lib on native too 2013-05-08 13:31:30 -04:00
Joey Hess
a283f9907b few more deps 2013-05-08 12:30:39 -04:00
Joey Hess
da3ca6eb0d split native and cross builds 2013-05-08 12:23:38 -04:00
Joey Hess
5e0f1aea4a work around cabal stupidity 2013-05-08 12:16:03 -04:00
Joey Hess
4976af73e6 add more deps 2013-05-08 12:12:42 -04:00
Joey Hess
fde6436ee8 add ifelse 2013-05-08 12:10:13 -04:00
Joey Hess
c792813672 hack around DAV issue 2013-05-08 12:08:24 -04:00
Joey Hess
9734c482a9 know also installs same versions on native system , for EvilSplicer 2013-05-08 11:31:42 -04:00
Joey Hess
d5cd86b977 finally got a clean build all the way through of all haskell libs 2013-05-08 02:20:52 -04:00
Joey Hess
f013864570 script that can rebuild all haskell packages, reproducibly 2013-05-07 19:36:49 -04:00
Joey Hess
b0e4a2f74a fixes 2013-05-07 19:36:45 -04:00
Joey Hess
cb8fc922dd Merge branch 'master' of ssh://git-annex.branchable.com 2013-05-07 19:18:39 -04:00
Joey Hess
ff942cc7ee Merge branch 'master' of ssh://git-annex.branchable.com 2013-05-07 19:18:23 -04:00
Joey Hess
57767270d6 more patch cleanup 2013-05-07 19:18:21 -04:00
Joey Hess
ed58743953 remove unused patch 2013-05-07 19:17:22 -04:00
Joey Hess
a54402a047 add 2013-05-07 18:18:01 -04:00
Joey Hess
f13f9a6a7b add 2013-05-07 17:53:44 -04:00
Joey Hess
36407928a9 fix filenames 2013-05-07 17:51:04 -04:00
Joey Hess
a27770ac85 version bytestring build dep to avoid cabal hell 2013-05-07 17:46:08 -04:00
Joey Hess
f040f8acc6 add 2013-05-07 17:39:12 -04:00
Joey Hess
86e25c4019 more build fixes 2013-05-07 16:13:59 -04:00
Joey Hess
216f1dcb5d update patch, missed something 2013-05-07 16:08:57 -04:00
Joey Hess
09507924e6 rename patches for consistenct and machine application 2013-05-07 15:05:14 -04:00
Joey Hess
1e40e98a47 add patch, should fix some network issues 2013-05-07 14:59:39 -04:00
Joey Hess
621384ead3 add android.permission.WRITE_MEDIA_STORAGE 
Needed to access removable media such as USB drives.

May only work with newer versions of Android.
 2013-05-04 16:31:23 -04:00
Joey Hess
41e6c1de9a prevent openssh from checking config file permissions 
Android features filesystems with a variety of insane and wonderful
default permissions, such as ----rwxr-x
 2013-05-04 16:00:02 -04:00
Joey Hess
4a2854d6fb got hS3 to build 2013-05-04 15:34:13 -04:00
Joey Hess
71851f3180 android build fix 2013-05-04 14:25:24 -04:00
Joey Hess
82b57b65cd don't start webapp in the background, so that password prompts can work 2013-05-03 14:59:13 -04:00
Joey Hess
543ffa5b9f work around git/environment/gecos/android suck 
I don't know why, but I can't seem to set the environment variables inside
git-annex to work around the git error caused by android's crappy username
and hostname settings. This workaround works, and that's all that's good
about it.
 2013-05-03 14:08:26 -04:00
Joey Hess
063e344cbd fix setup of runshell wrapper wrapper 2013-05-03 13:17:01 -04:00
Joey Hess
e3f76de319 better webapp startup, using the terminal app's default command config 
This allows the user to turn it off easily, or only start the assistant and
not the webapp.

I was not able to determine why having runshell run the webapp segfaulted.
Strace was not helpful. Oh well, this is better anyway.
 2013-05-03 12:39:33 -04:00
Joey Hess
201f802175 set TMPDIR 2013-05-03 11:56:53 -04:00
Joey Hess
cdddc58365 fixes 2013-05-03 11:51:58 -04:00
Joey Hess
214931546c work around weird behavior when starting webapp not in shell 
It seems to need nohup, or it segfaults on startup. I suspect the problem
is the command that opens the web browser.
 2013-05-03 01:40:18 -04:00
Joey Hess
921d04501f ensure HOME exists 
The SD card could be replaced, or it got deleted some other way. Still let
git-annex start, and ensure anything that wants to write to HOME can.
 2013-05-03 01:02:38 -04:00
Joey Hess
b3a3273741 improved runshell start 
Start webapp in nohup so it doesn't close when window is closed and so it
doesn't output stuff over the shell prompt.
 2013-05-03 01:00:00 -04:00
Joey Hess
9116580312 run webapp on startup 2013-05-02 22:42:51 -04:00
Joey Hess
be253aeff9 add a runshell script to the top of the app directory 
This is mostly useful when you have adb with root access, to easily start the
git-annex environment in there.
 2013-05-02 01:43:22 -04:00
Joey Hess
d983f68911 change the default GIT_ANNEX_ANDROID_SOURCETREE location to be in ~/tmp/ 2013-05-01 22:37:20 -04:00
Joey Hess
9a24728d95 fix build stamps 2013-04-26 16:43:40 -04:00
Joey Hess
4df9036fa2 got XMPP building for Android 
Also enable local pairing, which also builds now thanks to WebDAV
fixes to the haskell network library.
 2013-04-21 19:10:23 -04:00
Joey Hess
84f0cb2ffc fix unavailable symbols in bionic, should let webdav build 2013-04-19 16:32:16 -04:00
Joey Hess
c3748ae70d got webdav going on android 2013-04-18 19:41:09 -04:00
Joey Hess
f14cb0b896 add import needed on autobuilder 2013-04-18 17:16:05 -04:00
Joey Hess
82dfd632af only one more source file to go before the android webapp links.. but not tonight 2013-04-17 01:32:05 -04:00
Joey Hess
35f2e01c23 Evil Splicer only *thought* he was evil until this commit happened. 
So many nasty hacks!
 2013-04-16 21:47:08 -04:00
Joey Hess
02459e4c66 yesod-routes stuff for android build 2013-04-15 21:02:51 -04:00
Joey Hess
ed180036d5 add some more modules used by TH splices 2013-04-15 20:49:41 -04:00
Joey Hess
3deeb02430 updated yesod packages to export TH symbols and auto-spliced yesod-form 2013-04-15 17:42:46 -04:00
Joey Hess
737ece771b update 2013-04-15 17:42:39 -04:00
Joey Hess
dd7e35ed97 incremental android builds with the EvilSplicer 2013-04-14 13:43:36 -04:00
Joey Hess
f84b8615e5 deal with $0 having spaces in it 2013-03-20 14:11:36 -04:00
Joey Hess
05dcb95a55 typo 2013-03-20 14:07:51 -04:00
Joey Hess
ff912832c0 reorganize osx app, so it can be put in PATH 
Move all the binaries and libraries under a bundle/ subdirectory;
so when it's in PATH only git-annex, runshell, and git-annex-webapp
will be available.
 2013-03-20 14:01:05 -04:00
Joey Hess
36b3c4c757 improve linux standalone bundle instuctions, mentioning the PATH setup option 2013-03-20 13:40:57 -04:00
Joey Hess
5f14ad8e36 LD_LIBRARY_PATH todo 2013-03-05 12:02:44 -04:00
Joey Hess
d9459a75b0 expanded some TH 2013-03-01 01:15:53 -04:00
Joey Hess
85db342a13 fall back to hardcoded app location 2013-03-01 00:06:32 -04:00
Joey Hess
1bc5734037 add patches porting necessary Haskell libraries to Android 
This goes all the way up to Yesod, but everything above Wai is a real hack
job, removing TH left and right.
 2013-02-28 23:43:26 -04:00
Joey Hess
1943bb31ab build fix 2013-02-28 19:46:13 -04:00
Joey Hess
422928394e fix android app upgrade hang 
rm was blocked waiting for input
 2013-02-28 19:18:56 -04:00
Joey Hess
6a52a47193 fix 2 bugs in android runshell 2013-02-28 19:12:54 -04:00
Joey Hess
e69cb08264 allow reloacting the source tree used for building android 
Putting it outside the git-annex directory is useful to me, so I don't
accidentially tar it up into my release tarball.. which almost happened today.
 2013-02-28 02:42:59 -04:00
Joey Hess
9b4c98ac52 autostart assistant 2013-02-26 15:42:29 -04:00
Joey Hess
e83808bcf7 shut up update.sh 
Its bogus warning and error confuses the autobuilder. The "error" is
non-fatal.
 2013-02-26 12:31:54 -04:00
Joey Hess
b328776abf better incremental building of android utilities, for autobuilder 
also cleaned up some cruft patches not used
 2013-02-25 23:32:19 -04:00
Joey Hess
bde0f5312c parameterize paths 2013-02-25 22:41:54 -04:00
Joey Hess
bf783d141d run system shell for interactive shell 
This way PS1 settings etc work.
 2013-02-24 14:34:47 -04:00
Joey Hess
61a12ce47f Explicitly run every command as a busybox app 
Seems that CONFIG_FEATURE_SH_STANDALONE is not working.
 2013-02-24 14:31:43 -04:00
Joey Hess
7711ce5b13 separate targets 2013-02-24 13:52:12 -04:00
Joey Hess
ac0292df95 use C shim to start Android app 
This should avoid relying on features of the Android builtin shell,
and so hopefully avoid failures like this one
http://git-annex.branchable.com/design/assistant/blog/day_197__template_haskell/#comment-07f90830f78f6495dcbdf90eb8636129

The C shim sets up busybox, and uses its builtin shell to run runshell.

It's important that busybox be configured with
CONFIG_FEATURE_SH_STANDALONE, so that while runshell is running, it
does not rely on either system utilities, or busybox being already
installed.
 2013-02-24 13:27:06 -04:00
Joey Hess
920138d5fb enable ash 2013-02-24 12:33:28 -04:00
Joey Hess
1fbd08db8b remove pause after run 
Terminal is configured to pause too.
 2013-02-23 14:50:14 -04:00
Joey Hess
e3df7ae212 typo 2013-02-23 14:33:12 -04:00
Joey Hess
acc3c8c157 try to be more robust and allow the user to see most types of failure 2013-02-23 01:08:15 -04:00
Joey Hess
e28016cb0d avoid closing app when terminal exists, to aid crash debugging 2013-02-22 17:19:49 -04:00
Joey Hess
6449e1171b forgot to add this icon 2013-02-22 17:10:41 -04:00
Joey Hess
d9ac5c9ba3 fix 2013-02-22 16:31:10 -04:00
Joey Hess
d8c10929d2 fixes 2013-02-22 16:23:59 -04:00
Joey Hess
98eeb12053 typo 2013-02-22 16:06:21 -04:00
Joey Hess
73c66c480d fixes 2013-02-22 15:49:11 -04:00
Joey Hess
efcc0d8062 add more icons 2013-02-22 15:48:53 -04:00
Joey Hess
fec4efae89 disable vi regex stuff, failed to build 2013-02-22 15:30:02 -04:00
Joey Hess
d868a785a2 make upgrades work 
Add a lib.version.so and when it's different, re-install.
 2013-02-22 15:03:12 -04:00
Joey Hess
4d4c7c31d7 enable vi 2013-02-22 14:28:13 -04:00
Joey Hess
37423de96c better logo 2013-02-21 17:26:36 -04:00