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

305 commits

Author SHA1 Message Date
Joey Hess
15fda7f452 fix infinite recursion on failed parse 2013-12-09 15:34:56 -04:00
Joey Hess
0e729fdff6 wall clean 2013-12-09 15:28:33 -04:00
Joey Hess
5017523183 record output to file 2013-12-09 15:22:53 -04:00
Joey Hess
d5981949e0 detect parse failure where command is somehow empty (wtf?) 2013-12-09 15:17:55 -04:00
Joey Hess
c737299ebf more horrible path fixup 2013-12-08 15:42:27 -04:00
Joey Hess
fc40432cff typo 2013-12-07 11:18:02 -04:00
Joey Hess
50f4f2b1ef debug 2013-12-07 11:14:54 -04:00
Joey Hess
24469a7d54 lose the -v2, unneeded 2013-12-07 11:13:02 -04:00
Joey Hess
5cdd933117 improve debuggin on failure 2013-12-06 18:50:13 -04:00
Joey Hess
ce3f5138c2 improve parser robustness 2013-12-06 18:26:52 -04:00
Joey Hess
db26e3c4de try to fix collect2 output parser 2013-12-06 18:06:39 -04:00
Joey Hess
fee56536dc more verbose cabal 2013-12-06 17:38:41 -04:00
Joey Hess
ec090f609f more paths 2013-12-06 15:24:39 -04:00
Joey Hess
5a03e1cacc better output 2013-12-06 15:18:13 -04:00
Joey Hess
1910795ddf error reporting 2013-12-06 15:15:47 -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
48b4650520 aaargh 2013-12-06 14:58:26 -04:00
Joey Hess
dea7dedaf8 more path mangling, because DOS 2013-12-06 14:46:32 -04:00
Joey Hess
3b3276988c propigate ld failure 2013-12-06 14:29:58 -04:00
Joey Hess
b97fe204ba progress 2013-12-06 14:20:44 -04:00
Joey Hess
5b5c33e06d pass COLLECT_GCC_OPTIONS 2013-12-06 13:53:58 -04:00
Joey Hess
237f72990e now it gets truely nightmarish 2013-12-06 13:39:35 -04:00
Joey Hess
a5644eeeb9 gcc output parser 2013-12-06 13:27:29 -04:00
Joey Hess
0bf516d018 foo 2013-12-06 13:14:01 -04:00
Joey Hess
6b30b66160 mangle \ in paths (sheesh) 2013-12-06 12:55:32 -04:00
Joey Hess
598dc56222 update 2013-12-06 12:48:39 -04:00
Joey Hess
03f0fa1f2f debug 2013-12-06 12:44:40 -04:00
Joey Hess
639808658d EvilLinker stage 2 2013-12-06 12:43:30 -04:00
Joey Hess
01799cafc3 EvilLinker, stage 1 2013-12-06 12:27:21 -04:00
Joey Hess
0d91432442 test for nocache at configure time 2013-12-01 15:12:32 -04:00
Joey Hess
4882a611e5 assistant: Batch jobs are now run with ionice and nocache, when those commands are available. 2013-12-01 14:53:15 -04:00
Joey Hess
3a80ab53f4 fix 2 commands 2013-11-25 14:14:45 -04:00
Joey Hess
e2f50f5110 Added support for quvi 0.9. Slightly suboptimal due to limitations in its interface compared with the old version. 2013-11-24 23:44:30 -04:00
Joey Hess
fead2941cd linux upgrade code debugged and working 2013-11-24 00:26:20 -04:00
Joey Hess
0e8e684d6c no-op change to ensure configure is re-run on autobuilders to pick up UPGRADE_LOCATION 2013-11-22 15:25:42 -04:00
Joey Hess
d0e063e618 improve commit message 2013-11-22 15:05:00 -04:00
Joey Hess
8ff858edfa sync files to website too 2013-11-22 15:02:31 -04:00
Joey Hess
3f85d851bb use .info, allow multiple info files in same directory 2013-11-22 14:59:01 -04:00
Joey Hess
f10daec794 distribution info file updater program 2013-11-22 12:21:53 -04:00
Joey Hess
e2f17e9da3 upgrade alerts 
The webapp will check twice a day, when the network is connected, to see if
it can download a distributon upgrade file. If a newer version is found,
display an upgrade alert.

