aboutsummaryrefslogtreecommitdiff
path: root/Makefile
Commit message (Collapse)AuthorAge
* remove chrpath hackGravatar Joey Hess2018-02-27
| | | | | | | | | | | | | | | | | | Makefile: Remove chrpath workaround for bug in cabal, which is no longer needed. https://github.com/haskell/cabal/issues/2717 says it uses RUNPATH instead of RPATH now, but I don't even see that for statically linked libraries; the bug with that appears to be fixed. cabal-install version 1.24.0.2 compiled using version 1.24.2.0 of the Cabal library I left the rpath removal using otool on OSX because those straight up broke the linker, and I don't know if the OSX autobuilder is updated to a new enough cabal to not need it. This commit was sponsored by Ewen McNeill on Patreon.
* avoid warning with current ghcGravatar Joey Hess2018-01-15
| | | | | | Seems that the cabal macros file is no longer needed to build DistributionUpdate, and it produced a ton of warnings, so stop including manually.
* Removed the testsuite build flagGravatar Joey Hess2017-12-20
| | | | | | | | | | Test suite is always included. Building with this flag disabled has actually been broken for some time, since Command.TestRemote uses tasty. Fewer build flags are better, so good time to drop it. This commit was sponsored by Thomas Hochstein on Patreon.
* fold Build/SysConfig.hs into BuildInfo via includeGravatar Joey Hess2017-12-14
| | | | | | | | | | | This avoids warnings from stack about the module not being listed in the cabal file. So, the generated file is also renamed to Build/SysConfig. Note that the setup program seems to be cached despite these changes; I had to cabal clean to get cabal to update it so that Build/SysConfig was written. This commit was sponsored by Jochen Bartl on Patreon.
* add warning: to make clear this is not an errorGravatar Joey Hess2017-12-11
|
* turn on lambdacase for distributionupdateGravatar Joey Hess2017-11-29
|
* Makefile improvement for BUILDER=stack, use stack to run ghc.Gravatar Joey Hess2017-11-07
|
* simplify ikiwiki docs build testing and outputGravatar Joey Hess2017-11-07
|
* Build Build/InstallDesktopFile at "make all" timeGravatar Eric Siegerman2017-11-07
| | | | | | | | | | If you run stack as root (e.g. for "make install"), any files it creates under ./ will, of course, be owned by root. That's a problem for subsequent runs as non-root. Reduce the likelihood of that happening by building Build/InstallDesktopFile during "make all", so that it needn't be built by "make install".
* /dev/null stderr when generating completionsGravatar Joey Hess2017-09-14
| | | | avoid usage display when too old optparse-applicative
* better way of finding stack built executableGravatar Joey Hess2017-07-12
|
* zsh and fish completionsGravatar Joey Hess2017-06-09
| | | | | | | | | | | | | | | | optparse-applicative-0.14.0.0 adds support for these, so have the Makefile install their scripts when built with it. CmdLine/GitAnnex/Options.hs now uses action "file" in cmdParams, which affects the bash and zsh completions, letting them complete filenames for subcommands that use that. This is not needed for bash, since bash-completion.bash enables -o bashdefault, which lets it complete filenames too. But it does not seem to break the bash completions. It is needed for zsh; the zsh completion otherwise does not complete filenames. The fish completion will always complete filenames no matter what. Messy. This commit was sponsored by Denis Dzyubenko on Patreon.
* run stack setup when building with stackGravatar Joey Hess2017-05-16
| | | | | | | | This gets ghc installed if it's not already. Motivation: Ævar's git test that runs git-annex test using git can be called with BUILDER=stack, but without stack setup being run sometime, the stack build will fail.
* remove git-annex-shell symlink on cleanGravatar Joey Hess2017-05-10
|
* test needs git-annex-shell symlinkGravatar Joey Hess2017-03-18
|
* test suite infra for testing mocked ssh remotesGravatar Joey Hess2017-03-17
| | | | This commit was supported by the NSF-funded DataLad project.
* fix osxapp depsGravatar Joey Hess2017-02-28
|
* fix osxapp targetGravatar Joey Hess2017-02-26
| | | | Broken by recent changes to other targets
* add back a configure targetGravatar Joey Hess2017-02-24
| | | | | | | | | | Otherwise, make reconfigures every time and then rebuilds all files. I went too far in 3dc6aa3f53dc17573996a3ceae32f80dfd9e7094. All that's needed is to make the configure target not use Build/SysConfig.hs as the target name, so make won't delete that file after a failed build. This commit was supported by the NSF-funded DataLad project
* remove Build/SysConfig.hs targetGravatar Joey Hess2017-02-21
| | | | | | | | | | | | | | | | | The problem with that target was, if a target like git-annex that depended on it failed for some reason, make would delete Build/SysConfig.hs, since it knows it's an intermediate file. But, since stack only builds that file once, that caused all subsequent make git-annex builds to fail. Also, this avoids a double stack build when building with stack. Since stack has no configure stage, and the Build/SysConfig.hs target was about running the configure stage, the only way to only build once is to combine the targets like this. This should work better on the autobuilders that build with stack. This commit was sponsored by NSF-funded DataLad project
* avoid OSX build failure when there are no rpaths to removeGravatar Joey Hess2017-02-14
|
* Added git template directory to Linux standalone tarball and OSX app bundle.Gravatar Joey Hess2017-02-10
| | | | | | | | Git does not provide a switch to find out where this directory is, and while the git-init man page says it will always be in /usr/share/git-core/templates, that's not the case on OSX with git installed from homebrew. So, I used a hack taking the --man-path and constructing a path from that. Works on both Debian and OSX at least.
* Merge branch 'master' into no-xmppGravatar Joey Hess2016-12-24
|\
| * Added git-remote-tor-annex, which allows git pull and push to the tor hidden ↵Gravatar Joey Hess2016-11-21
| | | | | | | | | | | | | | | | | | | | | | service. Almost working, but there's a bug in the relaying. Also, made tor hidden service setup pick a random port, to make it harder to port scan. This commit was sponsored by Boyd Stephen Smith Jr. on Patreon.
* | remove xmpp supportGravatar Joey Hess2016-11-14
|/ | | | | | | | | | | | I've long considered the XMPP support in git-annex a wart. It's nice to remove it. (This also removes the NetMessager, which was only used for XMPP, and the daemonstatus's desynced list (likewise).) Existing XMPP remotes should be ignored by git-annex. This commit was sponsored by Brock Spratlen on Patreon.
* OSX: Remove RPATHs from git-annex binary, which are not needed, slow down ↵Gravatar Joey Hess2016-11-07
| | | | | | | | | | | startup, and break the OSX Sierra linker. ghc 8.0.2 may make this unncessary, but it's not in a stackage version yet, so put in a workaround. Note that the linux builds already delete the RPATHs for similar reasons. This commit was sponsored by Josh Taylor on Patreon.
* Linux standalone: Fix location of locale files in the bundle.Gravatar Joey Hess2016-10-31
| | | | | | | The Makefile was putting them in git-annex.linux/i18n/i18n, and so I18NPATH did not point to the files. I think that on close enough to Debian systems, localedef then fell back to using the system-wide locale files, while on other systems it would fail to generate locales.
* Improve style of offline html build of website.Gravatar Joey Hess2016-10-17
|
* Linux standalone: Include locale files in the bundle, and generate locale ↵Gravatar Joey Hess2016-10-04
| | | | | | | | | | | | | | | definition files for the locales in use when starting runshell. Currently only done for utf-8 locales because the charset can easily be told for those. Other locales don't include the charset in their name. The locale definition is generated under git-annex.linux/locales. So, this only works if the user can write there. If locale generation fails for any reason, it's silently skipped. The git-annex-standalone.deb installs the bundle under /usr, so this locale generation won't work for non-root users.
* Android: Fix disabling use of cp --reflink=auto, curl, sha224, and sha384.Gravatar Joey Hess2016-09-05
| | | | | | This was originally done in c4e7c6af, but got lost in some change to the Makefile. Use CROSS_COMPILE=Android to tell configure that it's configuring for android instead of passing it a parameter.
* removed hackage target, not used nowGravatar Joey Hess2016-08-31
|
* fix clean of Build/MakeMansGravatar Joey Hess2016-07-19
|
* avoid stripping rpath when linking haskell libs dynamicallyGravatar Joey Hess2016-07-17
|
* Remove unnecessary rpaths in the git-annex binary, but only when it's built ↵Gravatar Joey Hess2016-07-06
| | | | using make, not cabal. This speeds up git-annex statup time by around 50%.
* fix man page buildingGravatar Joey Hess2016-06-02
|
* Remove Makefile from cabal tarball; man page building is now handled by a ↵Gravatar Joey Hess2016-05-31
| | | | | | | | small haskell program. This actually runs faster than building the man pages from the makefile did. But the main purpose is to let Setup.hs import Build.Mans and so not need the makefile.
* Updated cabal file explictly lists source files.Gravatar Joey Hess2016-05-24
| | | | | | | | | | | | | | | | | | | The tarball on hackage will include only the files needed for cabal install; it is NOT the full git-annex source tree. While it's totally obnoxious that cabal files need every file listed out when basic wildcard support could avoid hundreds of lines, and have to be maintained when files are added, this does get the tarball size back down to 1 mb. This also stops stack from complaining that it found modules not listed in the cabal file. debian/changelog, debian/NEWS, debian/copyright: Converted to symlinks to CHANGELOG, NEWS, and COPYRIGHT, which used to symlink to these instead. This avoids needing to include debian/ in the hackage tarball. Setup.hs: Build man pages at install time using make and mdwn2man. If it fails, which it probably will on windows, just skip installing them.
* allow linuxstandalone to be used with stack built binaryGravatar Joey Hess2016-03-05
|
* typoGravatar Joey Hess2016-02-26
|
* Include magic database in the linux and OSX standalone builds.Gravatar Joey Hess2016-02-26
|
* add back caballog targetGravatar Joey Hess2016-02-15
| | | | used by ghci wrapper script
* fix make fast to link executable againGravatar Joey Hess2016-02-15
| | | | Use second ghc pass, not first.
* move -j1 setting to BUILDEROPTIONS, set in debian/rules fileGravatar Joey Hess2016-02-05
| | | | | | I needed BUILDEROPTIONS to allow passing flags to stack build, but it also lets me move the -j1 out of the normal build path, and to debian/rules which has the goal of having a reproducible build
* avoid running BUILDER clean when it's cabalGravatar Joey Hess2016-01-22
| | | | This alows debian/rules clean to work when build deps are not installed.
* respond, close bad bugGravatar Joey Hess2016-01-20
|
* avoid tab warningsGravatar Joey Hess2016-01-14
|
* defer find to after buildGravatar Joey Hess2015-12-28
|
* improve binary findingGravatar Joey Hess2015-12-28
|
* support building with BUILDER=stack to use stack instead of cabalGravatar Joey Hess2015-12-28
|
* Build with -j1 again to get reproducible build.Gravatar Joey Hess2015-11-16
| | | | | | | This was in the cabal file earlier, and was removed because it broke the android cross build. Moving to the git-annex target of the Makefile will make it be used for Debian packages etc but not android cross builds or make fast or when users build with cabal.