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

456 commits

Author SHA1 Message Date
Joey Hess
9f7e4ed811
Build with -j1 again to get reproducible build. 
This was in the cabal file earlier, and was removed because it broke the
android cross build. Moving to the git-annex target of the Makefile
will make it be used for Debian packages etc but not android cross builds
or make fast or when users build with cabal.
 2015-11-16 16:51:24 -04:00
Joey Hess
361d31fde7
Make git-annex-standalone.deb include the git-annex html documentation, desktop file, and base completion file, same as the regular git-annex.deb. 
It already had a doc-base file relating to the html documentation, and
there's no reason not to include the other stuff.
 2015-11-10 13:21:05 -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
18c57daf2e speed up fast builds 
Enabling -dynamic avoids writing out many mb of static libs.

-j parallelizes
 2015-08-27 09:31:41 -07:00
Joey Hess
fb8fec2a7b exclude thanks page to avoid lintian error about embedded gif 2015-08-19 14:12:22 -04:00
Joey Hess
485465107a Makefile: Pass LDFLAGS, CFLAGS, and CPPFLAGS through ghc and on to ld, cc, and cpp. 
As a result of the Makefile changes, the Debian package is built
with various hardening options. Although their benefit to a largely
haskell program is unknown.
 2015-08-19 13:53:57 -04:00
Joey Hess
8b22e1df9c last changes to fix android build 2015-08-02 23:02:53 -04:00
Joey Hess
a2409bc644 cleanup makefile 2015-07-23 12:51:27 -04:00
Joey Hess
386b8c394e got bash completion working for "git annex" not just "git-annex" 
This needs a patch to git to cause the git-annex completion to be
auto-loaded when completing "git annex <tab>". Otherwise, it will only
load when "git-annex" is tab completed. Once loaded, it works for both
uses. I've submitted the git patch to the git mailing list.
 2015-07-16 13:32:23 -04:00
Joey Hess
02d522a12e Debian package (and any other packages built using make install) now includes bash completion. 2015-07-13 12:26:06 -04:00
Joey Hess
797c8970d3 remove obsolete packages from android splice depends hack list 2015-07-03 12:48:08 -04:00
Joey Hess
d2aad2b212 @echo doesn't work in variabe def 2015-06-17 14:06:54 -04:00
Joey Hess
0e8f23fa06 set LC_ALL in ikiwiki build to ensure deterministic build in other locales 
smcv suggeted using C.UTF-8, but I want this to work beyond Debian, so went
with C, which seems to work ok.
 2015-06-14 10:51:48 -04:00
Joey Hess
bb7ccaa64e add commit-standalone target to refresh quilt patch 2015-06-10 13:57:04 -04:00
Joey Hess
f8affe7d6b some changed deps for android build 2015-06-10 13:48:00 -04:00
Joey Hess
e0c2bcdc74 Build documentation with deterministic=1 for reproducible builds. (A new ikiwiki feature.) Closes: #785736 2015-06-09 17:53:55 -04:00
Joey Hess
8976e4755c fast build mode no longer links exe with recent cabal 
I tried removing the --no-link, but then the link fails. Which must be why
cabal is using it.
 2015-06-09 14:00:51 -04:00
Joey Hess
9009c4386a more -fno-warn-tabs 2015-05-31 21:18:52 -04:00
Joey Hess
e8e444c4e4 remove targets no longer needed since TH works on arm 2015-05-31 16:49:25 -04:00
Joey Hess
b97e9c1c2d compress standalone tarball with gzip --rsyncable 
This should cut down on transfer overhead; in particular the arm
autobuilder is on a slow pipe.
 2015-05-31 16:36:50 -04:00