This will need the autobuilders to set UPGRADE_LOCATION to the url
it can be downloaded from when building git-annex. Only builds with that
set need automatic upgrade alerts.

Currently, the upgrade page just requests the user manually download
and upgrade it. But, all the info is provided to do automated upgrades
in the future.

Note that urls used will need to all be https.

This commit was sponsored by Dirk Kraft.
 2013-11-21 17:49:56 -04:00
Joey Hess
28a64c8fd8 Include ssh-keygen in standalone bundle. 2013-11-08 14:29:47 -04:00
Joey Hess
8aa22a57ca use pure or return rather than (:[]) or \x -> [x] 2013-11-06 01:18:22 -04:00
Joey Hess
faf032c55a avoid using "gcrypt" for git-remote-gcrypt; there's also a library by that name 2013-10-21 18:45:19 -04:00
Joey Hess
b6794f174e note on nice 2013-10-17 16:13:33 -04:00
Joey Hess
aff125ddab try working around windows xargs problem 2013-10-17 15:56:56 -04:00
Joey Hess
c5cd8729f2 fix inclusion of -gitrev 2013-10-16 10:33:32 -04:00
Joey Hess
ecb4a30548 Work around sed output difference that led to version containing a newline on OSX. 2013-10-16 10:28:13 -04:00
Joey Hess
c80bc53960 cronner builds, should work (untested) 
I probably need to improve handling of the PleaseTerminate exception to
kill the fsck process. Also, if fsck finds bad files, something needs
to requeue downloads of them. Otherwise, this should work, but is probably
quite buggy since I have only tested the pure code over the past 2 days.
 2013-10-08 18:13:08 -04:00
Joey Hess
990924703f factor out Build.Version 2013-10-06 17:48:38 -04:00
Joey Hess
5ac0fcd12f oops 2013-09-22 21:47:24 -04:00
Joey Hess
746d3d5e1f one more EvilSplicer hack for the night 2013-09-22 20:34:20 -04:00
Joey Hess
9aa4ec6ee0 fix broken EvilSplicer change 2013-09-22 15:36:56 -04:00
Joey Hess
cc71315c50 improve lambdaparens hack 2013-09-22 11:41:26 -04:00
Joey Hess
8806fa9a8f another fine hack 2013-09-22 03:22:05 -04:00
Joey Hess
a9cb7d4744 add git-remote-gcrypt to bundle when available 2013-09-13 12:05:47 -04:00
Joey Hess
dbf4156223 fix 2013-09-12 13:17:25 -04:00
Joey Hess
dfcf72890d enbolden man page 2013-09-12 12:59:53 -04:00
Joey Hess
46b6d75274 Youtube support! (And 53 other video hosts) 
When quvi is installed, git-annex addurl automatically uses it to detect
when an page is a video, and downloads the video file.

web special remote: Also support using quvi, for getting files,
or checking if files exist in the web.

This commit was sponsored by Mark Hepburn. Thanks!
 2013-08-22 18:50:43 -04:00
Joey Hess
672cfc3923 better git version checking 2013-08-02 18:32:26 -04:00
Joey Hess
00e6663128 linux standalone auto-install icons 2013-07-09 20:50:41 -04:00
Joey Hess
80b390560e install to ~/.local/icons, not ~/icons 
Apparently the Icon Theme Specification no longer matches reality,
as implemented by XFCE and xdg-icon-resource.
 2013-07-09 20:16:07 -04:00
Joey Hess
19b8bcbe30 Install XDG desktop icon files. 
The icon files will be installed when running make install or cabal
install. Did not try to run update-icon-caches, since I think it's debian
specific, and dh_icons will take care of that for the Debian package.

Using the favicon as a 16x16 icon. At 24x24 the svg displays pretty well,
although the dotted lines are rather faint. The svg is ok at all higher
resolutions.

