aboutsummaryrefslogtreecommitdiff
path: root/Makefile
Commit message (Collapse)AuthorAge
* add build dep on network-infoGravatar Joey Hess2012-09-07
|
* add network-multicast to bulld dependsGravatar Joey Hess2012-09-07
|
* move build scriptsGravatar Joey Hess2012-09-01
|
* Merge branch 'master' into assistantGravatar Joey Hess2012-08-20
|\ | | | | | | | | | | Conflicts: Makefile debian/copyright
| * use a stamp file to avoid running ghc in make installGravatar Joey Hess2012-08-20
| | | | | | | | | | That fails when make install is run sudoed, but cabal has been used to install dependencies in a user's home directory.
* | support building with yesod-default 1.1.0Gravatar Joey Hess2012-08-09
| | | | | | | | | | | | | | | | | | Old 1.0.1 version is still supported as well. Cabal autodetects which version is available, but in the Makefile, WITH_OLD_YESOD has to be configured appropriately. I have not squashed all the $newline warnings with the new Yesod. They should go away eventually anyway as Yesod moves past that transition.
* | remove template haskell file touchingGravatar Joey Hess2012-08-07
| | | | | | | | too annoying
* | make dirGravatar Joey Hess2012-08-07
| |
* | don't clobber env variable if setGravatar Joey Hess2012-08-07
| |
* | build in GIT_ANNEX_TMP_BUILD_DIRGravatar Joey Hess2012-08-07
| | | | | | | | | | | | | | This allows setting GIT_ANNEX_TMP_BUILD_DIR to be on a ramdisk, and all the .o files as well as the git-annex binary are written there. A useful optimisation for me to avoid SSD write thrashing during development.
* | hook desktop menu file installation into makefile and cabalGravatar Joey Hess2012-08-01
| |
* | move out to templateGravatar Joey Hess2012-07-31
| |
* | work around GHC not knowing to rebuild files using template haskellGravatar Joey Hess2012-07-26
| | | | | | | | when things they include change
* | fix normal build to include OPTFLAGSGravatar Joey Hess2012-07-26
| |
* | run yesod, and launch webapp on startupGravatar Joey Hess2012-07-25
| |
* | Merge branch 'master' into assistantGravatar Joey Hess2012-07-25
|\| | | | | | | | | Conflicts: Makefile
| * force C compiler to build 32 bit on OSX when 32 bit ghc is being usedGravatar Joey Hess2012-07-24
| |
* | try to make Utility.Mounts portableGravatar Joey Hess2012-07-19
| | | | | | | | | | This is an unholy mashup, but it just might work. It works on Linux, that's all I've tested. :)
* | MountWatcher threadGravatar Joey Hess2012-07-19
| | | | | | | | Currently only prints mount points when mounts happen.
* | attempt at building with -threadedGravatar Joey Hess2012-07-17
|/ | | | | | | | | Added a modified System.Cmd.Utils, working around bug #681621 Unfortunatly, the test suite still hangs partway through. Some of the hangs occur within pOpen3 still. Some of the hangs do not seem to occur within System.Cmd.Utils at all, but in some other code.
* Version build dependency on STM, and allow building without it, which ↵Gravatar Joey Hess2012-06-26
| | | | disables the watch command.
* skeleton C library for calling kqueueGravatar Joey Hess2012-06-18
|
* Teach _Makefile_ to only do _-DWITH_INOTIFY_ when on a Linux machine.Gravatar Jimmy Tang2012-06-18
|
* make inotify a build flag etcGravatar Joey Hess2012-06-17
|
* fix make-sdist to omit too long filenamesGravatar Joey Hess2012-06-15
|
* Simplify git-annex.cabal and generate sdist with make-sdist.sh.Gravatar Nathan Collins2012-06-12
| | | | | | | | | | The `cabal install` is happy as long as the files it needs are present, but `cabal sdist` will only package up files you tell it to. So, generate the source tarball ourselves. The source tarball is generated by make-sdist.sh, which uses cabal sdist to calculate the package name. Could also generate the name from the 'Version:' field in git-annex.cabal.
* Merge branch 'master' into cabal-man-pagesGravatar Nathan Collins2012-06-11
|\
* | Refactor generation of git-annex.cabal and incorporate man pages.Gravatar Nathan Collins2012-06-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The existing `sed | find | perl` hack in the Makefile was not including the man pages in the generated git-annex.cabal. I couldn't figure out why it didn't work; running the `find | perl` part of the command *did* list the man pages ... So, I set up a new hack. It produces a cleaner .cabal file and includes the man pages in the sdist. I changed git-annex.cabal and its generation as follows: - git-annex.cabal is now generated by a here document in git-annex.cabal.template.sh. The here document has inline file list insertion, whereas before the file lists were inserted with sed. - The 'Extra-Source-Files:' field now only includes the non-source files: the man pages, plain text documentation, and license. - The source dependencies are now listed in 'Other-Modules' sections in the 'Executable' and 'Test-Suite' sections. The list of dependencies is generated by `gen-other-modules.sh`. - The ./debian and ./doc are no longer included in the sdist package. These were not installed anywhere by `cabal install`. A user that wants them could clone the git repo. Running the tests with cabal is not yet working, i.e. cabal configure --enable-tests && cabal build && cabal test and cabal install --enable-tests fail to find Utility.Touch. However, I did not break this: it doesn't work for the git-annex package on Hackage either. Next step is to figure out how to deal with HSC in cabal ... or not bother, because `make test` works. I'm worried this is a cabal bug. To test building from sdist, I've been running cd ../.. ; cabal sdist ; cd dist ; tar xf git-annex-3.20120605.tar.gz && cd git-annex-3.20120605 && rm -fr /tmp/git-annex && cabal install --prefix=/tmp/git-annex && tree -A /tmp/git-annex in the dist directory. Using `cabal-dev install` is a better test, but is very slow.
* | Fix Makefile dependencies for `make test`.Gravatar Nathan Collins2012-06-10
| |
| * Makefile: ignore monads-tf in favour of mtlGravatar Sergei Trofimovich2012-06-10
| | | | | | | | | | | | | | | | | | | | | | | | | | Fixes build breakage when both 'mtl' and 'monads-tf' are present: $ make git-annex > ghc -O2 -Wall -ignore-package monads-fd -outputdir tmp -IUtility -DWITH_S3 --make git-annex Utility/libdiskfree.o > > Common.hs:6:8: > Ambiguous module name `Control.Monad.State.Strict': > it was found in multiple packages: monads-tf-0.1.0.0 mtl-2.1.1 > make: *** [git-annex] Error 1 Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
* | Make man pages when making sdist.Gravatar Nathan Collins2012-06-09
| |
* | Make standalone man-page installation possibleGravatar Nathan Collins2012-06-05
|/ | | | | | The `cabal install git-annex` doesn't install the man pages, and the Makefile only installed the man pages as part of a full build/install. So, I factored out the documentation parts of the Makefile.
* use LANGUAGE CPP pragma, avoids running cpp on all the other sourcesGravatar Joey Hess2012-04-17
|
* cabal file now autodetects whether S3 support is available.Gravatar Joey Hess2012-04-14
|
* Renamed diskfree.c to avoid OSX case insensativity bug.Gravatar Joey Hess2012-04-13
|
* releasing version 3.201204053.20120405Gravatar Joey Hess2012-04-05
|
* Rewrote free disk space checking codeGravatar Joey Hess2012-03-22
| | | | | Moving the portability handling into a small C library cleans up things a lot, avoiding the pain of unpacking structs from inside haskell code.
* shave some 12 mb from the installed sizeGravatar Joey Hess2012-03-15
| | | | | | * git-annex now behaves as git-annex-shell if symlinked to and run by that name. The Makefile sets this up, saving some 8 mb of installed size. * git-union-merge is a demo program, so it is no longer built by default.
* makefile tweaksGravatar Joey Hess2012-03-15
| | | | Put build cruft in a subdir
* remove cruftGravatar Joey Hess2012-03-10
|
* remove -fspec-constr-count workaroundGravatar Joey Hess2012-02-27
| | | | not needed with ghc 7.4
* add a configure check for StatFSGravatar Joey Hess2012-01-15
| | | | | | | | | | | | This way, the build log will indicate whether StatFS can be relied on. I've tested all the failing architectures now, and on all of them, the StatFS code now returns Nothing, rather than Just nonsense. Also, if annex.diskreserve is set on a platform where StatFS is not working, git-annex will complain. Also, the Makefile was missing the sources target used when building with cabal.
* add hackage targetGravatar Joey Hess2012-01-13
|
* remove S3stub stuffGravatar Joey Hess2012-01-05
| | | | | Let's keep that in a no-s3 branch, which can be merged into eg, debian-stable.
* Added quickcheck to build dependencies, and fail if test suite cannot be built.Gravatar Joey Hess2012-01-03
|
* increate spec-constr-countGravatar Joey Hess2011-12-30
| | | | Was getting SpecConstr warnings on Command.Find
* noteGravatar Joey Hess2011-12-20
|
* remove seemingly unneeded dependenciesGravatar Joey Hess2011-12-20
|
* add make fast targetGravatar Joey Hess2011-11-10
|
* fast build mode for vimGravatar Joey Hess2011-11-09
|