Joey Hess
610a9046ef fix cabal file munging code to work with current cabal file 2015-05-22 14:55:48 -04:00
Joey Hess
5edd322a42 correct path for trustedkeys 2015-05-22 14:01:11 -04:00
Joey Hess
1b01322de0 OSX: Corrected the location of trustedkeys.gpg, so the built-in upgrade code will find it. Fixes OSX upgrade going forward, but older versions won't upgrade themselves due to this problem. 2015-05-22 13:41:47 -04:00
Joey Hess
8e40cb6f56 Build documentation with TZ=UTC for reproducible builds. See #785736. 2015-05-19 15:45:21 -04:00
Joey Hess
a2fd8be337 adjust fast build so that ./ghci works with ghc 7.8.4 2015-05-14 14:47:53 -04:00
Yaroslav Halchenko
cb23224ba3 ENH: make debianstandalone{,-dsc} rules 
Moved rules out of debian/rules and avoided need for patching it for
standalone builds
 2015-05-11 11:50:59 -04:00
Joey Hess
e980c56f7f apply same fix to sdist target 2015-03-27 18:01:29 -04:00
Joey Hess
6b89692008 Fix make build target. Thanks, Justin Geibel. 2015-03-27 18:00:32 -04:00
Joey Hess
22c9bbdcdf use new mans target for install-mans, fixing OSX build 2015-03-27 13:09:56 -04:00
Joey Hess
bc1c18a951 move build man pages to man/ from top dir 2015-03-23 15:43:45 -04:00
Joey Hess
daec4b007a splitting up the man page 
Common command man pages all split out and often expanded.

A few sections split out into their own pages.

Still need to do all the other commands..
 2015-03-23 15:36:10 -04:00
Joey Hess
5c2ad84d28 switch to pattern target to build mans 2015-03-23 12:24:20 -04:00
Joey Hess
408669a444 add unordered-containers 2015-02-22 17:46:34 -04:00
Joey Hess
802e210275 more headers 2015-02-22 17:26:16 -04:00
Joey Hess
b6acb2e22b pass pie options to C compiler, not just to linker 2015-01-06 13:16:32 -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
1f6d3ae62f fix path 2014-08-16 13:50:12 -04:00
Joey Hess
6f2213e679 avoid warning about -XMagicHash 2014-08-15 10:58:18 -04:00
Joey Hess
3a9cb6b23b better way to generate tags 2014-07-01 15:11:47 -04:00
Joey Hess
71bb76ee75 sort tags 
vim complains if file is not sorted
 2014-06-30 18:39:30 -04:00
Joey Hess
a536589422 more robust hothasktags 
Works around bug: https://github.com/luqui/hothasktags/issues/18
 2014-06-30 18:15:46 -04:00
Joey Hess
5b478722da make DistributionUpdate download build-version files and use them in the info files 
Also automated downloading the builds, finally. I had done it by hand until
now.

Note that the Windows autobuilder has an expired cert, so it will refuse to
download from it currently. I have emailed its admin to get that fixed,
hopefully.

This commit was sponsored by Peter Hogg.
 2014-06-18 15:24:18 -04:00
Joey Hess
a615817ab1 add Build/BuildVersion, for use by autobuilders 2014-06-18 14:29:39 -04:00
Joey Hess
346112d49a
proper fix for "foo"# -- need MagicHash extension 2014-05-25 23:27:48 -04:00
Joey Hess
ca496b6a97 Standalone builds now check gpg signatures before upgrading. 2014-04-23 13:30:30 -04:00
Joey Hess
515d251127
better approach for building distributionupdate 
Use cabal include file
 2014-04-21 10:57:01 -04:00
Joey Hess
67e280baa9
nuke tmp dir so things don't linger between builds 2014-04-10 13:08:07 -04:00
Joey Hess
8d5a626a0b rename favicon.png to logo_16x16.png 
This was never used as a favicon, it's just a png version of the
favicon.ico. It's actually used for the freedesktop menu file.
 2014-03-16 15:52:16 -04:00
