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

354 commits

Author SHA1 Message Date
Joey Hess
764090d58f commit before info file build, so that any modified annexed files get updated 2014-02-21 12:13:12 -04:00
Joey Hess
f11f7520b5 windows: Fix process termination code. 
The ctrl-c hack used before didn't actually seem to work.

No haskell libraries expose TerminateProcess. I tried just calling it via
FFI, but got segfaults, probably to do with the wacky process handle not
being managed correctly. Moving it all into one C function worked.

This was hell. The EvilLinker hack was just final icing on the cake.
We all know what the cake was made of.
 2014-02-13 15:53:10 -04:00
Joey Hess
de3aaa9eb0 fix info file finding 2014-02-10 15:33:37 -04:00
Joey Hess
e4d7358389
check for out of date info files at end 2014-02-10 15:28:00 -04:00
Joey Hess
d8c1890c98 deal with multiarch 2014-02-07 17:20:29 -04:00
Joey Hess
7dd94c0846 remove debug info 2014-01-30 13:34:24 -04:00
Joey Hess
ff6854e5b4 fix install_name_tool library name replacement 2014-01-15 13:05:07 -04:00
Joey Hess
465a24cc54 fix warning 2014-01-14 16:44:04 -04:00
Joey Hess
d0b51099a4 search DYLD_LIBRARY_PATH for libraries 2014-01-14 16:28:05 -04:00
Joey Hess
5a5adc44f5 Refuse to build with git older than 1.7.1.1, which is needed for git checkout -B 2014-01-13 15:17:48 -04:00
Joey Hess
22d6019bae add back sha commands on OSX; SIGILL problem fixed 2014-01-06 16:11:21 -04:00
Joey Hess
1118247394 OSX: Avoid using external hash programs, since SIGILL is not fun 2014-01-01 16:26:43 -04:00
Joey Hess
2c27b1397b windows: add more libraries, these are used by gpg 2014-01-01 15:30:58 -04:00
Joey Hess
04860fe3e9 include libgcc_s in case not pulled in by ldd 
libc can demand-load libgcc_s in some situations, it seems
 2013-12-31 15:08:26 -04:00
Joey Hess
72b592cdae Revert "include libgcc in linux standalone" 
This reverts commit 9f82e0c64d.

ldd pulls it in
 2013-12-31 14:36:55 -04:00
Joey Hess
9f82e0c64d include libgcc in linux standalone 2013-12-31 14:23:49 -04:00
Joey Hess
326bc7491d add main type sig 2013-12-30 13:19:22 -04:00
Joey Hess
80152e1aa3 add git-shell binary to bundles 2013-12-27 16:35:24 -04:00
Joey Hess
6c3e11abaf avoid another encoding crash 2013-12-27 00:10:04 -04:00
Joey Hess
63fab93755 -Wall clean 2013-12-27 00:05:15 -04:00
Joey Hess
bd106e22f1 clean up 2013-12-24 17:42:48 -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
b9d3cfa0c5 fix gconvdir 2013-12-24 16:28:03 -04:00
Joey Hess
02df4f529b Fix bug in Linux standalone build's shimming that broke git-annex-shell. 2013-12-24 15:42:49 -04:00
Joey Hess
e199240ab8 remove unused imports 2013-12-24 15:18:15 -04:00
Joey Hess
103c7e8b9a resursively follow lib symlinks, just in case 2013-12-24 13:25:02 -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
abffc91575 fix build 
Need to recurse into subdirs to follow git-annex links.
 2013-12-21 12:37:53 -04:00
Joey Hess
46f99c7764 avoid EvilSplicer crashing on encoding problems, including LANG=C with utf-8 in files 2013-12-19 02:37:21 -04:00
Joey Hess
0027cef395 improve EvilSplicer robustness 2013-12-18 21:39:09 +00:00
Joey Hess
d7ee0bdbb8 OSX: Remove ssh and ssh-keygen from dmg as they're included in OSX by default. 2013-12-13 14:25:24 -04:00
Joey Hess
cb37a45e29 argh, one more 2013-12-11 11:53:56 -04:00
Joey Hess
2cca8760fc more 2013-12-11 11:49:35 -04:00
Joey Hess
a9cb8d02f6 one more lib 2013-12-11 11:44:14 -04:00
Joey Hess
439d4a8c42 yet more wget and curl libs 2013-12-11 11:34:22 -04:00
Joey Hess
174b1275ee more libs for wget and curl 2013-12-11 11:23:39 -04:00
Joey Hess
64379ff59e add libs needed by wget and curl 2013-12-11 11:10:30 -04:00
Joey Hess
6c1a50b4ea fix EvilLinker to not stomp on environment 2013-12-10 14:21:22 -04:00
Joey Hess
2b13776449 remove debug 2013-12-10 13:56:08 -04:00
Joey Hess
5315efa3d6 parse out additional env vars when running collect2 2013-12-10 13:51:52 -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
5f859e648c debug 2013-12-10 12:50:04 -04:00
Joey Hess
902d14b2ee remove debug 2013-12-10 12:43:42 -04:00
Joey Hess
8ce7b9d222 typo 2013-12-10 00:37:58 -04:00
Joey Hess
cd765576d2 remove menu item on uninstall 2013-12-10 00:37:06 -04:00
Joey Hess
db8a980c70 request admin rights at install 2013-12-10 00:32:08 -04:00
Joey Hess
29f440289b start minimized 2013-12-10 00:26:14 -04:00
Joey Hess
7d9b3e9598 fixes 2013-12-10 00:17:20 -04:00
Joey Hess
1d0f77fca2 try to make a start menu shortcut 2013-12-10 00:13:15 -04:00
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