diff options
author | Joey Hess <joey@kitenet.net> | 2013-05-15 19:18:04 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2013-05-15 19:18:04 -0400 |
commit | 9faa6f0e33dd9e8c7ec3b96715ea3878ff9ef2f0 (patch) | |
tree | 3bde05906addb27cb565d67b05bf686945ee235a /doc/design | |
parent | 8986a918e5af331db29b953e061dc2d20a5b86d2 (diff) | |
parent | a243fb1c7f04817fa19209689849aa2fe8631b3d (diff) |
Merge branch 'master' into windows
Diffstat (limited to 'doc/design')
8 files changed, 71 insertions, 1 deletions
diff --git a/doc/design/assistant/blog/day_259__Android_dominos_toppling/comment_2_1ebc5aff5d217e1392cb7c8bb6c5156b._comment b/doc/design/assistant/blog/day_259__Android_dominos_toppling/comment_2_1ebc5aff5d217e1392cb7c8bb6c5156b._comment new file mode 100644 index 000000000..cfe1347bd --- /dev/null +++ b/doc/design/assistant/blog/day_259__Android_dominos_toppling/comment_2_1ebc5aff5d217e1392cb7c8bb6c5156b._comment @@ -0,0 +1,14 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawmmLfBDEDFfEOba8Ra46nsnTmoNHFsLObo" + nickname="Brian" + subject="I also see the connection timed out" + date="2013-05-15T00:19:34Z" + content=""" +Same Android device and same behavior as the above comment. While the connection attempt was being made, I switched to the terminal window and saw a connection to 173.194.46.86:5222 in the SYN_SENT state (and that connection wasn't there prior to the jabber configuration attempt). + +Even from my desktop, manual connection attempts to 173.194.46.86:5222 timed out. + +Then I ran the same jabber configuration from my desktop and it worked fin. Using netstat, I could see it connected to 74.125.133.125:5222. + +So is the Android version using the wrong address? +"""]] diff --git a/doc/design/assistant/blog/day_262__catching_up.mdwn b/doc/design/assistant/blog/day_263_catching_up.mdwn index 8158a34c6..b8eadbc96 100644 --- a/doc/design/assistant/blog/day_262__catching_up.mdwn +++ b/doc/design/assistant/blog/day_263_catching_up.mdwn @@ -7,3 +7,5 @@ working. But nothing that moves content quite works yet.. I've run into a stumbling block with `rsync`. It thinks that `C:\repo` is a path on a ssh server named "C". Seems I will need to translate native windows paths to unix-style paths when running rsync. + +[[!meta date="13 May 2013"]] diff --git a/doc/design/assistant/blog/day_263_catching_up/comment_1_9023da0573dfc81644d68128adb331a7._comment b/doc/design/assistant/blog/day_263_catching_up/comment_1_9023da0573dfc81644d68128adb331a7._comment new file mode 100644 index 000000000..83e7523ff --- /dev/null +++ b/doc/design/assistant/blog/day_263_catching_up/comment_1_9023da0573dfc81644d68128adb331a7._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawkHscTHMCNvjJ6nLI1VpsBrJFI5FTwhUT4" + nickname="David" + subject="Just use Unix Paths like git does?" + date="2013-05-15T20:43:34Z" + content=""" +Can't you just use unix-style paths for your internal data structures, and wrap/patch the filesystem I/O code to convert between the two? +"""]] diff --git a/doc/design/assistant/blog/day_264__Windows_second_stage_complete.mdwn b/doc/design/assistant/blog/day_264__Windows_second_stage_complete.mdwn new file mode 100644 index 000000000..f34e8b15e --- /dev/null +++ b/doc/design/assistant/blog/day_264__Windows_second_stage_complete.mdwn @@ -0,0 +1,21 @@ +The Windows port can now do everything in the [[walkthrough]]. It can use +both local and remote git repositories. Some special remotes work +(directory at least; probably rsync; likely any other special remote that +can have its dependencies built). Missing features include most special +remotes, gpg encryption, and of course, the assistant. + +Also built a NullSoft installer for git-annex today. This was made very +easy when I found the Haskell ncis library, which provides a DSL embedding +the language used to write NullSoft installers into Haskell. So I didn't +need to learn a new language, yay! And could pull in all my helpful +Haskell utility libraries in the program that builds the installer. + +The only tricky part was: How to get git-annex onto PATH? The standard way +to do this seems to be to use a multiple-hundred line include file. Of +course, that file does not have any declared license.. Instead of that, +I used a hack. The git installer for Windows adds itself to PATH, and is +a pre-requisite for git-annex. So the git-annex installer just installs +it into the same directory as git. + +So.. I'll be including this first stage Windows port, with installer in +the next release. Anyone want to run a Windows autobuilder? diff --git a/doc/design/assistant/blog/day_264__Windows_second_stage_complete/comment_1_42a7502d6ece75520eb59a76fdb1e2f0._comment b/doc/design/assistant/blog/day_264__Windows_second_stage_complete/comment_1_42a7502d6ece75520eb59a76fdb1e2f0._comment new file mode 100644 index 000000000..e7846d5fb --- /dev/null +++ b/doc/design/assistant/blog/day_264__Windows_second_stage_complete/comment_1_42a7502d6ece75520eb59a76fdb1e2f0._comment @@ -0,0 +1,9 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawlJ2utMQgMEYAOs3Dfc6eZRyUzt4acNXUU" + nickname="David" + subject="git on windows" + date="2013-05-15T04:26:48Z" + content=""" +Adding git to the PATH variable is an optional step in the msysgit installer, fyi. + +"""]] diff --git a/doc/design/assistant/blog/day_264__Windows_second_stage_complete/comment_2_f2b11322ac87e2a36cddc035b2c3c1ea._comment b/doc/design/assistant/blog/day_264__Windows_second_stage_complete/comment_2_f2b11322ac87e2a36cddc035b2c3c1ea._comment new file mode 100644 index 000000000..1ff6bd542 --- /dev/null +++ b/doc/design/assistant/blog/day_264__Windows_second_stage_complete/comment_2_f2b11322ac87e2a36cddc035b2c3c1ea._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus" + nickname="Jimmy" + subject="comment 2" + date="2013-05-15T22:30:05Z" + content=""" +I was thinking maybe migrating away from gitbuilder to using something like buildbot as it seems to be a better fit for this project than gitbuilder. +"""]] diff --git a/doc/design/assistant/blog/day_264__Windows_second_stage_complete/comment_3_ea6ee05acb946fc7e8d95e62647cfa2a._comment b/doc/design/assistant/blog/day_264__Windows_second_stage_complete/comment_3_ea6ee05acb946fc7e8d95e62647cfa2a._comment new file mode 100644 index 000000000..39d2a837d --- /dev/null +++ b/doc/design/assistant/blog/day_264__Windows_second_stage_complete/comment_3_ea6ee05acb946fc7e8d95e62647cfa2a._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + nickname="joey" + subject="comment 3" + date="2013-05-15T22:56:27Z" + content=""" +@Jimmy, would be fine with me if it works better +"""]] diff --git a/doc/design/assistant/polls/Android_default_directory.mdwn b/doc/design/assistant/polls/Android_default_directory.mdwn index bbf332f51..0d1c65ddf 100644 --- a/doc/design/assistant/polls/Android_default_directory.mdwn +++ b/doc/design/assistant/polls/Android_default_directory.mdwn @@ -4,4 +4,4 @@ Same as the desktop webapp, users will be able to enter a directory they want the first time they run it, but to save typing on android, anything that gets enough votes will be included in a list of choices as well. -[[!poll open=yes expandable=yes 43 "/sdcard/annex" 3 "Whole /sdcard" 4 "DCIM directory (photos and videos only)" 1 "Same as for regular git-annex. ~/annex/"]] +[[!poll open=yes expandable=yes 44 "/sdcard/annex" 3 "Whole /sdcard" 4 "DCIM directory (photos and videos only)" 1 "Same as for regular git-annex. ~/annex/"]] |