Joey Hess
a2886f2dd3
fix build of DistributionUpdate 2014-02-21 12:08:25 -04:00
Joey Hess
bfa07a8a80 cabal configure in distributionupdate so build files are fresh 2014-02-10 15:16:08 -04:00
Joey Hess
6d5efe34dc exclude user pages and devblog from doc build 2014-02-02 16:16:47 -04:00
Joey Hess
998d76ae04 Revert "temporarily revert tasty-rerun support for this release" 
This reverts commit 8fcf041159.
 2014-01-27 14:22:44 -04:00
Joey Hess
8fcf041159 temporarily revert tasty-rerun support for this release 
revert c340d9506c

tasty-rerun is stuck in NEW in debian
 2014-01-27 13:58:43 -04:00
Joey Hess
c340d9506c tasty-rerun! make rerest runs much much faster than running whole test suite 2014-01-24 12:21:30 -04:00
Joey Hess
34ab826e6c git pull in distributionupdate 2014-01-03 17:11:19 -04:00
Joey Hess
df3060cccb add -size to hdiutil call, it seems its own size calculation is buggy and so it has been failing 
Also re-add removed file, seem to work now.

hdiutil has *horrible* error reporting. You get back a number from 1 to
1000, with no indication of the problem. --verbose doesn't help.
So this is all guesswork.
 2013-12-30 13:59:25 -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
5897fb4a86 convert hacky shell linux mklibs code to haskell ; fixing symlink bug 
The shell code was nasty, and buggy. New haskell code is much nicer,
and it's easy to do complicated calculations to properly convert possibly
absolute symlinks between libraries into relative links using it.
 2013-12-24 13:13:17 -04:00
Joey Hess
73492b263a avoid shimming ld.so! 2013-12-20 21:10:46 -04:00
Joey Hess
e1d5b88945 fix android build 2013-12-19 20:24:37 -04:00
Joey Hess
8f75f7e10d fix dep 2013-12-19 12:44:18 -04:00
Joey Hess
c315b88304 fix path 2013-12-19 01:10:34 -04:00
Joey Hess
c003d3e441 avoid rebuilding when making linuxstandalone on stage2 on armel 2013-12-18 22:33:12 -04:00
Joey Hess
29c807ae45 Merge remote-tracking branch 'orca/master' 2013-12-18 17:49:12 -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
96a62dadd7 fix shimming code to detect executables like ssh that file(1) says are shared objects 2013-12-18 16:11:06 -04:00
Joey Hess
604e6b87fb work around git path-defying behavior that broke "git annex" in standalone tarball, while "git-annex" worked 2013-12-16 20:47:48 -04:00
Joey Hess
f3c9ecd65a add some missing gconv files from libc6 to standalone bundle 2013-12-16 20:29:25 -04:00
Joey Hess
7f0e385db4 fix gconvdir 2013-12-16 20:24:34 -04:00
Joey Hess
a975bace8a add $@ to shim 2013-12-16 02:13:36 -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
f119c625bb work around strange hdiutil crash on git-annex-shell.1 
Suspect this is due to the UDBZ format.
 2013-12-15 17:09:56 -04:00
Joey Hess
1875b90f38 also need to set PREFIX in osxapp 2013-12-15 16:53:31 -04:00
Joey Hess
3c90544635 should fix man installation dir on osxapp 2013-12-15 16:40:35 -04:00
Joey Hess
f4e0eec2a2 Include man pages in Linux and OSX standalone builds. 2013-12-15 16:27:46 -04:00
Joey Hess
41e808ec65 no more OSX bz2 2013-11-26 16:35:57 -04:00
Joey Hess
ed09d2d73e enable XMPP on android 2013-11-26 19:22:16 +00:00
Joey Hess
516b61df14 avoid excesive cabal configure when rebuilding android 2013-11-26 19:21:22 +00:00
Joey Hess
5163d5fb39 ensure that Android TH splice is expanded in native side of build 2013-11-25 13:01:53 -04:00
Joey Hess
399ef340f3 completely untested OSX upgrade code 2013-11-24 15:53:15 -04:00
Joey Hess
4776e1d7b7 use manifest file instead of blindly removing the whole git-annex.linux directory 
FIXME: dirContentsRecursive does not find empty directories
 2013-11-24 01:41:13 -04:00
