From: Ian Jackson Date: Tue, 20 Oct 2009 18:32:15 +0000 (+0100) Subject: Merge branch 'stable-3.x' X-Git-Tag: 5.0^2~6 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-live.git;a=commitdiff_plain;h=c9225ff45ee5e69855cb24cfb648d903dbba54a7;hp=-c Merge branch 'stable-3.x' --- c9225ff45ee5e69855cb24cfb648d903dbba54a7 diff --combined yarrg/README index 98e7126,0a84f5c..d5062ac --- a/yarrg/README +++ b/yarrg/README @@@ -48,14 -48,12 +48,14 @@@ Options to vary the processing --test-servers Set default servers to be the test servers, not the real live ones (doesn't affect explicit settings). -Controlling what happens to the results - only one at a time: - --upload (default) Upload to the YARRG and PCTB servers - --tsv Print data as clean tab-separated-values file - --raw-tsv Dump the raw (not deduped, unsorted) OCR'd data - --best-prices Print best buy and sell price for each commodity - --arbitrage Print arbitrage opportunities +Controlling what happens to the results - one or more: + --upload (default) Upload to both the YARRG and PCTB servers + --upload-pctb Upload to the PCTB servers + --upload-yarrg Upload to the YARRG servers + --tsv Print data as clean tab-separated-values file + --raw-tsv Dump the raw (not deduped, unsorted) OCR'd data + --best-prices Print best buy and sell price for each commodity + --arbitrage Print arbitrage opportunities Privacy options, which control conversations with the dictionary server: --dict-local-only * Do not talk to the server even to fetch new dictionary. @@@ -96,7 -94,7 +96,7 @@@ This program has quite a few dependenci On other Linux distros the packages may have different names, but these should be roughly right for Debian and its derivatives. You can install them with this rune: - sudo apt-get install build-essential libnetpbm10-dev netpbm libx11-dev libxtst-dev libpcre3-dev tk8.4 libxml-parser-perl libjson-perl + sudo apt-get install git-core build-essential libnetpbm10-dev netpbm libx11-dev libxtst-dev libpcre3-dev tk8.4 libxml-parser-perl libjson-perl The supplied helper programs @@@ -174,7 -172,6 +174,7 @@@ for assisting players of Yohoho Puzzle ypp-sc-tools and YARRG are Copyright (C) 2009 Ian Jackson Copyright (C) 2009 Clare Boothby +Copyright (C) 2009 Steve Early This program is free software: you can redistribute it and/or modify it under the terms of diff --combined yarrg/web/intro index 467de52,66dc15f..825189b --- a/yarrg/web/intro +++ b/yarrg/web/intro @@@ -33,18 -33,17 +33,18 @@@ -YARRG (Yet Another Revenue Research Gatherer) + +YARRG (Yet Another Revenue Research Gatherer) YARRG - Yet Another Revenue Research Gatherer | -development -| introduction | documentation +| +development

Introduction to YARRG

@@@ -69,7 -68,7 +69,7 @@@ website

Uploading from Linux

The YARRG upload client uploads both to YARRG and to the -PCTB testing server. +PCTB testing server.

@@@ -84,24 -83,27 +84,27 @@@ To install the client, install the `git and the other dependencies listed in the `Installation requirements' section of the README and then run: 

- git clone http://www.chiark.greenend.org.uk/~ijackson/ypp-sc-tools/master/.git ypp-sc-tools
+ git-clone http://www.chiark.greenend.org.uk/~ijackson/ypp-sc-tools/master/.git ypp-sc-tools
  cd ypp-sc-tools
  cd yarrg
  make
this will download the code into the directory ypp-sc-tools, - and build the software. + and build the software. (If your Linux is very up to date you may + find that it complains that it doesn't know the command git-core. + In that case, use git core, with a space, instead.)

When new versions of the upload client are released, you can: 

  cd .../ypp-sc-tools
- git pull
+ git-pull
  cd yarrg
  make
- to fetch the new version. + to fetch the new version. (Again, you may need git pull + instead of git-pull.)

Uploading from Windows