Joey Hess
357a6e6709
work around stack-work directory path bug
...
fatal: Invalid path '/cygdrive/c/jenkins/workspace/git-annex-master/git-annex/.stack-work/downloaded/C:\jenkins\workspace\git-annex-master\git-annex\.stack-work\downloaded\56E6vnUQljVi': No such file or directory
2017-10-25 14:49:35 -04:00
Joey Hess
833b3f06cd
build for windows with forked win32 package that has terminateProcessId
...
Get ugly reversion out of CHANGELOG.
Also, relocated the windows stack.yaml to top, and updated windows build
instructions.
This commit was sponsored by Henrik Riomar on Patreon.
2017-10-25 14:45:23 -04:00
Joey Hess
0156ea7f53
expand comment
2017-10-25 14:02:49 -04:00
Joey Hess
54e596894f
Windows: Remove wget from bundle; it needs libraries that are not included, and git for windows includes curl which git-annex will use instead.
...
wget was broken even in the previous old release of the windows bundle,
this is not new breakage. msys-idn-11.dll and probably more would be needed
to use it. git for windows includes msys-idn2-0.dll instead.
2017-10-25 13:51:31 -04:00
Joey Hess
7dc477a4fc
fix build-version creation
2017-10-25 13:37:51 -04:00
Joey Hess
dd6d0cc9af
fix path
...
git-annex is installed into . by Build/NullSoftInstaller, so use that
for running git-annex test
2017-10-25 00:23:18 -04:00
Joey Hess
2a2e30f729
make dir
2017-10-25 00:19:10 -04:00
Joey Hess
3761f5a052
try different path
2017-10-25 00:09:58 -04:00
Joey Hess
cea1fed395
try different path
2017-10-25 00:07:39 -04:00
Joey Hess
7688d64564
add bin path
2017-10-25 00:02:25 -04:00
Joey Hess
c03c1d800e
avoid stack runghc
...
Seems to want to recompile git-annex before running unrelated program.
stack ghc does not have that problem
2017-10-24 13:46:53 -04:00
Joey Hess
0804599941
--no-haddock
2017-10-24 13:37:57 -04:00
Joey Hess
21d6df8f91
use windows stack.yaml for additional stack commands
2017-10-24 13:30:51 -04:00
Joey Hess
2c71f4a3a8
remove unncessary withcyg
2017-10-24 12:05:00 -04:00
Joey Hess
6f7db3df09
add to PATH
2017-10-24 12:02:14 -04:00
Joey Hess
a732dbee31
get rsync before build
2017-10-22 15:22:24 -04:00
Joey Hess
c745480882
typo
2017-10-22 15:20:26 -04:00
Joey Hess
008e991ff5
run only 1 job
...
Seeing interrmittent build failures that may be related to stack's
concurrency
2017-10-22 15:02:43 -04:00
Joey Hess
87c6f506e7
disable haddock
2017-10-22 14:50:09 -04:00
Joey Hess
0e766a41c6
try lts-9.10 with old win32
...
toolchain issue is preventing nightly from building anything on windows
2017-10-22 14:20:54 -04:00
Joey Hess
11928ae432
add IfElse version
2017-10-22 14:08:45 -04:00
Joey Hess
fda47b0a01
switch to nightly-2017-10-22 for newer win32
2017-10-22 14:03:10 -04:00
Joey Hess
79f56fd449
point packages dir at top
2017-10-22 13:59:42 -04:00
Joey Hess
84a517dbcb
windows-specific stack.yaml to enable Win32
2017-10-22 13:58:21 -04:00
Joey Hess
7391c49305
temporarily disable rm to get building
2017-10-22 13:42:46 -04:00
Joey Hess
bc08ef886d
better fix for rm path
2017-10-22 13:40:01 -04:00
Joey Hess
836e70424d
add cygwin bin to path
2017-10-22 13:39:26 -04:00
Joey Hess
35c807b5bc
remove msysgit cruft
2017-10-22 13:38:11 -04:00
Joey Hess
b744588459
remove ghc --version
...
using stack, version is pinned
2017-10-22 13:37:18 -04:00
Joey Hess
122205e99d
force update
2017-10-22 13:22:55 -04:00
Joey Hess
59a0308f5f
update windows build scripts to use stack
...
Not tested yet.
The EvilLinker workaround is removed. That got fixed in ghc 8.0.1,
(per https://ghc.haskell.org/trac/ghc/ticket/8596 )
which will finally be used by the windows autobuilder now.
I have not deleted the EvilLinker yet (or closed its bugs).
This commit was sponsored by John Peloquin on Patreon.
2017-10-17 13:00:29 -04:00
Joey Hess
ddff4ebc84
log ghc version
2017-10-16 15:29:45 -04:00
Joey Hess
19f0f42cf3
avoid cloning xss-sanitize when clone already exists
2017-10-16 15:19:22 -04:00
Joey Hess
c8cc32335f
try working around strange cabal install bug for xss-sanitize
2017-10-16 15:11:50 -04:00
Joey Hess
1b6b951cc0
try explicitly installin xss-sanitize
2017-08-23 12:37:16 -04:00
Joey Hess
24a6634934
stop removing cabal
2017-08-23 11:31:14 -04:00
Joey Hess
79020a9c26
avoid broken version of xss-sanitize
...
https://github.com/yesodweb/haskell-xss-sanitize/issues/17
2017-08-17 17:12:48 -04:00
Joey Hess
677fa66249
temporarily --force-reinstalls
2017-08-17 13:57:47 -04:00
Joey Hess
cd4c97156e
force update of cabal libs
2017-08-17 11:00:37 -04:00
Edward Betts
0750913136
correct spelling mistakes
2017-02-12 17:30:23 -04:00
Joey Hess
ab66bbfeb6
Merge branch 'master' into no-xmpp
2016-12-24 15:01:55 -04:00
Joey Hess
95c8b37544
Linux standalone: Improve generation of locale definition files, supporting locales such as, en_GB.UTF-8.
2016-12-19 17:03:52 -04:00
Joey Hess
be5cd15311
urk
...
test failures were being ignored for complex reasons, new autobuilder broke that; bring it back
2016-12-01 12:18:00 -04:00
Joey Hess
d58148031b
remove xmpp support
...
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.
2016-11-14 14:53:08 -04:00
Joey Hess
aacd9b190d
Linux standalone: Include locale files in the bundle, and generate locale 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.
2016-10-04 16:37:43 -04:00
Joey Hess
a93e38e8fc
add LOCPATH to GIT_ANNEX_STANDLONE_ENV
2016-10-04 15:32:58 -04:00
Joey Hess
c079811226
Linux standalone: Add back the LOCPATH=/dev/null hack to avoid the system locale-archive being read.
...
Version mismatches between the system locale-archive and the glibc in the
bundle have been observed to cause git crashes.
Unfortunately, this causes locales to not be used in the linux standalone
bundle, as was the case until version 6.20160419.
glibc hardcodes the path to /usr/lib/locale/locale-archive and does not
let an environment variable cause a different locale-archive file to be used.
The only other option to include locales in the bundle would be to include
exploded locale definition directories in the bundle for a number of
locales, generated by localedef. But these take at least 300 kb per locale,
and there are a great many locales; it would be hundreds of megabytes to
include them all.
(Hmm, we could include localdef in the bundle, and check LANG in runshell
and compile the locale directories on the fly. This would need
/usr/share/i18n/ and /usr/lib/locale-archive to be included in the bundle.
It's.. doable.)
I know this is going to once again cause users of the bundle to complain
that eg, ls doesn't show their unicode filenames right. Better than strange
crashes though.
2016-10-04 12:53:09 -04:00
Joey Hess
dceb0cc627
typo
2016-09-06 14:51:15 -04:00
Joey Hess
b9e2061b2a
stop removing old builds again
2016-09-06 14:38:47 -04:00
Joey Hess
833a80ae89
pin mwc-random to last known working version on windows
2016-09-06 14:18:04 -04:00
Joey Hess
fd02af6136
constrain cryptonite version to avoid windows build fail
...
https://github.com/haskell-crypto/cryptonite/issues/99
2016-09-06 13:50:55 -04:00
Joey Hess
022382160a
try using cabal constraint
2016-09-06 13:25:02 -04:00
Joey Hess
d242e21968
perisstent-sqlite-2.2.1 fails to build on windows
2016-09-06 13:13:07 -04:00
Joey Hess
b786400671
remove old cabal install libraries to try to fix windows autobuilder
2016-09-06 12:58:51 -04:00
Joey Hess
a8f2f29da1
pin crytonite on android to 0.15, which is the version I've been using
2016-06-09 15:34:37 -04:00
Joey Hess
9b73c85952
Android: Icon refresh. Thanks, freewheelinfranks.
2016-05-03 13:27:06 -04:00
Joey Hess
9f6c29fb38
pin unix to already installed version
...
This prevents multiple versions of unix, from ghc and needed by newer
versions of some packages conflicting.
Had to update the bytestring and blaze-builder pins follow-on from this
change.
2016-04-28 14:21:57 -04:00
Joey Hess
6566795e4f
pin directory to last version that doesn't break MissingH
...
https://github.com/jgoerzen/missingh/issues/31
2016-04-28 13:02:56 -04:00
Joey Hess
f947781fa0
Avoid setting LOCPATH in linux standalone builds now that ghc has been fixed to not hang when it cannot find locale files.
2016-04-20 12:40:11 -04:00
Joey Hess
39165d4bf7
update android git to 2.8.0.rc3, fixing recent security holes
2016-03-17 23:22:28 -04:00
Joey Hess
276a67184c
fix typo in flags
2016-03-09 13:39:00 -04:00
Joey Hess
40c15871d5
remove LGPL, after removing the LGPLed file
2016-03-05 11:24:05 -04:00
Joey Hess
471a211d21
Include magic database in the linux and OSX standalone builds.
2016-02-26 11:54:15 -04:00
Joey Hess
67dc0d238f
disable new build flags for android build
2016-02-23 10:59:59 -04:00
Joey Hess
5f11e3cd26
fix path to extra dir
2016-02-19 16:51:40 -04:00
Joey Hess
398d93d4d2
Linux and OSX standalone builds put the bundled gpg last in PATH, so any system gpg will be preferred over it.
2016-02-19 16:19:19 -04:00
Joey Hess
95bbdb8680
Revert "workaround try #3 "
...
This reverts commit 3fe79c0d1b
2016-02-17 14:07:54 -04:00
Joey Hess
3fe79c0d1b
workaround try #3
2016-02-16 17:07:17 -04:00
Joey Hess
cceff0e46c
wow, this windows sh is super busted. try another hack
2016-02-15 16:15:23 -04:00
Joey Hess
7d4b4a77b1
seems false didn't cause windows shell to propigate test suite failure
2016-02-15 15:23:17 -04:00
Joey Hess
927e1a067e
fix import warnings
2016-01-14 10:30:54 -04:00
Joey Hess
d9d87fdbc9
Make the git-annex-standalone.deb prevent runshell from installing wrappers into $HOME/.ssh
2015-11-10 12:53:46 -04:00
Joey Hess
3e49f9fcab
runshell: Avoid failing when $HOME/.ssh does not exist and cannot be created.
2015-11-10 11:42:06 -04:00
Joey Hess
a4a9be9004
remove verbose flag; aws deps fixed
2015-10-19 13:54:10 -04:00
Joey Hess
3c6f314545
be verbose to debug problem with aws
2015-10-06 19:56:25 -04:00
Joey Hess
5d36efef20
force installing older warp; current fails to build
2015-10-06 16:54:41 -04:00
Joey Hess
dd38d01a11
sed out the filename from sha1sum output
2015-10-06 16:53:24 -04:00
Joey Hess
c83472145c
hopefuly fix sha1sum calling; also refactor and check downloaded program's sha before using it
2015-10-06 16:44:12 -04:00
Joey Hess
d9a3ae23c5
remove workaround
2015-10-04 15:04:52 -04:00
Joey Hess
65bb52bc3b
force installing older warp; current fails to build
2015-10-04 14:51:23 -04:00
Joey Hess
64a1f6d4d7
fix PATH
...
zcat is needed from cygwin to build
2015-09-11 13:46:29 -04:00
Joey Hess
c7a6296ef3
get git-annex working even if user doesn't add git to path
...
This is pretty complicated, but I have both "git-annex" and "git annex"
working both in the git bash shell even with git not added to path.
And, when git's added to path, both work from MS-DOS prompt window too.
I think that the webapp startup does still need git in path, so
instructions will keep saying to do that. But, users often disregard them,
and hopefully this will reduce support traffic.
Also, switched the wget from the cygwin one to the msys2 one, avoiding the
complication of needing to bundle any cygwin dlls.
2015-09-11 12:44:27 -04:00
Joey Hess
6158036e23
Switched to using git for Windows, rather than msysgit.
...
Using msysgit with git-annex is no longer supported.
At the same time, I'm updating the rsync.exe in my downloads repository
with the one from msys2.
Note that rsync is currently still being ldded and installed in Git/cmd/
like the other cygwin programs. The ldd fails and this failure is ignored.
It would be better to special case it to go in Git/usr/bin/, so that the
user can't run rsync in a dos prompt window, which doesn't work, as it needs
additional libs. However, as far as git-annex running rsync running ssh,
it works ok in this location.
Removed the ssh.cmd and ssh-keygen.cmd; these are not needed with git for
windows. Keeping them would let ssh be run manually from a dos prompt
window, but that's not really a goal.
2015-09-10 19:16:30 -04:00
Joey Hess
1bef0d9053
add \usr\bin to path
...
This is where these commands are installed by the new "git for windows".
Kept the old paths too, so msysgit will still work.
This was enough to get ssh and ssh-keygen working when run at the DOS
prompt with the new git for windows installed. However, for some reason,
rsync still fails to find ssh in path when that version of git is used.
2015-09-10 13:28:32 -04:00
Joey Hess
538ff09477
no warn tabs when building the EvilLinker and NullSoftInstaller
2015-09-01 15:07:35 -07:00
Joey Hess
a8f3f04768
No need to add HP to PATH
2015-09-01 15:05:15 -07:00
Joey Hess
4ee9cb9c6d
decruft
2015-09-01 09:43:46 -07:00
Joey Hess
7133b68afe
Linux standalone: Work around problem that prevented it from working properly if unpacked into a directory that contains ":" or ";" in its name.
2015-08-04 16:08:19 -04:00
Joey Hess
e320df005e
allow any version of ansi-terminal
2015-08-03 13:36:26 -04:00
Joey Hess
c196f474b6
avoid pinning tasty to old version
...
Newer version is needed for new version of optparse-applicative,
and any version will do.
2015-08-03 13:22:34 -04:00
Joey Hess
8b22e1df9c
last changes to fix android build
2015-08-02 23:02:53 -04:00
androidbuilder
fd982ad43f
bump optparse-applicative version
2015-08-02 23:11:22 +00:00
androidbuilder
ce93ba24d4
update android patches for new version of shakespeare
2015-08-02 22:52:22 +00:00
androidbuilder
34c6e0ea1a
reverted updates to new lib versions that broke android build
...
I ran into several evilsplicer problems with the new lib versions, most notably including a problem with encoding of embedded binary files
2015-08-02 19:48:36 +00:00
Joey Hess
c4bb2cb927
module name changed
2015-07-03 12:57:22 -04:00
Joey Hess
3284e177c8
modify pins to allow building on debian jessie
...
Debian testing is currently a little broken for use for the android
autobuilder.
2015-07-03 12:48:49 -04:00
Joey Hess
64b0030acc
Merge orca:/tmp/android
2015-07-02 23:04:35 -04:00
Joey Hess
20be770a77
update patches for newer package versions
2015-07-02 23:03:34 -04:00
Joey Hess
b98fecc888
remove some patches that are no longer used
2015-07-02 23:02:48 -04:00
Joey Hess
ecedab0120
patch needed for new entropy version
2015-07-02 17:16:52 -04:00
Joey Hess
4b14877c19
persistent no longer needs no-th patch
2015-07-02 16:53:00 -04:00
Joey Hess
77cabc07ed
update vector patch; only needed for android cross build now
2015-07-02 16:50:26 -04:00
Joey Hess
4ada52698a
android: install exact same package versions for host and cross compiler
2015-07-02 15:46:05 -04:00
Joey Hess
928e291ba9
remove old patches for hamlet
2015-06-06 14:17:43 -04:00
Joey Hess
7bf40863d7
update cabal pin file for linux standalone to current stackage
2015-05-31 14:36:12 -04:00
Joey Hess
7dd1e364b2
update for TH-capable arm autobuilder
...
Only 1 patched haskell package is needed on arm now.
2015-05-31 14:05:05 -04:00
Joey Hess
5e1f1bd252
Linux standalone, OSX app: Improve runshell script to always quote shell vars, so that it will work when eg, untarred into a directory path with spaces in its name.
2015-05-26 15:38:54 -04:00
Joey Hess
5de2d147d3
update android patches
2015-05-22 14:39:50 -04:00
Joey Hess
d32da9f9b6
add a wrapper for ssh-keygen
2015-05-08 14:55:57 -04:00
Joey Hess
38e2b95751
use a batch file to run msysgit's ssh, instead of copying
...
copying failed because dlls are not in path.
This batch file is based on the one msysgit uses to start gitk
2015-05-08 14:26:37 -04:00
Joey Hess
54bee7dad4
Revert "Android: Updated bundled ssh from 6.1p1 to 6.4p1."
...
This reverts commit 27836a2af9
2015-05-08 13:05:33 -04:00
Joey Hess
3cc76e3666
fix git rev for openssh on android
2015-05-08 12:59:21 -04:00
Joey Hess
4aba1c74bd
remaining dataenc to sandi conversions
...
I've tested all the dataenc to sandi conversions except Assistant.XMPP,
and all have unchanged behavior, including behavior on large unicode code
points.
2015-05-07 18:07:13 -04:00
Joey Hess
c89d64d396
set rsync executable
2015-05-07 16:12:05 -04:00
Joey Hess
721d32422e
typo
2015-05-07 16:11:30 -04:00
Joey Hess
41302bf6e4
fix path to wget
2015-05-07 16:05:46 -04:00
Joey Hess
18fc05ff04
Windows: Roll back to an older version of rsync from cygwin. The newer version has some dependency on a newer ssh from cygwin.
2015-05-07 15:56:40 -04:00
Joey Hess
27836a2af9
Android: Updated bundled ssh from 6.1p1 to 6.4p1.
...
Tested it builds, but have not run it yet.
2015-05-01 15:33:29 -04:00
Joey Hess
e506070646
avoid cabal update every time
2015-04-21 14:10:30 -04:00
Joey Hess
140cb56b2e
add msysgit to PATH, before cyg git
2015-04-21 14:08:04 -04:00
Joey Hess
552ed5433f
add NSIS to path
2015-04-21 01:28:47 -04:00
Joey Hess
d2ba5fb506
fix windows simple build script
2015-04-21 01:01:16 -04:00
Joey Hess
911335247c
if ~/.ssh does not exist and cannot be created, avoid failing
2015-04-20 13:15:01 -04:00
Joey Hess
5f73bc3a12
Removed dependency on haskell SHA library, instead using cryptohash >= 0.11.0.
2015-04-19 11:05:32 -04:00
Joey Hess
cfe20dd788
update pinned versions for android and armel to use new enough http-client for proxy support
...
I have not updated the autobuilder yet; these versions seem ok by
inspection.
2015-04-18 12:44:44 -04:00
Joey Hess
e0a840e735
FORCE_GIT_VERSION hack no longer needed; windows autobuilder fixed
2015-04-18 12:19:32 -04:00
Joey Hess
b46d37a76c
remove unnecessary clean
2015-04-14 15:18:23 -04:00
Joey Hess
a0b2c76deb
export UPGRADE_LOCATION too
2015-04-14 15:07:12 -04:00
Joey Hess
f613827772
argh, why u no version?
2015-04-14 15:03:08 -04:00
Joey Hess
a5963bb321
clean harder
2015-04-14 15:00:39 -04:00
Joey Hess
daa8cc298d
force clean
2015-04-14 14:54:49 -04:00
Joey Hess
5871f7abd2
put in workaround for strange version of git on the autobuilder
2015-04-14 14:44:19 -04:00
Joey Hess
eebd62d2bc
yet more autobuilder debugging
2015-04-14 14:35:32 -04:00
Joey Hess
cd5a669e05
more autobuilder debugging
2015-04-14 14:28:17 -04:00
Joey Hess
86ef14ecf0
try different path to msysgit
2015-04-14 14:19:27 -04:00
Joey Hess
b909b3ccbb
remove one-off clean
2015-04-06 14:11:43 -04:00
Joey Hess
4ca5370980
force rebuild
2015-04-06 14:07:02 -04:00
Joey Hess
00b07d7155
Better fix for standalone tarball git-annex sync linker shim bug, that works for "git annex sync" as well as "git-annex sync".
2015-03-27 16:06:50 -04:00
Joey Hess
5be536e523
Fix bug introduced in the last release that broke git-annex sync when git-annex was installed from the standalone tarball.
...
This was introduced by commit 450ee53ab6
2015-03-27 12:55:18 -04:00
Joey Hess
8fa2b0e8b8
run cabal update before trying to install build deps
2015-03-19 15:55:21 -04:00
Joey Hess
ea8bba4211
correct out of date comment
2015-03-19 15:52:32 -04:00
Joey Hess
76cde095fe
Linux standalone: Set LOCPATH=/dev/null to work around https://ghc.haskell.org/trac/ghc/ticket/7695
...
This prevents localization from working, but git-annex is not localized anyway.
2015-02-25 16:31:01 -04:00
Joey Hess
802e210275
more headers
2015-02-22 17:26:16 -04:00
Joey Hess
59a1430fb2
add a few exports used by generated code
2015-02-22 17:25:57 -04:00
Joey Hess
66804e14c1
get fromPersistValue imported
2015-02-22 15:55:00 -04:00
Joey Hess
eb158aa26c
fix import name
2015-02-22 15:49:34 -04:00
Joey Hess
a419a56c45
EvilSplicer hacks for persistent
2015-02-22 15:43:59 -04:00
Joey Hess
52cba8242b
update headers to work with spliced TH from persistent
2015-02-22 15:28:09 -04:00
Joey Hess
961f812e35
export Database.Persist.TH
2015-02-22 15:22:24 -04:00
Joey Hess
88fbb13ee3
Linux standalone: Improved process names of linker shimmed programs.
2015-02-16 19:36:26 -04:00
