Commit graph

456 commits

Author SHA1 Message Date
Joey Hess
37c299ae6c
remove vim dev hack
This caused infinite recursion when I just used it, the dev target has
changed to re-run make. Anyway, not needed now.
2023-10-20 12:50:31 -04:00
Joey Hess
c2e60dd7a6
enable parallel ghc for building git-annex
Via a build flag this time, that's off by default because hackage
demands it be so, but that gets turned on by the Makefile and by stack.
2023-09-26 13:46:44 -04:00
Joey Hess
9d2e8e2caa
new make dev target
rename old to make prof
2023-09-15 08:10:32 -04:00
Joey Hess
c775b3ed70
clean up cabal.project.local~*
Make whenever cabal configure is run with new cabal, and I don't need
100 copies of that to be backed up.
2023-04-11 13:18:31 -04:00
Joey Hess
d475f82c62
Added libgcc_s.so.1 to the linux standalone build so pthread_cancel will work
In Makefile, listed additional deps of Build/Standalone. Without that,
it does not get updated for the change to Utility/LinuxMkLibs.hs when
compiling incrementally.

Sponsored-by: Dartmouth College's DANDI project
2022-12-22 15:15:25 -04:00
Joey Hess
11ca07fe6f
don't force debuglocks flag on in Makefile
Reverts a change accidentially committed in 09edb07ac5

debuglocks is minimal cost, but there is some and this was an accidental
change
2022-08-09 10:43:07 -04:00
Joey Hess
09edb07ac5
add debugLocks around database operations
to track down a blocked indefinitely on MVar that seems to occur after
sqlite throws ErrorBusy but that I have not been able to reproduce when
I made commits synthetically throw ErrorBusy.

Sponsored-by: Dartmouth College's Datalad project
2022-06-03 14:16:28 -04:00
Joey Hess
fdcb14d475
switch from hothasktags to hasktags
hothasktags was removed from Debian. And in the meantime hasktags
improved so it works well in the source tree.

Also make dev update tags.

Sponsored-by: Jack Hill on Patreon
2022-03-24 13:29:40 -04:00
Joey Hess
9770fde5f4
hard link git-annex to fix ./git-annex test
2fc46e1871 broke running ./git-annex test
when git-annex-shell is not in PATH from another install, and also
caused the wrong git-annex-shell to be tested.

Using a symlink made programPath return the .cabal/ directory where the
git-annex binary is, but git-annex-shell is not in that directory.
Changing to a hard link avoids that problem.

Sponsored-by: Dartmouth College's Datalad project
2022-03-07 14:01:45 -04:00
Joey Hess
1e91cc5ca6
deal with which being deprecated in Debian 2022-01-21 14:51:32 -04:00
Joey Hess
e8baf5d58f
remove TAGS target
hothasktags dropped emacs support, and probably emacs users will use
haskell-language-server rather than tags, I guess
2021-07-02 14:38:28 -04:00
Joey Hess
51eb04a05c
remove now redundant -O0
That is now enabled by -f-Production, since commit
cab398c945
2021-05-07 11:25:34 -04:00
Joey Hess
72ec7da41b
OSXMkLibs: skip @loader_path
This may or may not make the OSX build work on a newer version of OSX
than the one that's currently being used for release builds. I have not
been able to find good docs about how exactly to get back from such a
value to the actual path to the library that the linker would use.
2020-12-15 12:47:24 -04:00
Joey Hess
fac5ccb2e2
add USE_SYSTEM_LIBS=1 for osxapp build 2020-12-14 15:34:27 -04:00
Joey Hess
c703c6f295
enable profiling in dev build 2020-10-13 15:36:01 -04:00
Joey Hess
30677d5858
shorten buildid
No need to end it with " git-annex"
2020-10-06 11:23:55 -04:00
Joey Hess
cb487e7417
switch to md5sum for buildid
This does not need to be cryptogrphically secure, and a little shorter
will be better when using the buildid in a path in subsequent changes.
2020-10-05 13:45:27 -04:00
Joey Hess
ae954312ab
fix osxapp build issue
need to build git-annex 1st, otherwise otool can't run
2020-08-10 18:41:02 -04:00
Joey Hess
e62817c00d
move standalone building code out of Makefile and into Build.Standalone
This includes making Build.Standalone run LinuxMkLibs or OSXMkLibs
rather than doing that separately. Which is groundwork for a later
optimisation.