Joey Hess
8cae49ebaf add git-annex.MANIFEST files to linux and osx standalone images 2013-11-24 00:30:21 -04:00
Joey Hess
f10daec794 distribution info file updater program 2013-11-22 12:21:53 -04:00
Joey Hess
b245aa40df moving git-repair to its own package 2013-11-18 13:24:55 -04:00
Joey Hess
bafe34a360 Merge branch 'master' of ssh://git-annex.branchable.com 2013-11-18 10:43:23 -04:00
Joey Hess
0446e29e77 temporatily still make bz2 
jimmy's autobuilder only exports that filename
 2013-11-17 22:46:04 -04:00
Mike Magin
345d872932 Change .dmg build to include compression and not be fixed size. 2013-11-17 22:40:40 -04:00
Mike Magin
b9b6f671e2 Add explicit path to find invocation in "make clean" target. 2013-11-17 15:10:40 -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
4f871f89ba git-recover-repository 1/2 done 2013-10-20 17:50:51 -04:00
Joey Hess
319d194040 GHCMAKE not used 2013-10-06 17:34:10 -04:00
Joey Hess
00a12afffe successfully builds (except XMPP) 2013-09-22 19:13:31 +01:00
Joey Hess
ccbb379536 avoid setting PREFIX if already set 2013-09-12 16:22:03 -04:00
Joey Hess
c937d5b9f2 fix .o cleaning 2013-09-11 13:28:08 -04:00
Joey Hess
2d7b4517ab got hdevtools working again 
Fix comment to not make cpp unhappy
 2013-07-27 13:00:49 -04:00
Joey Hess
00e6663128 linux standalone auto-install icons 2013-07-09 20:50:41 -04:00
Joey Hess
a987012af1 typo 2013-06-17 11:12:18 -04:00
Joey Hess
71851f3180 android build fix 2013-05-04 14:25:24 -04:00
Joey Hess
c56c9355cb only set ANDROID_FLAGS if not already set 2013-05-04 14:16:15 -04:00
Joey Hess
4aae976f7e android build improvements 2013-05-02 16:07:44 -04:00
Joey Hess
2e019a1da6 don't fail android build if there are no splices 2013-05-02 11:18:01 -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
9f4017003f enable webdav on android 2013-04-19 17:30:05 -04:00
Joey Hess
f4b6bdc4df disable WebDAV on Android; fails to link due to missing symbols 
Seems the haskell network library wants to use some DNS lookup
stuff that is not in android libc.
 2013-04-18 20:37:41 -04:00
