Commit graph

135 commits

Author SHA1 Message Date
Joey Hess
cc90c2be50 bring back GIT_ANNEX_LOCAL_FEATURES, I'm using it locally 2012-09-29 12:23:38 -04:00
Joey Hess
5849c3f24b Avoid building the webapp on Debian architectures that do not yet have template haskell and thus yesod. (Should be available for arm soonish I hope). 2012-09-29 01:28:02 -04:00
Joey Hess
e88e3ba85b standalone linux app nearly ready
also made several fixes that apply to the OSX app
2012-09-28 19:08:13 -04:00
Joey Hess
ccba4404a9 typo 2012-09-28 18:33:46 -04:00
Joey Hess
211b31d552 tar paths 2012-09-28 18:32:59 -04:00
Joey Hess
81a109d8b7 fix 2012-09-28 18:31:18 -04:00
Joey Hess
008700ff13 fixes 2012-09-28 18:29:36 -04:00
Joey Hess
115f05db25 building linux standalone tarballs 2012-09-28 18:21:39 -04:00
Joey Hess
1363cea260 forgot to change one place when I moved the license 2012-09-28 16:24:23 -04:00
Joey Hess
1117583087 The Makefile now builds with the new yesod by default.
Systems like Debian that have the old yesod 1.0.1 should set
GIT_ANNEX_LOCAL_FEATURES=-DWITH_OLD_YESOD
2012-09-28 15:59:06 -04:00
Joey Hess
af8b65cf24 fix location of license file
the webapp expects it under GIT_ANNEX_OSX_APP_BASE
2012-09-28 13:11:46 -04:00
Joey Hess
c86302df2b let's build the dmz from the osxapp target
Also, delete old version, otherwise hditool chokes on it
2012-09-28 12:20:18 -04:00
Joey Hess
7a66515c1e use gzcat
on some OSX boxes, zcat is some BSD gzip that expects a .Z file

(What a flaming mess)
2012-09-28 12:17:35 -04:00
Jimmy Tang
402a9d1305 copy licenses into the root of the build-dmg folder to make it clear as to what the license is 2012-09-27 22:32:56 +01:00
Joey Hess
a02d6b36d8 Add OSX standalone app license bundle, and arrange for the About page
to link to it.
2012-09-27 16:47:52 -04:00
Jimmy Tang
ad5b35026e teach the makefile to generate a .dmg file for the OSX app, the licenses and basic readme's still needs to be copied into the tmp/build-dmg directory. 2012-09-27 20:23:40 +01:00
Joey Hess
df1790b595 avoid installing git-annex from PATH to the webapp 2012-09-27 11:44:40 -04:00
Joey Hess
ba7b27892b strip git-annex when installing into the app 2012-09-26 19:04:21 -04:00
Joey Hess
be6b68402b add gpg 2012-09-26 16:53:30 -04:00
Joey Hess
74fb57d1c4 preserve library directories
Should avoid overwriting libraries when there are multiple versions of
a library used by different programs.
2012-09-25 10:27:21 -04:00
Joey Hess
3f8d1f1289 fixes 2012-09-25 10:22:41 -04:00
Joey Hess
9cac71d68a typo 2012-09-25 10:15:07 -04:00
Joey Hess
19291ae8ad build osx app in tmp dir 2012-09-25 10:12:25 -04:00
Joey Hess
37dff15ade add osxapp target
Not fully tested.
2012-09-24 19:42:45 -04:00
Joey Hess
24bfabe263 add build dep on network-info 2012-09-07 19:44:20 -04:00
Joey Hess
a8e05c8da1 add network-multicast to bulld depends 2012-09-07 14:54:00 -04:00
Joey Hess
47b88bbd16 move build scripts 2012-09-01 15:22:22 -04:00
Joey Hess
68f1be8f0a Merge branch 'master' into assistant
Conflicts:
	Makefile
	debian/copyright
2012-08-20 16:04:56 -04:00
Joey Hess
db960871fd use a stamp file to avoid running ghc in make install
That fails when make install is run sudoed, but cabal has been used to
install dependencies in a user's home directory.
2012-08-20 16:02:41 -04:00
Joey Hess
be310ac4d0 support building with yesod-default 1.1.0
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.
2012-08-09 13:33:04 -04:00
Joey Hess
a66e1f68ca remove template haskell file touching
too annoying
2012-08-07 13:25:06 -04:00
Joey Hess
c08ce66427 make dir 2012-08-07 13:12:16 -04:00
Joey Hess
415f0dd5d8 don't clobber env variable if set 2012-08-07 12:24:12 -04:00
Joey Hess
8925d975a9 build in GIT_ANNEX_TMP_BUILD_DIR
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.
2012-08-07 12:05:24 -04:00
Joey Hess
e78b13c428 hook desktop menu file installation into makefile and cabal 2012-08-01 21:05:27 -04:00
Joey Hess
c950e8fba0 move out to template 2012-07-31 18:33:19 -04:00
Joey Hess
ff4ab6d6da work around GHC not knowing to rebuild files using template haskell
when things they include change
2012-07-26 22:59:14 -04:00
Joey Hess
8e49206af5 fix normal build to include OPTFLAGS 2012-07-26 13:02:00 -04:00
Joey Hess
32d3cffc4c run yesod, and launch webapp on startup 2012-07-25 21:26:13 -04:00
Joey Hess
03979d4d54 Merge branch 'master' into assistant
Conflicts:
	Makefile
2012-07-25 14:55:53 -04:00
Joey Hess
927b53088f force C compiler to build 32 bit on OSX when 32 bit ghc is being used 2012-07-24 11:01:15 -04:00
Joey Hess
107a7b9388 try to make Utility.Mounts portable
This is an unholy mashup, but it just might work. It works on Linux,
that's all I've tested. :)
2012-07-19 20:38:58 -04:00
Joey Hess
f20a40f9d4 MountWatcher thread
Currently only prints mount points when mounts happen.
2012-07-19 13:04:33 -04:00
Joey Hess
1d5582091e attempt at building with -threaded
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.
2012-07-17 13:37:55 -04:00
Joey Hess
41fcb3d852 Version build dependency on STM, and allow building without it, which disables the watch command. 2012-06-26 09:15:47 -04:00
Joey Hess
3c8a9043b6 skeleton C library for calling kqueue 2012-06-18 12:25:20 -04:00
Jimmy Tang
89f6f820bf Teach _Makefile_ to only do _-DWITH_INOTIFY_ when on a Linux machine. 2012-06-18 10:09:13 -04:00
Joey Hess
91567ab8f6 make inotify a build flag etc 2012-06-17 17:15:56 -04:00
Joey Hess
01beef4459 fix make-sdist to omit too long filenames 2012-06-15 14:14:50 -04:00
Nathan Collins
79a71d9ba6 Simplify git-annex.cabal and generate sdist with make-sdist.sh.
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.
2012-06-12 02:36:05 -07:00