Commit graph

155 commits

Author SHA1 Message Date
Joey Hess
95bbdb8680
Revert "workaround try #3"
This reverts commit 3fe79c0d1b.

Didn't cause the overall build to fail either.
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
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
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
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
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
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
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
550f269828 now I know why the test suite failed on the autobuilder.. MAX_PATH 2015-01-06 14:52:43 -04:00
Joey Hess
ae72e4a62a fail windows build if test suite doesn't pass 2014-12-30 17:16:57 -04:00
Joey Hess
ed21043ab7 typo 2014-12-30 15:33:42 -04:00
Joey Hess
8428e36661 try running test in a different directory
I have a theory that something is deleting the .t directory
or it doesn't get made in the location tried.

The last test showed:

  add:  ("recordedInodeCache",Key {keyName = "e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77", keyBackendName = "SHA256E", keySize = Just 20, keyMtime = Nothing, keyChunkSize = Nothing, keyChunkNum = Nothing},"start")
("recordedInodeCache",Key {keyName = "e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77", keyBackendName = "SHA256E", keySize = Just 20, keyMtime = Nothing, keyChunkSize = Nothing, keyChunkNum = Nothing},"end")
("writeInodeCache",Key {keyName = "e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77", keyBackendName = "SHA256E", keySize = Just 20, keyMtime = Nothing, keyChunkSize = Nothing, keyChunkNum = Nothing},"start")
git-annex: c:\jenkins\workspace\msysgit-git-annex-assistant-test\git-annex\.t\repo\.git\annex\objects\6cd\e82\SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77\SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77.cache: openFile: does not exist (No such file or directory)
FAIL
    add failed

So writeInodeCache is what's failing, and it seems to fail to write the file
despite having made the parent directory.
2014-12-30 15:26:34 -04:00
Joey Hess
c994d73fcf force recompilation of the nullsoft installer; it does not seem to be noticing changes somehow 2014-12-03 14:00:22 -04:00
Joey Hess
90fdd28fd8 try to fix PATH so test suite will work 2014-08-13 13:29:27 -04:00
Joey Hess
6fe0f300a6 clean up 2014-08-13 13:21:22 -04:00
Joey Hess
7ab5c346ff typo 2014-08-13 13:03:46 -04:00