Also it simplified the code some.
2020-08-03 14:15:03 -04:00
Joey Hess
4c44deb2cd
improve cabal v2 use
cabal exec in v2 puts the built binary in PATH, so can just ask where it
is that way, and symlink it

And cabal exec hothasktags simplifies running that, because it sets up
most of the necessary environment.

The tags and TAGS targets now need cabal v2 to work.
2020-06-18 13:56:03 -04:00
Joey Hess
0f43efa15b
tail the find in dist-newstyle
unfortunately old builds for old versions can linger in there
2020-06-18 11:37:43 -04:00
Joey Hess
572369ced2
clean dist-newstyle 2020-06-17 17:44:38 -04:00
Joey Hess
7de3f8de11
updates for new cabal
The old make fast machinery doesn't work at all with it, but it seems
actually reasonably fast now to just disable optimisation, so made make
dev do that. And it sticks once used, which is handy.

Removed hdevtools hack, which won't work. There are ide integrations
that really solve the problem that hack was working around.

Misc fixes for dist-newstyle location.
2020-06-17 11:35:34 -04:00
Joey Hess
f407df11b4
document tags vs TAGS
ridiculous that these editors use such similar names and different file
formats

(actually, if you force vim to read TAGS, it seems able to parse it, but
I can't find much documentation about that)
2020-05-19 12:59:38 -04:00
Joey Hess
ac347f82cc
ignore and clean the TAGS file 2020-05-19 12:58:25 -04:00
Joey Hess
ca9f7361e8
remove wrapping
Seems unncessary and was a bit weird.
2020-05-19 12:57:57 -04:00
Thomas Koch
a47ba1e612 make TAGS to create emacs etags
I tried the --recursive option of hothasktags but the vi tags file grew
by some orders of magnitude and also the emacs TAGS file contained many
wrong entries.

I deleted trailing whitespace in the Makefile since emacs warns about it
on save.
2020-05-15 21:32:59 +02:00
Joey Hess
3d00a8a1dc
Makefile: Support newer versions of cabal that use the new-build system.
Unfortunately, cabal puts the binary in a very complicated path
and does not provide any good way to get it out, leaving no good choice
except to use find.

It may be possible to use cabal (new-)install --symlink-bindir,
and ask it to symlink to pwd, but with my older version of cabal,
that does not work.

The stack branch will probably also break once it uses a newer cabal,
didn't try to deal with that.
2020-02-20 14:13:21 -04:00
Joey Hess
ee718fb35d
Makefile: Really move the fish completion to the vendor_completions.d directory. 2020-02-04 12:10:09 -04:00
Joey Hess
5c3d06b070
Makefile: Move the fish completion to the vendor_completions.d directory. 2020-01-23 16:42:08 -04:00
Joey Hess
91ec283be6
if hdiutil create never succeeds, fail the build
Build was succeeding despite the dmg never being created.
2019-12-30 13:06:43 -04:00
Joey Hess
28733a3f5a
remove thing I never meant to commit 2019-11-14 16:11:58 -04:00
Joey Hess
842449b086
linuxstandalone: Fix a regression that broke git-remote-https. 2019-11-14 15:08:23 -04:00
Joey Hess
b02bf9f0eb
deal with flakey hdiutil
hdiutil create -format UDBZ -size 640m -srcfolder tmp/build-dmg \
		-volname git-annex -o tmp/git-annex.dmg
hdiutil: create failed - Resource busy

Sometimes it has failed this way for weeks until reboot. Sometimes a single
retry makes it work. Despite many reports of this problem, I have never
found for an explanation for it, other than <shrug> OSX.
2019-10-17 16:28:48 -04:00
Joey Hess
5463f97ca2
OSX: Deal with symbolic link problem that caused git to not be included in the git-annex.dmg
Homebrew now has eg:

datalads-imac:~ joey$ ls -l /Users/joey/homebrew/Cellar/git/2.23.0/libexec/git-core
total 36776
lrwxr-xr-x   1 joey  staff       13 Aug 29 13:38 git -> ../../bin/git
lrwxr-xr-x   1 joey  staff       13 Aug 29 13:38 git-add -> ../../bin/git

So the target of the symlink also needs to be installed now.

Doing it in shell code was too hairy for my dentistry-addled brain, so
reimplemented in haskell. Also using it for building linuxstandalone.
2019-10-17 11:01:41 -04:00
Joey Hess
4508198507
building a standalone rpm from the standalone tarball
This allows the rpm to be built anywhere the necessary build deps are
available (including on debian) and the resulting package will work on as
broad a range of rpm distributions as the libc/kernel supports.

The DistributionUpdate changes to use the new script have not yet been
tested.
2019-09-13 11:53:17 -04:00
Joey Hess
7f97575941
Makefile: Changed default zsh completion location to zsh default fpath.
Systems such as Debian that have overridden the default fpath will need to
set ZSH_COMPLETIONS_PATH.

I feel that Debian is causing unncessary complexity by making this change,
and have filed a bug report about it.

This also means that when git-annex is installed with PREFIX=/usr/local
it will use /usr/local/share/zsh/site-functions which works with probably
all versions of zsh.
2019-08-16 14:08:56 -04:00
Joey Hess
e03919bd93
simplify
git-annex build-depends on a new enough optparse-applicative that zsh
and fish completions will always be generated
2019-08-16 13:36:26 -04:00
Joey Hess
b532d69498
add missing build dep of install-completions
Since it runs git-annex to generate the completions files.
2019-08-16 11:42:00 -04:00
Joey Hess
83cdc511da
use GHC not ghc 2019-08-16 11:00:28 -04:00
Joey Hess
9273f80301
OSX dmg: Put git-annex's version in the Info.plist file. 2019-06-26 12:10:35 -04:00
Joey Hess
e35f96aea9
Makefile: Added install-completions to install target. 2019-05-08 10:48:38 -04:00
Joey Hess
6491b62614
Makefile: Added install-home target which installs git-annex into the HOME directory 2019-03-18 12:36:03 -04:00
Joey Hess
53e98aeb9c
fix tags generation
The location of the cabal_macros.h file has changed. Also, need to
tell hothasktags about language extensions that are enabled by default
in the cabal file.

This commit was sponsored by Thomas May.
2019-02-12 22:02:11 -04:00
Joey Hess
6ba6c6b539
add BUILDERCOMMONOPTIONS
Needed because stack path needs to be passed the modified stack.yaml to
use as well.
2018-11-21 11:36:38 -04:00
Joey Hess
654981f3f0
actually, skip stack setup
stack build will do setup if necessary, and setup does not accept all
the options that build does
2018-11-21 11:15:16 -04:00
Joey Hess
44ded53d8a
pass BUILDEROPTIONS to stack setup
This is needed so the i386ancient build can pass --stack-yaml
2018-11-21 11:11:36 -04:00
Joey Hess
38d691a10f
removed the old Android app
Running git-annex linux builds in termux seems to work well enough that the
only reason to keep the Android app would be to support Android 4-5, which
the old Android app supported, and which I don't know if the termux method
works on (although I see no reason why it would not).
According to [1], Android 4-5 remains on around 29% of devices, down from
51% one year ago.

[1] https://www.statista.com/statistics/271774/share-of-android-platforms-on-mobile-devices-with-android-os/

This is a rather large commit, but mostly very straightfoward removal of
android ifdefs and patches and associated cruft.

Also, removed support for building with very old ghc < 8.0.1, and with
yesod < 1.4.3, and without concurrent-output, which were only being used
by the cross build.

Some documentation specific to the Android app (screenshots etc) needs
to be updated still.

This commit was sponsored by Brett Eisenberg on Patreon.
2018-10-13 01:41:11 -04:00
Joey Hess
e802323071
deal with the persistent locpath issue
linux standalone: Generate locale files in ~/.cache/git-annex/locales/ so
they're available even when the standalone tarball is installed in a
directory owned by root.

This avoids a full-on reference counting cleanup hell, by letting old
locale caches linger as long as the standalone bundle directory associated
with them is still around. Old ones get cleaned up.

In the case where the directory has a new bundle unpacked over top of it,
the old locale cache is invalidated and rebuilt. Of course, running
programs using that may get confused, but this was already the case, and
unpacking over top of a bundle is probably not a good idea anyhow.

To support that, added a buildid file, which only needs to be unique across
builds of git-annex with different libc versions. sha1sum of git-annex
seems good enough for that.

Removed debian/patches/standalone-no-LOCPATH as it's no longer
necessary.

This commit was supported by the NSF-funded DataLad project.
2018-07-10 12:13:19 -04:00
Joey Hess
a1b55056fc
Make Build/BuildVersion update embedded version number
This way, autobuilders can run it before building, in a tree where
git-annex was already built, and get the current git rev embedded in the
build.

Before, the version number only updated when the setup program was run,
which was up to cabal and not on every build.
2018-06-26 10:36:54 -04:00