mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'master' into windows

Browse source 
Conflicts:
	Annex/Environment.hs
	Build/Configure.hs
	Git/Construct.hs
	Utility/FileMode.hs
This commit is contained in:
Joey Hess 2013-05-14 15:37:24 -04:00
commit dc66b1f27d
51 changed files with 678 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

10
doc/install/Windows.mdwn Normal file
View file

@ -0,0 +1,10 @@
git-annex has recently been ported to Windows.
This port is in an alpha state; many things will not work. See
[[todo/windows_support]] for current status. Note especially that
git-annex always uses [[direct_mode]] on Windows.
To build git-annex from source on Windows, you need to install
the Haskell Platform and Cygwin. When installing Cygwin, select
to install gcc, make, rsync, and ssh. Then, within Cygwin, git-annex
can be compiled following the instructions for [[using cabal|cabal]].

5
doc/install/cabal.mdwn
View file

@ -1,4 +1,7 @@
As a haskell package, git-annex can be installed using cabal. For example:
As a haskell package, git-annex can be installed using cabal.
Start by installing the [Haskell Platform](http://hackage.haskell.org/platform/),
and then:
cabal update
PATH=$HOME/bin:$PATH

18
doc/install/cabal/comment_1_f04df6bcd50d1d01eb34868bb00ac35c._comment Normal file
View file

@ -0,0 +1,18 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawlJemqsekZTC5dvc-MAByUWaBvsYE-mFUo"
nickname="Gábor"
subject="Cabal dependencies"
date="2013-05-12T12:52:20Z"
content="""
After finishing the installation the cabal way, here are the packages I installed. It is possible that there are other packages I installed previously as dependency for other packages.
$ lsb_release -a
No LSB modules are available.
Distributor ID: Ubuntu
Description: Ubuntu 12.04.2 LTS
Release: 12.04
Codename: precise
$ apt-get install cabal-install libgnutls28-dev libgsasl7-dev c2hs libghc-libxml-sax-dev zlib1g-dev libghc-zlib-dev
$ cabal install git-annex --bindir=$HOME/bin
"""]]

2
doc/install/fromscratch.mdwn
View file

@ -21,7 +21,7 @@ quite a lot.
* [SafeSemaphore](http://hackage.haskell.org/package/SafeSemaphore)
* [UUID](http://hackage.haskell.org/package/uuid)
* [regex-tdfa](http://hackage.haskell.org/package/regex-tdfa)
* Optional haskell stuff, used by the [[assistant]] and its webapp (edit Makefile to disable)
* Optional haskell stuff, used by the [[assistant]] and its webapp
* [stm](http://hackage.haskell.org/package/stm)
(version 2.3 or newer)
* [hinotify](http://hackage.haskell.org/package/hinotify)