Joey Hess
866297bf20 fix quoting bug 2013-04-18 19:46:11 -04:00
Joey Hess
a28c9360c0 use same configure flags for both parts of android build 2013-04-18 17:29:27 -04:00
Joey Hess
734a2bd47b move after -Wall 2013-04-18 14:16:59 -04:00
Joey Hess
2c06b4587c typo 2013-04-18 13:35:42 -04:00
Joey Hess
b521b64cf4 build fix 2013-04-18 12:50:59 -04:00
Joey Hess
6bf44bfbc5 add missing dep 2013-04-17 11:38:55 -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
9fdca995de very close now.. but still so far 2013-04-17 00:51:29 -04:00
Joey Hess
96a5f19f3f squelch warnings 2013-04-16 22:46:10 -04:00
Joey Hess
9f7bef4750 propigate fail 2013-04-16 19:19:53 -04:00
Joey Hess
7f67e5f763 show part of log on compile error 2013-04-16 18:34:03 -04:00
Joey Hess
854d5c0471 ignore tmp for tags 2013-04-16 13:19:56 -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
d786564a85 android build fixes 2013-04-15 19:38:21 -04:00
Joey Hess
b5e97c50f4 android build fix 2013-04-15 19:14:18 -04:00
Joey Hess
34472ecbe5 build android with EvilSplicer, including webapp (doesn't 100% succeed yet) 2013-04-15 17:43:28 -04:00
Joey Hess
1117f5ba27 avoid displaying splices on the console during build 
There are some insanely large ones, and that was just not nice.
Downside is all warnings and errors are also not shown during the native
part of the build (but the cross build will still show any it has).
 2013-04-14 17:03:41 -04:00
Joey Hess
bd7e45bcb3 better cleaning yet 2013-04-14 16:57:37 -04:00
Joey Hess
187e8aa57a better cleaning 2013-04-14 16:50:28 -04:00
Joey Hess
b179a6af58 remove dup 2013-04-14 16:17:34 -04:00
Joey Hess
83004de111 avoid runghc 2013-04-14 16:10:38 -04:00
Joey Hess
dd7e35ed97 incremental android builds with the EvilSplicer 2013-04-14 13:43:36 -04:00
Joey Hess
1112628cdf Avoid using runghc when building the Debian package, as that needs ghci. 2013-04-07 17:15:58 -04:00
Joey Hess
7bf6ca4e0d skip files in dist 2013-03-28 15:08:29 -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
1760a2e98c make tags in bg 2013-03-17 16:27:34 -04:00
Joey Hess
45311595ea fix running test from debian/rules 2013-03-14 16:55:12 -04:00
Joey Hess
4ac299eafb avoid double build from debian/rules 2013-03-14 16:45:54 -04:00
Joey Hess
e63a983cf1 pass -O0 in fast mode 2013-03-12 16:40:24 -04:00
Joey Hess
ccb7e5cfa4 got hdevtools working on the git-annex source tree 2013-03-12 05:51:34 -04:00
Joey Hess
d1f15e4ba5 better bg tags generation 2013-03-11 18:13:18 -04:00
Joey Hess
c961d97604 be quiet when making tags in bg 2013-03-11 15:39:24 -04:00
Joey Hess
c15023a8b4 update tags on dev build 2013-03-11 14:44:54 -04:00
Joey Hess
b889721afd switch CABAL to cabal 
<joeyh> anyone know why runghc Setup.hs is behaving differently than cabal configure for me?
<joeyh> I'm getting different flags selected
<geekosaur> joeyh, runghc Setup.hs uses --global by default
<geekosaur> cabal uses --local
<nomeata> joeyh: I don’t know the reasons, but I have made similar observations as well
<geekosaur> and if that means different libraries/versions visible, that can affect flag solving
<joeyh> aha!
<monochrom> it is because Cabal authors expect normal people to use cabal-install and linux distro creators to use Setup
<monochrom> the expectation is documented nowhere
 2013-03-10 17:21:13 -04:00
Joey Hess
14459a186f allow overriding CABAL 2013-03-10 16:44:03 -04:00
Joey Hess
a2d94bd627 Switch from using regex-compat to regex-tdfa, as the C regex library is rather buggy. 2013-03-08 15:29:01 -04:00
Joey Hess
459b9e8ab3 reuse fast build for make test 2013-03-07 19:07:25 -04:00
Joey Hess
051622c6da send hothasktags stderr to null 2013-03-03 23:33:22 -04:00
Joey Hess
6a52a47193 fix 2 bugs in android runshell 2013-02-28 19:12:54 -04:00
Joey Hess
843df51f06 use Setup.hs rather than depending on cabal-install 
Based on a patch from Peter Simons
 2013-02-28 16:08:11 -04:00
Joey Hess
0bca392206 remove Fast flag, pass -O0 to cabal 2013-02-28 16:03:35 -04:00
Joey Hess
c11aa969e5 Android: Enable test suite. 2013-02-27 23:26:14 -04:00
Joey Hess
e7b78c2eec re-enable fast autobuild from vim 2013-02-27 21:41:51 -04:00
Joey Hess
b1e1043bdb faster fast builds 2013-02-27 20:11:25 -04:00