Commit graph

300 commits

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