Merge remote-tracking branch 'branchable/master'
This commit is contained in:
commit
7da3dc5984
4 changed files with 73 additions and 3 deletions
|
@ -1,4 +1,3 @@
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
From e45c73e66fc18d27bdf5797876fbeb07786a4af1 Mon Sep 17 00:00:00 2001
|
From e45c73e66fc18d27bdf5797876fbeb07786a4af1 Mon Sep 17 00:00:00 2001
|
||||||
From: Jimmy Tang <jtang@tchpc.tcd.ie>
|
From: Jimmy Tang <jtang@tchpc.tcd.ie>
|
||||||
|
@ -30,5 +29,19 @@ index 08e2f59..4ae8392 100644
|
||||||
|
|
||||||
StatFS.hs never gets depended on and compiled, the makefile was just missing something
|
StatFS.hs never gets depended on and compiled, the makefile was just missing something
|
||||||
|
|
||||||
> Thanks, [done]]! Interested to hear if StatFS.hs works on OSX (no warning) or
|
> Thanks, [[done]]! Interested to hear if StatFS.hs works on OSX (no warning) or
|
||||||
> is a no-op (with warning). --[[Joey]]
|
> is a no-op (with warning). --[[Joey]]
|
||||||
|
|
||||||
|
>>
|
||||||
|
>> for now it gives a warning, it looks like it should be easy enough to add OSX
|
||||||
|
>> support, I guess it's a case of just digging around documentation to find the equivalent
|
||||||
|
>> calls/headers. I'll give it a go at making this feature work on OSX and get back to you.
|
||||||
|
>>
|
||||||
|
|
||||||
|
<pre>
|
||||||
|
jtang@exia:~/develop/git-annex $ make
|
||||||
|
hsc2hs StatFS.hsc
|
||||||
|
StatFS.hsc:85:2: warning: #warning free space checking code not available for this OS
|
||||||
|
StatFS.hsc:85:2: warning: #warning free space checking code not available for this OS
|
||||||
|
StatFS.hsc:85:2: warning: #warning free space checking code not available for this OS
|
||||||
|
</pre>
|
||||||
|
|
|
@ -0,0 +1,47 @@
|
||||||
|
[[!comment format=mdwn
|
||||||
|
username="https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus"
|
||||||
|
nickname="Jimmy"
|
||||||
|
subject="comment 1"
|
||||||
|
date="2011-03-23T08:21:30Z"
|
||||||
|
content="""
|
||||||
|
Just did some minor digging around and checking, this seems to satisfy the compilers etc... I have yet to confirm that it *really* is working as expected. Also it might be better to check for a darwin operating system instead of apple I think, though I don't know of any one really using a pure darwin OS. But for now it works (I think)
|
||||||
|
|
||||||
|
<pre>
|
||||||
|
From fbfe27c2e19906ac02e3673b91bffa920f6dae5d Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jimmy Tang <jtang@tchpc.tcd.ie>
|
||||||
|
Date: Wed, 23 Mar 2011 08:15:39 +0000
|
||||||
|
Subject: [PATCH] Define (__APPLE__) in StatFS
|
||||||
|
|
||||||
|
At least on OSX 10.6.6 it appears to have the same defintions as
|
||||||
|
FreeBSD. The build process doesn't complain and the code is enabled,
|
||||||
|
this needs to be tested and checked more.
|
||||||
|
---
|
||||||
|
StatFS.hsc | 4 ++--
|
||||||
|
1 files changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/StatFS.hsc b/StatFS.hsc
|
||||||
|
index 8b453dc..45fd7e4 100644
|
||||||
|
--- a/StatFS.hsc
|
||||||
|
+++ b/StatFS.hsc
|
||||||
|
@@ -53,7 +53,7 @@ import Foreign.C.String
|
||||||
|
import Data.ByteString (useAsCString)
|
||||||
|
import Data.ByteString.Char8 (pack)
|
||||||
|
|
||||||
|
-#if defined (__FreeBSD__)
|
||||||
|
+#if defined (__FreeBSD__) || defined(__APPLE__)
|
||||||
|
# include <sys/param.h>
|
||||||
|
# include <sys/mount.h>
|
||||||
|
#else
|
||||||
|
@@ -84,7 +84,7 @@ data CStatfs
|
||||||
|
#ifdef UNKNOWN
|
||||||
|
#warning free space checking code not available for this OS
|
||||||
|
#else
|
||||||
|
-#if defined(__FreeBSD__)
|
||||||
|
+#if defined(__FreeBSD__) || defined(__APPLE__)
|
||||||
|
foreign import ccall unsafe \"sys/mount.h statfs\"
|
||||||
|
#else
|
||||||
|
foreign import ccall unsafe \"sys/vfs.h statfs64\"
|
||||||
|
--
|
||||||
|
1.7.4.1
|
||||||
|
</pre>
|
||||||
|
"""]]
|
|
@ -29,7 +29,7 @@ Optionally, editing the meta-data should change the times in all annexes.
|
||||||
>>>>>
|
>>>>>
|
||||||
>>>>> So all you have to do is make the pre-commit hook call
|
>>>>> So all you have to do is make the pre-commit hook call
|
||||||
>>>>> [metastore](http://david.hardeman.nu/software.php). The hook
|
>>>>> [metastore](http://david.hardeman.nu/software.php). The hook
|
||||||
>>>>> would look like this: ---[[Joey]] [[!tag done]]
|
>>>>> would look like this: ---[[Joey]]
|
||||||
|
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
git annex pre-commit .
|
git annex pre-commit .
|
||||||
|
@ -47,3 +47,5 @@ Optionally, editing the meta-data should change the times in all annexes.
|
||||||
git add .metadata
|
git add .metadata
|
||||||
|
|
||||||
>>>>>>> -- RichiH
|
>>>>>>> -- RichiH
|
||||||
|
|
||||||
|
>>>>>>>> After getting to actually play with this from different machines with a bare git as central instance for several distributed repos, the metastore trick does not work. The .metadata is causing merge conflicts for every pull. I removed the "done" tag from this issue. -- RichiH
|
||||||
|
|
|
@ -0,0 +1,8 @@
|
||||||
|
[[!comment format=mdwn
|
||||||
|
username="http://peter-simons.myopenid.com/"
|
||||||
|
ip="84.189.1.247"
|
||||||
|
subject="Why isn't this package built with Cabal?"
|
||||||
|
date="2011-03-23T11:31:06Z"
|
||||||
|
content="""
|
||||||
|
It would be a lot easier to compile this package, if it had a Cabal file to describe the build; especially the build-time dependencies. Why isn't Cabal used?
|
||||||
|
"""]]
|
Loading…
Add table
Add a link
Reference in a new issue