The standalone linux build auto-installs the desktop and autostart files
when run. I have not made it auto-install the icon file too, because
a) that would take more work to include them in the tarball and find them
b) it would need to be an install to ~/.icons/, and I don't know if that
   really works!
 2013-07-09 19:56:30 -04:00
Joey Hess
53d52d57c1 check in configure if ionice -c3 works 
On old systems, it may need to be run as root.
 2013-06-21 13:43:04 -04:00
Joey Hess
d901ba1781 assistant --autostart: Automatically ionices the daemons it starts. 2013-06-21 13:23:20 -04:00
Joey Hess
3d13e2a305 add cygattr-1.dll to windows installer 
Needed by cygwin cp
 2013-06-17 22:15:56 -04:00
Joey Hess
d5ba9cb728 Allow building with gpg2. 2013-05-19 17:59:58 -04:00
Joey Hess
dcf46bde1b syntax fix 2013-05-17 14:24:07 -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
39ac8d18ed Sanitize debian changelog version before putting it into cabal file. Closes: #708619 2013-05-17 11:24:18 -04:00
Joey Hess
db05bfbe9d fix uninstall of some files 2013-05-16 20:41:20 -04:00
Joey Hess
34b8f4f5fd add windows uninstaller 2013-05-16 20:32:59 -04:00
Joey Hess
5a31a0c33b typo 2013-05-16 20:11:55 -04:00
Joey Hess
89719063f6 add license to windows installer 2013-05-16 20:00:31 -04:00
Joey Hess
25cb9a48da fix the day's Windows permissions damage 2013-05-14 20:15:14 -04:00
Joey Hess
adbbb71ccb windows installer is fully working 2013-05-14 19:59:14 -05:00
Joey Hess
6cbca01261 add check for git 2013-05-14 17:24:00 -04:00
Joey Hess
73052a1c90 untested nullsoft installer generator 2013-05-14 17:01:45 -05:00
Joey Hess
dc66b1f27d Merge branch 'master' into windows 
Conflicts:
	Annex/Environment.hs
	Build/Configure.hs
	Git/Construct.hs
	Utility/FileMode.hs
 2013-05-14 15:37:24 -04:00
Joey Hess
abe8d549df fix permission damage (thanks, Windows) 2013-05-11 23:54:25 -04:00
Joey Hess
629dd2767c rename var 2013-05-10 18:52:35 -04:00
Joey Hess
3d29f50415 only update version in cabal file on release builds 
This was being very annoying in windows.
(cherry picked from commit 07b0bf4cee)
 2013-05-10 18:51:21 -04:00
Joey Hess
763cbda14f fixup #if 0 stubs to use #ifndef mingw32_HOST_OS 
That's needed in files used to build the configure program.
For the other files, I'm keeping my __WINDOWS__ define, as I find that much easier to type.
I may search and replace it to use the mingw32_HOST_OS thing later.
 2013-05-10 16:57:21 -05:00
Joey Hess
07b0bf4cee only update version in cabal file on release builds 
This was being very annoying in windows.
 2013-05-10 15:36:31 -05:00
Joey Hess
524ffd1e68 fix changelog version parse to work on windows 
The CHANGELOG file, as a symlink, cannot be read on windows. So read
debian/changelog. Also, newline compat.
 2013-05-10 15:26:53 -05:00
Joey Hess
258af9c6da explicity use sh -c when running shell commands 
This is necessary to work in Windows. (And will only work when building in Cygwin.)
 2013-05-10 15:21:32 -05:00
Joey Hess
a05b4619bb stub out posix stuff for Windows 
This is enough to let the configure program build.
 2013-05-10 15:08:53 -05:00
Joey Hess
7e5af65110 add a hack to get build working with new library build 2013-05-08 12:52:48 -04:00
Joey Hess
d38854f3d1 configure: Better checking that sha commands output in the desired format. 
Run the same code git-annex used to get the sha, including its sanity
checking. Much better than old grep. Should detect FreeBSD systems with
sha commands that output in stange format.
 2013-05-08 11:17:09 -04:00
