Changeset e4f08bf for doc/user-guide/genhelp.py

Timestamp:

2015-06-08T18:25:08Z (9 years ago)

Author:

dequis <dx@…>

Children:

29ff5c2

Parents:

c720890 (diff), 61e7e02 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'develop' into feat/hip-cat

Conflicts:

configure

File:

• doc/user-guide/genhelp.py (modified) (3 diffs)

doc/user-guide/genhelp.py

@@ -3 +3 @@
 # Usage: python genhelp.py input.xml output.txt
 # (Both python2 (>=2.5) or python3 work)
+#
+# The shebang above isn't used, set the PYTHON environment variable
+# before running ./configure instead
 
 # This program is free software; you can redistribute it and/or
@@ -20 +23 @@
 
 
+import os
 import re
 import sys
@@ -222 +226 @@
         return
 
+    # ensure that we really are in the same directory as the input file
+    os.chdir(os.path.dirname(os.path.abspath(sys.argv[1])))
+
     txt = process_file(sys.argv[1])
     open(sys.argv[2], "w").write(txt)