campaigns_client.py becomes one of the installable tools for content authors.

To conform to the naming convention of the other tools it is renamed 
'wmlclient'.

SConstruct

@@ -77,7 +77,7 @@ The following special build targets
     all = wesnoth wesnoth_editor exploder cutter wesnothd campaignd (*).
     TAGS = build tags for Emacs (*).
     wesnoth-deps.png = project dependency graph
-    install-clientside = install 'all' executables + wmlscope/wmllint/wmlindent.
+    install-clientside = install 'all' executables and scripts.
     install = synonym for install-clientside
     install-wesnothd = install the Wesnoth multiplayer server.
     install-campaignd = install the Wesnoth campaign server.
@@ -1036,7 +1036,7 @@ fifodir = env['fifodir']
 mandir = os.path.join(env["prefix"], "share/man")
 clientside = filter(lambda x : x, [wesnoth, wesnoth_editor, cutter, exploder])
 daemons = filter(lambda x : x, [wesnothd, campaignd])
-pythontools = Split("wmlscope wmllint wmlindent")
+pythontools = Split("wmlscope wmllint wmlindent wmlclient")
 pythonmodules = Split("wmltools.py wmlparser.py wmldata.py wmliterator.py campaignserver_client.py libsvn.py __init__.py")
 
 def CopyFilter(fn):

data/tools/README

@@ -22,6 +22,11 @@ namespaces; campaign to core, core to campaign, or campaign to
 campaign.  See the header comment of wmlmove for a description and
 invocation options.
 
+=== wmlclient ===
+
+Command-line client for uploading WML content to and downloading from
+the campaign server.
+
 === wmlunits ===
 
 List names of all units in mainline, either as a mediawiki table or

data/tools/wmlclient

@@ -1,9 +1,15 @@
 #!/usr/bin/env python
 # encoding: utf8
+"""
+wmlclient -- a command-line client for the Wesnoth campaign server
+
+This tool is mainly intendended for WML authors and maintainers.
+It can be used to manage the WML content on the Wesnoth cammpaign server.
+Available functions include listing, downloading, uploading, and deleting
+add-ons.
+"""
 
 import sys, os.path, re, time, glob
-# in case the wesnoth python package has not been installed
-sys.path.append("data/tools")
 import wesnoth.wmldata as wmldata
 import wesnoth.wmlparser as wmlparser
 from wesnoth.campaignserver_client import CampaignClient

src/Makefile.am

@@ -23,7 +23,7 @@ CLEANFILES = revision.hpp
 
 if TOOLS
 bin_PROGRAMS += exploder cutter
-bin_SCRIPTS += wmlscope wmllint wmlindent
+bin_SCRIPTS += wmlscope wmllint wmlindent wmlclient
 CLEANFILES += $(bin_SCRIPTS)
 endif