Joey Hess
322e7f44c1 cabal does not like ~ in version numbers, work around (for backports) 2013-05-04 12:24:01 -04:00
Joey Hess
e70a969ef1 EvilSplicer: fix handling of newlines in multiline strings 2013-05-02 22:56:06 -04:00
Joey Hess
25c8258225 fix build 2013-04-24 11:08:35 -04:00
Joey Hess
10fc9bc667 fix build 2013-04-24 10:48:06 -04:00
Joey Hess
b9341fd4c0 handle rpath in OSXMkLibs 
Now oberon has some binaries and libraries that use rpath, so I had to put
in this ugly hack to replace the @rapth/lib with the lib in the app.

This was particularly tricky for libraries that use @rpath because I could
not find a way to extract the rpath from the library. (Only from the
executable, by running it.. ugh!) The hack I put in place may fail if
multiple different libraries use rpath to refer to other libraries,
and the "@rpath/lib" string is the same, but actually refers to different
files.
 2013-04-22 13:33:29 -04:00
Joey Hess
5faedad2d6 recent change broke this 2013-04-20 19:35:33 -04:00
Joey Hess
d2e92e2494 Install FDO desktop menu file when webapp is started in standalone mode. 2013-04-20 18:48:05 -04:00
Joey Hess
79c0a6f807 argh!! http://hackage.haskell.org/package/zeroth 2013-04-18 20:10:31 -04:00
Joey Hess
715e68ad58 avoid adding parens to lambdas in tuples 2013-04-18 15:07:29 -04:00
Joey Hess
6ee4c2038e run lambda parenthesisation recursively inside the body of the lambda 2013-04-18 14:31:39 -04:00
Joey Hess
b86712ca80 fix lambda parenthesisation 2013-04-18 14:17:24 -04:00
Joey Hess
0d833239f1 fix build 2013-04-18 12:34:14 -04:00
Joey Hess
cc4d11eadd tighten search and replace slightly 2013-04-17 13:18:53 -04:00
Joey Hess
e62de3f3b8 split out library 2013-04-17 12:02:44 -04:00
Joey Hess
6f8ec9a1d2 argle 2013-04-17 11:57:46 -04:00
Joey Hess
faa9b4473c remove module definitions for these standalone programs 
Sometimes ghc --make skips building these binaries, as it sees no Main
module.
 2013-04-17 11:54:27 -04:00
Joey Hess
7858f92e1a minor cleanup 2013-04-17 02:51:59 -04:00
Joey Hess
9fdca995de very close now.. but still so far 2013-04-17 00:51:29 -04:00
Joey Hess
e9738fd10d deal with GHC's broken layout of case expressions. ARGH why GHC WHY?!?! 2013-04-17 00:01:25 -04:00
Joey Hess
ab905a55fb Splicer contines his evil ways (and Joey goes slowly insane) 2013-04-16 22:28:42 -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
ce11c339e6 need to mangle another symbol 2013-04-16 19:58:39 -04:00
Joey Hess
a85c9ba561 a few nasty hacks for yesod 2013-04-16 15:10:23 -04:00
Joey Hess
737ece771b update 2013-04-15 17:42:39 -04:00
Joey Hess
f44c917b22 fix 2 splicing bugs 2013-04-15 14:50:05 -04:00
Joey Hess
859c0cdc86 handle multi-line QQ 2013-04-15 14:23:39 -04:00
Joey Hess
c172bf7092 only show files that are really changed 2013-04-15 12:11:27 -04:00
Joey Hess
aaad52881a hack around incorrect nested instance code generated by GHC 
Yesod-specific hack for now.
 2013-04-14 16:53:41 -04:00
Joey Hess
5fc8bef2e6 better handling of declaration splices 
Still not quite enough to properly expand yesod type safe routes, but
getting there..
 2013-04-14 16:44:05 -04:00
