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
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
