Author: elvish_hunter
Date: Sun Mar 3 14:06:35 2013
New Revision: 56436
URL: http://svn.gna.org/viewcvs/wesnoth?rev=56436&view=rev
Log:
wmllint, wmlscope, wmlindent: backport r56380 to stable
Modified:
branches/1.10/changelog
branches/1.10/data/tools/wmlindent
branches/1.10/data/tools/wmllint
branches/1.10/data/tools/wmlscope
Modified: branches/1.10/changelog
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/1.10/changelog?rev=56436&r1=56435&r2=56436&view=diff
==============================================================================
--- branches/1.10/changelog (original)
+++ branches/1.10/changelog Sun Mar 3 14:06:35 2013
@@ -29,6 +29,8 @@
* Fixed bug #19970: No longer terminate due to corrupt preferences.
* Fixed a display artifact (halos not cleared) when WML moves a unit.
* Use bilinear interpolation for scaling images down.
+ * Fixed wmllint, wmlscope and wmlindent not working correctly on Windows if
a
+ command line argument ends with a backslash
Version 1.10.5:
* Campaigns:
Modified: branches/1.10/data/tools/wmlindent
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/1.10/data/tools/wmlindent?rev=56436&r1=56435&r2=56436&view=diff
==============================================================================
--- branches/1.10/data/tools/wmlindent (original)
+++ branches/1.10/data/tools/wmlindent Sun Mar 3 14:06:35 2013
@@ -302,5 +302,10 @@
quiet = True
elif opt in ('-v', '--verbose'):
verbose += 1
+ # in certain situations, Windows' command prompt appends a double quote
+ # to the command line parameters. This block takes care of this issue.
+ for i,arg in enumerate(arguments):
+ if arg.endswith('"'):
+ arguments[i] = arg[:-1]
convertor(lambda n, f1, f2: reindent(n, f1, f2),
arguments, "|".join(exclude))
Modified: branches/1.10/data/tools/wmllint
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/1.10/data/tools/wmllint?rev=56436&r1=56435&r2=56436&view=diff
==============================================================================
--- branches/1.10/data/tools/wmllint (original)
+++ branches/1.10/data/tools/wmllint Sun Mar 3 14:06:35 2013
@@ -2344,6 +2344,12 @@
if not arguments:
arguments = ["."]
+ # in certain situations, Windows' command prompt appends a double quote
+ # to the command line parameters. This block takes care of this issue.
+ for i,arg in enumerate(arguments):
+ if arg.endswith('"'):
+ arguments[i] = arg[:-1]
+
for dir in arguments:
ofp = None
for fn in allcfgfiles(dir):
Modified: branches/1.10/data/tools/wmlscope
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/1.10/data/tools/wmlscope?rev=56436&r1=56435&r2=56436&view=diff
==============================================================================
--- branches/1.10/data/tools/wmlscope (original)
+++ branches/1.10/data/tools/wmlscope Sun Mar 3 14:06:35 2013
@@ -425,6 +425,12 @@
elif switch in ('-w', '--warnlevel'):
warnlevel = int(val)
+ # in certain situations, Windows' command prompt appends a double quote
+ # to the command line parameters. This block takes care of this issue.
+ for i,arg in enumerate(arguments):
+ if arg.endswith('"'):
+ arguments[i] = arg[:-1]
+
forceused = "|".join(forceused)
if len(arguments):
dirpath = arguments
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