Joey Hess
2e94852994 fix inplace mode 2013-04-14 16:11:12 -04:00
Joey Hess
0c9bb2371e avoid updating a file if the old splice is the same as the new 2013-04-14 15:50:38 -04:00
Joey Hess
dd7e35ed97 incremental android builds with the EvilSplicer 2013-04-14 13:43:36 -04:00
Joey Hess
0b17d28988 better splice joining 2013-04-13 18:09:20 -04:00
Joey Hess
42ac215827 work around ghc weirdness 2013-04-13 17:53:59 -04:00
Joey Hess
eda0ba7397 fix a syntax problem with a splace that provides a parameter to a function 2013-04-13 17:22:15 -04:00
Joey Hess
504cce3ce3 added symbol de-mangling 2013-04-13 17:15:05 -04:00
Joey Hess
36d581f08d first version of the Evil Splicer! 2013-04-13 16:43:56 -04:00
Joey Hess
59f616684d The version number is now derived from git, unless built with VERSION_FROM_CHANGELOG. 2013-04-10 16:53:38 -04:00
Peter Simons
39e29f7178 Build/mdwn2man: don't rely on perl being installed in /usr/bin; instead find it in $PATH 2013-02-28 16:04:46 -04:00
Joey Hess
0f4cc559a7 Android: Support ssh connection caching. 2013-02-19 14:57:45 -04:00
Joey Hess
a7ef05a988 configure: hardcode some things that cannot be probed for when cross-compiling for Android 2013-02-11 16:56:30 -04:00
Joey Hess
f202d997f4 Now uses the Haskell uuid library, rather than needing a uuid program. 
Been meaning to do this for some time; Android port was last straw.

Note that newer versions of the uuid library have a Data.UUID.V4 that
generates random UUIDs slightly more cleanly, but Debian has an old version
of the library, so I do it slightly round-about.
 2013-02-10 14:52:54 -04:00
Joey Hess
82617b92e9 move thirdparty program installation for standalone bundle into haskell program 
This allows it to use Build.SysConfig to always install the programs
configure detected. Amoung other fixes, this ensures the right uuid
generator and checksum programs are installed.

I also cleaned up the handling of lsof's path; configure now checks for
it in PATH, but falls back to looking for it in sbin directories.
 2012-12-14 16:07:59 -04:00
Joey Hess
1a10f109c1 quiet shell error message 2012-12-14 15:05:08 -04:00
Joey Hess
9b663c7f8c remove libSystem.b from OSX build 
Without the frameworks, but with this library, I get:

dyld: Symbol not found: __vproc_transactions_enable
  Referenced from: /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation
  Expected in: /Volumes/git-annex/git-annex.app/Contents/MacOS/./C
 in /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation

Without this library, things seem to work again w/o frameworks.
 2012-12-13 12:17:12 -04:00
Joey Hess
900351ab85 try skipping OSX frameworks 2012-12-12 21:34:59 -04:00
Joey Hess
43f7110220 typo 2012-12-09 13:45:51 -04:00
Joey Hess
ad488c23ac install libs in subdirs again 2012-12-09 13:42:30 -04:00
Joey Hess
a2a0a71e2b install_name_tool fix 2012-12-09 13:38:08 -04:00
Joey Hess
acbd640f89 optimisation; only run install_name_tool once per binary 2012-12-09 13:29:30 -04:00
Joey Hess
ecc49d7db8 use full path name to generate library filename 
avoids overlaps
 2012-12-09 13:17:55 -04:00
Joey Hess
4bb8fdb70d typo 2012-12-09 13:08:57 -04:00
Joey Hess
5d73a790e8 avoid using short lib names that clash with unix command names 2012-12-09 13:06:59 -04:00
Joey Hess
da53d0fa10 syntax 2012-12-09 13:02:59 -04:00
Joey Hess
8c082cda2e remove unused cruft 2012-12-09 12:59:34 -04:00
Joey Hess
dea5599d3d oh yeah, OSX is case insensative 2012-12-09 12:54:19 -04:00
Joey Hess
9370c32290 tweak 2012-12-09 12:46:28 -04:00
Joey Hess
8e26b2f941 reverse symlinks 2012-12-09 12:35:50 -04:00
Joey Hess
c6d570a1cc install libs using short names, with symlinks to we can tell what libraries 
they are supposed to be
 2012-12-09 12:22:09 -04:00
Joey Hess
1c2da18b0b fix executable permissions 
sh at least does not default to having a write bit
 2012-12-09 12:16:02 -04:00
Joey Hess
76b7ab0b35 fix infinite loop 2012-12-09 12:14:19 -04:00