diff --git a/README b/README
index ec8c855e1412cb830e328c559c63896594a75f81..c8fd5c346b777e0d3fdd10d962c80599954a51cb 100644
--- a/README
+++ b/README
@@ -142,8 +142,8 @@ Change history
 --------------
 
 Version 2.12c (03/28/2014)
-- Fix for  "one module per XSD file" to handle an include or import
-  element that refers to a remote schema on the Net (i.e. the
+- Fix for "one module per XSD file" to handle an include or import
+  element that refers to a *remote* schema on the Net (i.e. the
   location is "http:..." or "ftp:...") rather than a file on the
   local file system.  Added ability to access include/import file
   across the Net.  Thanks to Jinquan Liu for reporting this.
@@ -172,9 +172,12 @@ Version 2.12c (03/28/2014)
   minOccurs and maxOccurs from the xs:sequence that contains it.
 - The command line options and command line arguments used to
   generate modules are now included as comments near the top of the
-  generated modules.  This will help users later to determine which
-  XML schema and what options were used to generate each module.
-  Thanks to Mikki Weesenaar for suggesting this enhancement.
+  generated modules.  Also included in these generated comments is
+  the command line used to generate the module.  This will help
+  users later to determine which XML schema and what options were
+  used to generate each module, and to re-generate the module, if
+  needed.  Thanks to Mikki Weesenaar for suggesting this
+  enhancement.
 
 Version 2.12b (02/10/2014)
 - Fix to the aliasing capability.  You should now be able to alias
diff --git a/generateDS.py b/generateDS.py
index 2663efeb172e88f42900e2824afc7d73607c815f..f47d77187157e88d9da1bf063c677c854e1041aa 100755
--- a/generateDS.py
+++ b/generateDS.py
@@ -4280,7 +4280,13 @@ TEMPLATE_HEADER = """\
 %s
 #
 # Command line arguments:
-%s
+#   %s
+#
+# Command line:
+#   %s
+#
+# Current working directory (os.getcwd()):
+#   %s
 #
 
 import sys
@@ -4897,11 +4903,19 @@ def _cast(typ, value):
 def format_options_args(options, args):
     options1 = '\n'.join(['#   %s' % (item, ) for item in options])
     args1 = '\n'.join(['#   %s' % (item, ) for item in args])
-##     options1 = '\n'.join(
-##         ['#   ' + line for line in pprint.pformat(options).split('\n')])
-##     args1 = '\n'.join(
-##         ['#   ' + line for line in pprint.pformat(args).split('\n')])
-    return options1, args1
+    program = sys.argv[0]
+    options2 = ''
+    for name, value in options:
+        if value:
+            if name.startswith('--'):
+                options2 += ' %s="%s"' % (name, value, )
+            else:
+                options2 += ' %s "%s"' % (name, value, )
+        else:
+            options2 += ' %s' % name
+    args1 = ' '.join(args)
+    command_line = '%s%s %s' % (program, options2, args1, )
+    return options1, args1, command_line
 
 
 def generateHeader(wrt, prefix, options, args, externalImports):
@@ -4910,9 +4924,13 @@ def generateHeader(wrt, prefix, options, args, externalImports):
         version = ''
     else:
         version = ' version %s' % VERSION
-    options1, args1 = format_options_args(options, args)
+    options1, args1, command_line = format_options_args(options, args)
+    current_working_directory = os.path.split(os.getcwd())[1]
     s1 = TEMPLATE_HEADER % (
-        tstamp, version, options1, args1, ExternalEncoding, )
+        tstamp, version,
+        options1, args1,
+        command_line, current_working_directory,
+        ExternalEncoding, )
     wrt(s1)
     for externalImport in externalImports:
         wrt(externalImport + "\n")
@@ -5312,7 +5330,13 @@ TEMPLATE_SUBCLASS_HEADER = """\
 %s
 #
 # Command line arguments:
-%s
+#   %s
+#
+# Command line:
+#   %s
+#
+# Current working directory (os.getcwd()):
+#   %s
 #
 
 import sys
@@ -5599,9 +5623,11 @@ def generateSubclasses(root, subclassFilename, behaviorFilename,
             version = ''
         else:
             version = ' version %s' % VERSION
-        options1, args1 = format_options_args(options, args)
+        options1, args1, command_line = format_options_args(options, args)
+        current_working_directory = os.path.split(os.getcwd())[1]
         wrt(TEMPLATE_SUBCLASS_HEADER % (tstamp, version,
             options1, args1,
+            command_line, current_working_directory,
             superModule, ExternalEncoding, ))
         for element in ElementsForSubclasses:
             generateSubclass(
diff --git a/tests/OnePer/oneperType00_1One.py b/tests/OnePer/oneperType00_1One.py
index edc61fd66a4e8a1b0c5adb0ccaa60d2faf06af44..ee9f7b6900ebb93acbd6deac8a38d1e9a42a069c 100644
--- a/tests/OnePer/oneperType00_1One.py
+++ b/tests/OnePer/oneperType00_1One.py
@@ -18,6 +18,12 @@
 # Command line arguments:
 #   tests/oneper00.xsd
 #
+# Command line:
+#   generateDS.py --no-dates --no-versions --silence --member-specs="list" -f --one-file-per-xsd --output-directory="tests/OnePer" --module-suffix="One" --super="oneper2_sup" tests/oneper00.xsd
+#
+# Current working directory (os.getcwd()):
+#   generateds
+#
 
 import sys
 import getopt
diff --git a/tests/OnePer/oneperType00_2One.py b/tests/OnePer/oneperType00_2One.py
index edc61fd66a4e8a1b0c5adb0ccaa60d2faf06af44..ee9f7b6900ebb93acbd6deac8a38d1e9a42a069c 100644
--- a/tests/OnePer/oneperType00_2One.py
+++ b/tests/OnePer/oneperType00_2One.py
@@ -18,6 +18,12 @@
 # Command line arguments:
 #   tests/oneper00.xsd
 #
+# Command line:
+#   generateDS.py --no-dates --no-versions --silence --member-specs="list" -f --one-file-per-xsd --output-directory="tests/OnePer" --module-suffix="One" --super="oneper2_sup" tests/oneper00.xsd
+#
+# Current working directory (os.getcwd()):
+#   generateds
+#
 
 import sys
 import getopt
diff --git a/tests/OnePer/oneperType01_1One.py b/tests/OnePer/oneperType01_1One.py
index 7faa3f44837d762600169024a836c33042f9e4e0..a9dfa99c381db74df0b01e70a7c8dbf79659163f 100644
--- a/tests/OnePer/oneperType01_1One.py
+++ b/tests/OnePer/oneperType01_1One.py
@@ -18,6 +18,12 @@
 # Command line arguments:
 #   tests/oneper00.xsd
 #
+# Command line:
+#   generateDS.py --no-dates --no-versions --silence --member-specs="list" -f --one-file-per-xsd --output-directory="tests/OnePer" --module-suffix="One" --super="oneper2_sup" tests/oneper00.xsd
+#
+# Current working directory (os.getcwd()):
+#   generateds
+#
 
 import sys
 import getopt
diff --git a/tests/OnePer/oneperType01_2One.py b/tests/OnePer/oneperType01_2One.py
index 7faa3f44837d762600169024a836c33042f9e4e0..a9dfa99c381db74df0b01e70a7c8dbf79659163f 100644
--- a/tests/OnePer/oneperType01_2One.py
+++ b/tests/OnePer/oneperType01_2One.py
@@ -18,6 +18,12 @@
 # Command line arguments:
 #   tests/oneper00.xsd
 #
+# Command line:
+#   generateDS.py --no-dates --no-versions --silence --member-specs="list" -f --one-file-per-xsd --output-directory="tests/OnePer" --module-suffix="One" --super="oneper2_sup" tests/oneper00.xsd
+#
+# Current working directory (os.getcwd()):
+#   generateds
+#
 
 import sys
 import getopt
diff --git a/tests/OnePer/oneperType02_1One.py b/tests/OnePer/oneperType02_1One.py
index b43208b4cea18747f63bd4c315f17c83b0fe6b26..f2c10fac23758bfa4c5de5cee0033c9b51909dcd 100644
--- a/tests/OnePer/oneperType02_1One.py
+++ b/tests/OnePer/oneperType02_1One.py
@@ -18,6 +18,12 @@
 # Command line arguments:
 #   tests/oneper00.xsd
 #
+# Command line:
+#   generateDS.py --no-dates --no-versions --silence --member-specs="list" -f --one-file-per-xsd --output-directory="tests/OnePer" --module-suffix="One" --super="oneper2_sup" tests/oneper00.xsd
+#
+# Current working directory (os.getcwd()):
+#   generateds
+#
 
 import sys
 import getopt
diff --git a/tests/OnePer/oneperType02_2One.py b/tests/OnePer/oneperType02_2One.py
index b43208b4cea18747f63bd4c315f17c83b0fe6b26..f2c10fac23758bfa4c5de5cee0033c9b51909dcd 100644
--- a/tests/OnePer/oneperType02_2One.py
+++ b/tests/OnePer/oneperType02_2One.py
@@ -18,6 +18,12 @@
 # Command line arguments:
 #   tests/oneper00.xsd
 #
+# Command line:
+#   generateDS.py --no-dates --no-versions --silence --member-specs="list" -f --one-file-per-xsd --output-directory="tests/OnePer" --module-suffix="One" --super="oneper2_sup" tests/oneper00.xsd
+#
+# Current working directory (os.getcwd()):
+#   generateds
+#
 
 import sys
 import getopt
diff --git a/tests/OnePer/oneperType03_1One.py b/tests/OnePer/oneperType03_1One.py
index 98a603c817f226893af25f3dc877dd39d701bd61..edd976fe4299a6886d2be834d3168f1acbc0ffb0 100644
--- a/tests/OnePer/oneperType03_1One.py
+++ b/tests/OnePer/oneperType03_1One.py
@@ -18,6 +18,12 @@
 # Command line arguments:
 #   tests/oneper00.xsd
 #
+# Command line:
+#   generateDS.py --no-dates --no-versions --silence --member-specs="list" -f --one-file-per-xsd --output-directory="tests/OnePer" --module-suffix="One" --super="oneper2_sup" tests/oneper00.xsd
+#
+# Current working directory (os.getcwd()):
+#   generateds
+#
 
 import sys
 import getopt
diff --git a/tests/OnePer/oneperType03_2One.py b/tests/OnePer/oneperType03_2One.py
index 98a603c817f226893af25f3dc877dd39d701bd61..edd976fe4299a6886d2be834d3168f1acbc0ffb0 100644
--- a/tests/OnePer/oneperType03_2One.py
+++ b/tests/OnePer/oneperType03_2One.py
@@ -18,6 +18,12 @@
 # Command line arguments:
 #   tests/oneper00.xsd
 #
+# Command line:
+#   generateDS.py --no-dates --no-versions --silence --member-specs="list" -f --one-file-per-xsd --output-directory="tests/OnePer" --module-suffix="One" --super="oneper2_sup" tests/oneper00.xsd
+#
+# Current working directory (os.getcwd()):
+#   generateds
+#
 
 import sys
 import getopt
diff --git a/tests/abstract_type1_sub.py b/tests/abstract_type1_sub.py
index 3a4eac9612c4b6de63f7573d6246b0ae24b75a00..1e5bee0ccf74e885d9f2baf6599fc66e7a9fea6b 100644
--- a/tests/abstract_type1_sub.py
+++ b/tests/abstract_type1_sub.py
@@ -16,6 +16,12 @@
 # Command line arguments:
 #   tests/abstract_type.xsd
 #
+# Command line:
+#   generateDS.py --no-dates --no-versions --silence --member-specs="list" -f -o "tests/abstract_type2_sup.py" -s "tests/abstract_type2_sub.py" --super="abstract_type2_sup" tests/abstract_type.xsd
+#
+# Current working directory (os.getcwd()):
+#   generateds
+#
 
 import sys
 
diff --git a/tests/abstract_type1_sup.py b/tests/abstract_type1_sup.py
index 19249d14e15090be8530ace7532609095f1d7b1e..3a8ddda2158d1c46306d41647176446bf2146be8 100644
--- a/tests/abstract_type1_sup.py
+++ b/tests/abstract_type1_sup.py
@@ -17,6 +17,12 @@
 # Command line arguments:
 #   tests/abstract_type.xsd
 #
+# Command line:
+#   generateDS.py --no-dates --no-versions --silence --member-specs="list" -f -o "tests/abstract_type2_sup.py" -s "tests/abstract_type2_sub.py" --super="abstract_type2_sup" tests/abstract_type.xsd
+#
+# Current working directory (os.getcwd()):
+#   generateds
+#
 
 import sys
 import getopt
diff --git a/tests/abstract_type2_sub.py b/tests/abstract_type2_sub.py
index 3a4eac9612c4b6de63f7573d6246b0ae24b75a00..1e5bee0ccf74e885d9f2baf6599fc66e7a9fea6b 100644
--- a/tests/abstract_type2_sub.py
+++ b/tests/abstract_type2_sub.py
@@ -16,6 +16,12 @@
 # Command line arguments:
 #   tests/abstract_type.xsd
 #
+# Command line:
+#   generateDS.py --no-dates --no-versions --silence --member-specs="list" -f -o "tests/abstract_type2_sup.py" -s "tests/abstract_type2_sub.py" --super="abstract_type2_sup" tests/abstract_type.xsd
+#
+# Current working directory (os.getcwd()):
+#   generateds
+#
 
 import sys
 
diff --git a/tests/abstract_type2_sup.py b/tests/abstract_type2_sup.py
index 19249d14e15090be8530ace7532609095f1d7b1e..3a8ddda2158d1c46306d41647176446bf2146be8 100644
--- a/tests/abstract_type2_sup.py
+++ b/tests/abstract_type2_sup.py
@@ -17,6 +17,12 @@
 # Command line arguments:
 #   tests/abstract_type.xsd
 #
+# Command line:
+#   generateDS.py --no-dates --no-versions --silence --member-specs="list" -f -o "tests/abstract_type2_sup.py" -s "tests/abstract_type2_sub.py" --super="abstract_type2_sup" tests/abstract_type.xsd
+#
+# Current working directory (os.getcwd()):
+#   generateds
+#
 
 import sys
 import getopt
diff --git a/tests/annotations1_sub.py b/tests/annotations1_sub.py
index f997e6e83a11d68dd4fb0e33418d715dc1bb4d54..72f1e4fa503647f90a40e90601538e0ece0e3791 100644
--- a/tests/annotations1_sub.py
+++ b/tests/annotations1_sub.py
@@ -16,6 +16,12 @@
 # Command line arguments:
 #   tests/annotations.xsd
 #
+# Command line:
+#   generateDS.py --no-dates --no-versions --silence --member-specs="list" -f -o "tests/annotations2_sup.py" -s "tests/annotations2_sub.py" --super="annotations2_sup" tests/annotations.xsd
+#
+# Current working directory (os.getcwd()):
+#   generateds
+#
 
 import sys
 
diff --git a/tests/annotations1_sup.py b/tests/annotations1_sup.py
index 7dca5b61a46e0f129d63efb50e5f93c02207b5bb..09d03d3a816c78e39dd98a26b21fcbf9564ab062 100644
--- a/tests/annotations1_sup.py
+++ b/tests/annotations1_sup.py
@@ -17,6 +17,12 @@
 # Command line arguments:
 #   tests/annotations.xsd
 #
+# Command line:
+#   generateDS.py --no-dates --no-versions --silence --member-specs="list" -f -o "tests/annotations2_sup.py" -s "tests/annotations2_sub.py" --super="annotations2_sup" tests/annotations.xsd
+#
+# Current working directory (os.getcwd()):
+#   generateds
+#
 
 import sys
 import getopt
diff --git a/tests/annotations2_sub.py b/tests/annotations2_sub.py
index f997e6e83a11d68dd4fb0e33418d715dc1bb4d54..72f1e4fa503647f90a40e90601538e0ece0e3791 100644
--- a/tests/annotations2_sub.py
+++ b/tests/annotations2_sub.py
@@ -16,6 +16,12 @@
 # Command line arguments:
 #   tests/annotations.xsd
 #
+# Command line:
+#   generateDS.py --no-dates --no-versions --silence --member-specs="list" -f -o "tests/annotations2_sup.py" -s "tests/annotations2_sub.py" --super="annotations2_sup" tests/annotations.xsd
+#
+# Current working directory (os.getcwd()):
+#   generateds
+#
 
 import sys
 
diff --git a/tests/annotations2_sup.py b/tests/annotations2_sup.py
index 7dca5b61a46e0f129d63efb50e5f93c02207b5bb..09d03d3a816c78e39dd98a26b21fcbf9564ab062 100644
--- a/tests/annotations2_sup.py
+++ b/tests/annotations2_sup.py
@@ -17,6 +17,12 @@
 # Command line arguments:
 #   tests/annotations.xsd
 #
+# Command line:
+#   generateDS.py --no-dates --no-versions --silence --member-specs="list" -f -o "tests/annotations2_sup.py" -s "tests/annotations2_sub.py" --super="annotations2_sup" tests/annotations.xsd
+#
+# Current working directory (os.getcwd()):
+#   generateds
+#
 
 import sys
 import getopt
diff --git a/tests/anonymous_type1_sub.py b/tests/anonymous_type1_sub.py
index ec78007715bc914e79050c91fc277db3f4f63769..d1edd83387e4b81c4355973cb43288794bc9bc1f 100644
--- a/tests/anonymous_type1_sub.py
+++ b/tests/anonymous_type1_sub.py
@@ -16,6 +16,12 @@
 # Command line arguments:
 #   tests/anonymous_type.xsd
 #
+# Command line:
+#   generateDS.py --no-dates --no-versions --silence --member-specs="list" -f -o "tests/anonymous_type2_sup.py" -s "tests/anonymous_type2_sub.py" --super="anonymous_type2_sup" tests/anonymous_type.xsd
+#
+# Current working directory (os.getcwd()):
+#   generateds
+#
 
 import sys
 
diff --git a/tests/anonymous_type1_sup.py b/tests/anonymous_type1_sup.py
index f145a17e3894aa99762946e35ce23fdb6b1edcee..03b5aff6e0de8c50abe263d4aa4386d68a63f3b9 100644
--- a/tests/anonymous_type1_sup.py
+++ b/tests/anonymous_type1_sup.py
@@ -17,6 +17,12 @@
 # Command line arguments:
 #   tests/anonymous_type.xsd
 #
+# Command line:
+#   generateDS.py --no-dates --no-versions --silence --member-specs="list" -f -o "tests/anonymous_type2_sup.py" -s "tests/anonymous_type2_sub.py" --super="anonymous_type2_sup" tests/anonymous_type.xsd
+#
+# Current working directory (os.getcwd()):
+#   generateds
+#
 
 import sys
 import getopt
diff --git a/tests/anonymous_type2_sub.py b/tests/anonymous_type2_sub.py
index ec78007715bc914e79050c91fc277db3f4f63769..d1edd83387e4b81c4355973cb43288794bc9bc1f 100644
--- a/tests/anonymous_type2_sub.py
+++ b/tests/anonymous_type2_sub.py
@@ -16,6 +16,12 @@
 # Command line arguments:
 #   tests/anonymous_type.xsd
 #
+# Command line:
+#   generateDS.py --no-dates --no-versions --silence --member-specs="list" -f -o "tests/anonymous_type2_sup.py" -s "tests/anonymous_type2_sub.py" --super="anonymous_type2_sup" tests/anonymous_type.xsd
+#
+# Current working directory (os.getcwd()):
+#   generateds
+#
 
 import sys
 
diff --git a/tests/anonymous_type2_sup.py b/tests/anonymous_type2_sup.py
index f145a17e3894aa99762946e35ce23fdb6b1edcee..03b5aff6e0de8c50abe263d4aa4386d68a63f3b9 100644
--- a/tests/anonymous_type2_sup.py
+++ b/tests/anonymous_type2_sup.py
@@ -17,6 +17,12 @@
 # Command line arguments:
 #   tests/anonymous_type.xsd
 #
+# Command line:
+#   generateDS.py --no-dates --no-versions --silence --member-specs="list" -f -o "tests/anonymous_type2_sup.py" -s "tests/anonymous_type2_sub.py" --super="anonymous_type2_sup" tests/anonymous_type.xsd
+#
+# Current working directory (os.getcwd()):
+#   generateds
+#
 
 import sys
 import getopt
diff --git a/tests/anysimpletype1_sub.py b/tests/anysimpletype1_sub.py
index 81b3663c00138b3ddab7ee30452440de79f8513c..8814a2e55d63fd8111a44a45ff1a1cf54ff4870d 100644
--- a/tests/anysimpletype1_sub.py
+++ b/tests/anysimpletype1_sub.py
@@ -16,6 +16,12 @@
 # Command line arguments:
 #   tests/anysimpletype.xsd
 #
+# Command line:
+#   generateDS.py --no-dates --no-versions --silence --member-specs="list" -f -o "tests/anysimpletype2_sup.py" -s "tests/anysimpletype2_sub.py" --super="anysimpletype2_sup" tests/anysimpletype.xsd
+#
+# Current working directory (os.getcwd()):
+#   generateds
+#
 
 import sys
 
diff --git a/tests/anysimpletype1_sup.py b/tests/anysimpletype1_sup.py
index abf98e8a06957210de31529e539d2a72cc935480..22c52c649c59e3d4227e485ef4eff51b4016f981 100644
--- a/tests/anysimpletype1_sup.py
+++ b/tests/anysimpletype1_sup.py
@@ -17,6 +17,12 @@
 # Command line arguments:
 #   tests/anysimpletype.xsd
 #
+# Command line:
+#   generateDS.py --no-dates --no-versions --silence --member-specs="list" -f -o "tests/anysimpletype2_sup.py" -s "tests/anysimpletype2_sub.py" --super="anysimpletype2_sup" tests/anysimpletype.xsd
+#
+# Current working directory (os.getcwd()):
+#   generateds
+#
 
 import sys
 import getopt
diff --git a/tests/anysimpletype2_sub.py b/tests/anysimpletype2_sub.py
index 81b3663c00138b3ddab7ee30452440de79f8513c..8814a2e55d63fd8111a44a45ff1a1cf54ff4870d 100644
--- a/tests/anysimpletype2_sub.py
+++ b/tests/anysimpletype2_sub.py
@@ -16,6 +16,12 @@
 # Command line arguments:
 #   tests/anysimpletype.xsd
 #
+# Command line:
+#   generateDS.py --no-dates --no-versions --silence --member-specs="list" -f -o "tests/anysimpletype2_sup.py" -s "tests/anysimpletype2_sub.py" --super="anysimpletype2_sup" tests/anysimpletype.xsd
+#
+# Current working directory (os.getcwd()):
+#   generateds
+#
 
 import sys
 
diff --git a/tests/anysimpletype2_sup.py b/tests/anysimpletype2_sup.py
index abf98e8a06957210de31529e539d2a72cc935480..22c52c649c59e3d4227e485ef4eff51b4016f981 100644
--- a/tests/anysimpletype2_sup.py
+++ b/tests/anysimpletype2_sup.py
@@ -17,6 +17,12 @@
 # Command line arguments:
 #   tests/anysimpletype.xsd
 #
+# Command line:
+#   generateDS.py --no-dates --no-versions --silence --member-specs="list" -f -o "tests/anysimpletype2_sup.py" -s "tests/anysimpletype2_sub.py" --super="anysimpletype2_sup" tests/anysimpletype.xsd
+#
+# Current working directory (os.getcwd()):
+#   generateds
+#
 
 import sys
 import getopt
diff --git a/tests/anywildcard1_sub.py b/tests/anywildcard1_sub.py
index 9589d9a5a922b4e7750c9fb5cd8918b60536eb60..6fd3abce3cce4ac1afd22282d22493f352562f11 100644
--- a/tests/anywildcard1_sub.py
+++ b/tests/anywildcard1_sub.py
@@ -16,6 +16,12 @@
 # Command line arguments:
 #   tests/anywildcard.xsd
 #
+# Command line:
+#   generateDS.py --no-dates --no-versions --silence --member-specs="list" -f -o "tests/anywildcard2_sup.py" -s "tests/anywildcard2_sub.py" --super="anywildcard2_sup" tests/anywildcard.xsd
+#
+# Current working directory (os.getcwd()):
+#   generateds
+#
 
 import sys
 
diff --git a/tests/anywildcard1_sup.py b/tests/anywildcard1_sup.py
index 9aa9e96be9018e912bd2e9929af3d0ee5a82e05b..204bed5e734337e087e591425562393378b437bf 100644
--- a/tests/anywildcard1_sup.py
+++ b/tests/anywildcard1_sup.py
@@ -17,6 +17,12 @@
 # Command line arguments:
 #   tests/anywildcard.xsd
 #
+# Command line:
+#   generateDS.py --no-dates --no-versions --silence --member-specs="list" -f -o "tests/anywildcard2_sup.py" -s "tests/anywildcard2_sub.py" --super="anywildcard2_sup" tests/anywildcard.xsd
+#
+# Current working directory (os.getcwd()):
+#   generateds
+#
 
 import sys
 import getopt
diff --git a/tests/anywildcard2_sub.py b/tests/anywildcard2_sub.py
index 9589d9a5a922b4e7750c9fb5cd8918b60536eb60..6fd3abce3cce4ac1afd22282d22493f352562f11 100644
--- a/tests/anywildcard2_sub.py
+++ b/tests/anywildcard2_sub.py
@@ -16,6 +16,12 @@
 # Command line arguments:
 #   tests/anywildcard.xsd
 #
+# Command line:
+#   generateDS.py --no-dates --no-versions --silence --member-specs="list" -f -o "tests/anywildcard2_sup.py" -s "tests/anywildcard2_sub.py" --super="anywildcard2_sup" tests/anywildcard.xsd
+#
+# Current working directory (os.getcwd()):
+#   generateds
+#
 
 import sys
 
diff --git a/tests/anywildcard2_sup.py b/tests/anywildcard2_sup.py
index 9aa9e96be9018e912bd2e9929af3d0ee5a82e05b..204bed5e734337e087e591425562393378b437bf 100644
--- a/tests/anywildcard2_sup.py
+++ b/tests/anywildcard2_sup.py
@@ -17,6 +17,12 @@
 # Command line arguments:
 #   tests/anywildcard.xsd
 #
+# Command line:
+#   generateDS.py --no-dates --no-versions --silence --member-specs="list" -f -o "tests/anywildcard2_sup.py" -s "tests/anywildcard2_sub.py" --super="anywildcard2_sup" tests/anywildcard.xsd
+#
+# Current working directory (os.getcwd()):
+#   generateds
+#
 
 import sys
 import getopt
diff --git a/tests/attr_groups1_sub.py b/tests/attr_groups1_sub.py
index 306c64fa4557ac59355b37e0bc2843631a06769e..e08758646e5f53dabe48f07570a0b69ddcc4db72 100644
--- a/tests/attr_groups1_sub.py
+++ b/tests/attr_groups1_sub.py
@@ -16,6 +16,12 @@
 # Command line arguments:
 #   tests/attr_groups.xsd
 #
+# Command line:
+#   generateDS.py --no-dates --no-versions --silence --member-specs="list" -f -o "tests/attr_groups2_sup.py" -s "tests/attr_groups2_sub.py" --super="attr_groups2_sup" tests/attr_groups.xsd
+#
+# Current working directory (os.getcwd()):
+#   generateds
+#
 
 import sys
 
diff --git a/tests/attr_groups1_sup.py b/tests/attr_groups1_sup.py
index eb9695cbeb5ff57d3af084a8ab6dd1e84818bdaa..5e35b65f0570676691ee6d78b32907fe53dba932 100644
--- a/tests/attr_groups1_sup.py
+++ b/tests/attr_groups1_sup.py
@@ -17,6 +17,12 @@
 # Command line arguments:
 #   tests/attr_groups.xsd
 #
+# Command line:
+#   generateDS.py --no-dates --no-versions --silence --member-specs="list" -f -o "tests/attr_groups2_sup.py" -s "tests/attr_groups2_sub.py" --super="attr_groups2_sup" tests/attr_groups.xsd
+#
+# Current working directory (os.getcwd()):
+#   generateds
+#
 
 import sys
 import getopt
diff --git a/tests/attr_groups2_sub.py b/tests/attr_groups2_sub.py
index 306c64fa4557ac59355b37e0bc2843631a06769e..e08758646e5f53dabe48f07570a0b69ddcc4db72 100644
--- a/tests/attr_groups2_sub.py
+++ b/tests/attr_groups2_sub.py
@@ -16,6 +16,12 @@
 # Command line arguments:
 #   tests/attr_groups.xsd
 #
+# Command line:
+#   generateDS.py --no-dates --no-versions --silence --member-specs="list" -f -o "tests/attr_groups2_sup.py" -s "tests/attr_groups2_sub.py" --super="attr_groups2_sup" tests/attr_groups.xsd
+#
+# Current working directory (os.getcwd()):
+#   generateds
+#
 
 import sys
 
diff --git a/tests/attr_groups2_sup.py b/tests/attr_groups2_sup.py
index eb9695cbeb5ff57d3af084a8ab6dd1e84818bdaa..5e35b65f0570676691ee6d78b32907fe53dba932 100644
--- a/tests/attr_groups2_sup.py
+++ b/tests/attr_groups2_sup.py
@@ -17,6 +17,12 @@
 # Command line arguments:
 #   tests/attr_groups.xsd
 #
+# Command line:
+#   generateDS.py --no-dates --no-versions --silence --member-specs="list" -f -o "tests/attr_groups2_sup.py" -s "tests/attr_groups2_sub.py" --super="attr_groups2_sup" tests/attr_groups.xsd
+#
+# Current working directory (os.getcwd()):
+#   generateds
+#
 
 import sys
 import getopt
diff --git a/tests/catalogtest1_sub.py b/tests/catalogtest1_sub.py
index f998efa1ac1834f2f1160aa0d27cbffc2890499d..2db2120a0eb908dd37fa465063fbebd0bdc28559 100644
--- a/tests/catalogtest1_sub.py
+++ b/tests/catalogtest1_sub.py
@@ -17,6 +17,12 @@
 # Command line arguments:
 #   tests/catalogtest.xsd
 #
+# Command line:
+#   generateDS.py --no-dates --no-versions --silence --member-specs="list" -f -o "tests/catalogtest2_sup.py" -s "tests/catalogtest2_sub.py" --super="catalogtest2_sup" -c "tests/catalog.xml" tests/catalogtest.xsd
+#
+# Current working directory (os.getcwd()):
+#   generateds
+#
 
 import sys
 
diff --git a/tests/catalogtest1_sup.py b/tests/catalogtest1_sup.py
index 71be0278a571d42dbb0fa48b66a496540995ac7b..0b329177b64178cb08f298d0756142cb5880a0b7 100644
--- a/tests/catalogtest1_sup.py
+++ b/tests/catalogtest1_sup.py
@@ -18,6 +18,12 @@
 # Command line arguments:
 #   tests/catalogtest.xsd
 #
+# Command line:
+#   generateDS.py --no-dates --no-versions --silence --member-specs="list" -f -o "tests/catalogtest2_sup.py" -s "tests/catalogtest2_sub.py" --super="catalogtest2_sup" -c "tests/catalog.xml" tests/catalogtest.xsd
+#
+# Current working directory (os.getcwd()):
+#   generateds
+#
 
 import sys
 import getopt
diff --git a/tests/catalogtest2_sub.py b/tests/catalogtest2_sub.py
index f998efa1ac1834f2f1160aa0d27cbffc2890499d..2db2120a0eb908dd37fa465063fbebd0bdc28559 100644
--- a/tests/catalogtest2_sub.py
+++ b/tests/catalogtest2_sub.py
@@ -17,6 +17,12 @@
 # Command line arguments:
 #   tests/catalogtest.xsd
 #
+# Command line:
+#   generateDS.py --no-dates --no-versions --silence --member-specs="list" -f -o "tests/catalogtest2_sup.py" -s "tests/catalogtest2_sub.py" --super="catalogtest2_sup" -c "tests/catalog.xml" tests/catalogtest.xsd
+#
+# Current working directory (os.getcwd()):
+#   generateds
+#
 
 import sys
 
diff --git a/tests/catalogtest2_sup.py b/tests/catalogtest2_sup.py
index 71be0278a571d42dbb0fa48b66a496540995ac7b..0b329177b64178cb08f298d0756142cb5880a0b7 100644
--- a/tests/catalogtest2_sup.py
+++ b/tests/catalogtest2_sup.py
@@ -18,6 +18,12 @@
 # Command line arguments:
 #   tests/catalogtest.xsd
 #
+# Command line:
+#   generateDS.py --no-dates --no-versions --silence --member-specs="list" -f -o "tests/catalogtest2_sup.py" -s "tests/catalogtest2_sub.py" --super="catalogtest2_sup" -c "tests/catalog.xml" tests/catalogtest.xsd
+#
+# Current working directory (os.getcwd()):
+#   generateds
+#
 
 import sys
 import getopt
diff --git a/tests/extensions1_sub.py b/tests/extensions1_sub.py
index 8feb1340d65ebc8f0c09f81703d0061bc30c6772..c1e79eb4601deb96202a19e4edefa72509beb10e 100644
--- a/tests/extensions1_sub.py
+++ b/tests/extensions1_sub.py
@@ -16,6 +16,12 @@
 # Command line arguments:
 #   tests/extensions.xsd
 #
+# Command line:
+#   generateDS.py --no-dates --no-versions --silence --member-specs="list" -f -o "tests/extensions2_sup.py" -s "tests/extensions2_sub.py" --super="extensions2_sup" tests/extensions.xsd
+#
+# Current working directory (os.getcwd()):
+#   generateds
+#
 
 import sys
 
diff --git a/tests/extensions1_sup.py b/tests/extensions1_sup.py
index 0862f52af62035dd538e45cb545d28ca621fdabd..4698f366b93e4fa211d13b37e1e6d135dcaec33d 100644
--- a/tests/extensions1_sup.py
+++ b/tests/extensions1_sup.py
@@ -17,6 +17,12 @@
 # Command line arguments:
 #   tests/extensions.xsd
 #
+# Command line:
+#   generateDS.py --no-dates --no-versions --silence --member-specs="list" -f -o "tests/extensions2_sup.py" -s "tests/extensions2_sub.py" --super="extensions2_sup" tests/extensions.xsd
+#
+# Current working directory (os.getcwd()):
+#   generateds
+#
 
 import sys
 import getopt
diff --git a/tests/extensions2_sub.py b/tests/extensions2_sub.py
index 8feb1340d65ebc8f0c09f81703d0061bc30c6772..c1e79eb4601deb96202a19e4edefa72509beb10e 100644
--- a/tests/extensions2_sub.py
+++ b/tests/extensions2_sub.py
@@ -16,6 +16,12 @@
 # Command line arguments:
 #   tests/extensions.xsd
 #
+# Command line:
+#   generateDS.py --no-dates --no-versions --silence --member-specs="list" -f -o "tests/extensions2_sup.py" -s "tests/extensions2_sub.py" --super="extensions2_sup" tests/extensions.xsd
+#
+# Current working directory (os.getcwd()):
+#   generateds
+#
 
 import sys
 
diff --git a/tests/extensions2_sup.py b/tests/extensions2_sup.py
index 0862f52af62035dd538e45cb545d28ca621fdabd..4698f366b93e4fa211d13b37e1e6d135dcaec33d 100644
--- a/tests/extensions2_sup.py
+++ b/tests/extensions2_sup.py
@@ -17,6 +17,12 @@
 # Command line arguments:
 #   tests/extensions.xsd
 #
+# Command line:
+#   generateDS.py --no-dates --no-versions --silence --member-specs="list" -f -o "tests/extensions2_sup.py" -s "tests/extensions2_sub.py" --super="extensions2_sup" tests/extensions.xsd
+#
+# Current working directory (os.getcwd()):
+#   generateds
+#
 
 import sys
 import getopt
diff --git a/tests/ipo1_sub.py b/tests/ipo1_sub.py
index b508da334f07904aa333edfab636b6d3dac8a404..f8d3e536c9a41ab65e96dad5d7b1c8b3d5be1fbf 100644
--- a/tests/ipo1_sub.py
+++ b/tests/ipo1_sub.py
@@ -15,6 +15,12 @@
 # Command line arguments:
 #   tests/ipo.xsd
 #
+# Command line:
+#   generateDS.py --no-dates --no-versions --member-specs="list" -f -o "tests/ipo2_sup.py" -s "tests/ipo2_sub.py" --super="ipo2_sup" tests/ipo.xsd
+#
+# Current working directory (os.getcwd()):
+#   generateds
+#
 
 import sys
 
diff --git a/tests/ipo1_sup.py b/tests/ipo1_sup.py
index 66720065e41382bd9391b38e9547ef79593d6dca..10b6a91af00679a7ae0a21f3f74fde163feda140 100644
--- a/tests/ipo1_sup.py
+++ b/tests/ipo1_sup.py
@@ -16,6 +16,12 @@
 # Command line arguments:
 #   tests/ipo.xsd
 #
+# Command line:
+#   generateDS.py --no-dates --no-versions --member-specs="list" -f -o "tests/ipo2_sup.py" -s "tests/ipo2_sub.py" --super="ipo2_sup" tests/ipo.xsd
+#
+# Current working directory (os.getcwd()):
+#   generateds
+#
 
 import sys
 import getopt
diff --git a/tests/ipo2_sub.py b/tests/ipo2_sub.py
index b508da334f07904aa333edfab636b6d3dac8a404..f8d3e536c9a41ab65e96dad5d7b1c8b3d5be1fbf 100644
--- a/tests/ipo2_sub.py
+++ b/tests/ipo2_sub.py
@@ -15,6 +15,12 @@
 # Command line arguments:
 #   tests/ipo.xsd
 #
+# Command line:
+#   generateDS.py --no-dates --no-versions --member-specs="list" -f -o "tests/ipo2_sup.py" -s "tests/ipo2_sub.py" --super="ipo2_sup" tests/ipo.xsd
+#
+# Current working directory (os.getcwd()):
+#   generateds
+#
 
 import sys
 
diff --git a/tests/ipo2_sup.py b/tests/ipo2_sup.py
index 66720065e41382bd9391b38e9547ef79593d6dca..10b6a91af00679a7ae0a21f3f74fde163feda140 100644
--- a/tests/ipo2_sup.py
+++ b/tests/ipo2_sup.py
@@ -16,6 +16,12 @@
 # Command line arguments:
 #   tests/ipo.xsd
 #
+# Command line:
+#   generateDS.py --no-dates --no-versions --member-specs="list" -f -o "tests/ipo2_sup.py" -s "tests/ipo2_sub.py" --super="ipo2_sup" tests/ipo.xsd
+#
+# Current working directory (os.getcwd()):
+#   generateds
+#
 
 import sys
 import getopt
diff --git a/tests/out1_sub.py b/tests/out1_sub.py
index d6f722e6a01226cb783287f5850f84200b742eea..9cfb8b4484c15b882addc6e92d2f0706b576df85 100644
--- a/tests/out1_sub.py
+++ b/tests/out1_sub.py
@@ -15,6 +15,12 @@
 # Command line arguments:
 #   tests/people.xsd
 #
+# Command line:
+#   generateDS.py --no-dates --no-versions -f -o "tests/out2_sup.py" -s "tests/out2_sub.py" --super="out2_sup" -u "gends_user_methods" tests/people.xsd
+#
+# Current working directory (os.getcwd()):
+#   generateds
+#
 
 import sys
 
diff --git a/tests/out1_sup.py b/tests/out1_sup.py
index 0f7499ebd9b50dbf5ec9e12b975456cb9b41e2a2..bdaaa885af3fae9c2c28e10bad12e4aef189462e 100644
--- a/tests/out1_sup.py
+++ b/tests/out1_sup.py
@@ -16,6 +16,12 @@
 # Command line arguments:
 #   tests/people.xsd
 #
+# Command line:
+#   generateDS.py --no-dates --no-versions -f -o "tests/out2_sup.py" -s "tests/out2_sub.py" --super="out2_sup" -u "gends_user_methods" tests/people.xsd
+#
+# Current working directory (os.getcwd()):
+#   generateds
+#
 
 import sys
 import getopt
diff --git a/tests/out2_sub.py b/tests/out2_sub.py
index d6f722e6a01226cb783287f5850f84200b742eea..9cfb8b4484c15b882addc6e92d2f0706b576df85 100644
--- a/tests/out2_sub.py
+++ b/tests/out2_sub.py
@@ -15,6 +15,12 @@
 # Command line arguments:
 #   tests/people.xsd
 #
+# Command line:
+#   generateDS.py --no-dates --no-versions -f -o "tests/out2_sup.py" -s "tests/out2_sub.py" --super="out2_sup" -u "gends_user_methods" tests/people.xsd
+#
+# Current working directory (os.getcwd()):
+#   generateds
+#
 
 import sys
 
diff --git a/tests/out2_sup.py b/tests/out2_sup.py
index 0f7499ebd9b50dbf5ec9e12b975456cb9b41e2a2..bdaaa885af3fae9c2c28e10bad12e4aef189462e 100644
--- a/tests/out2_sup.py
+++ b/tests/out2_sup.py
@@ -16,6 +16,12 @@
 # Command line arguments:
 #   tests/people.xsd
 #
+# Command line:
+#   generateDS.py --no-dates --no-versions -f -o "tests/out2_sup.py" -s "tests/out2_sub.py" --super="out2_sup" -u "gends_user_methods" tests/people.xsd
+#
+# Current working directory (os.getcwd()):
+#   generateds
+#
 
 import sys
 import getopt
diff --git a/tests/people_procincl1_sub.py b/tests/people_procincl1_sub.py
index e329ddc591223bfd066447332736b5a7e4d79843..043e65d1a333ce6008c702e7c67b714a8b6e56e3 100644
--- a/tests/people_procincl1_sub.py
+++ b/tests/people_procincl1_sub.py
@@ -16,6 +16,12 @@
 # Command line arguments:
 #   tests/people_procincl.xsd
 #
+# Command line:
+#   generateDS.py --no-dates --no-versions --silence --member-specs="list" -f -o "tests/people_procincl2_sup.py" -s "tests/people_procincl2_sub.py" --super="people_procincl2_sup" tests/people_procincl.xsd
+#
+# Current working directory (os.getcwd()):
+#   generateds
+#
 
 import sys
 
diff --git a/tests/people_procincl1_sup.py b/tests/people_procincl1_sup.py
index aa37f609feebac579b394661be01a1d64bc09848..f0be0c6222502dd626d3a5bfc19efed9777e8e51 100644
--- a/tests/people_procincl1_sup.py
+++ b/tests/people_procincl1_sup.py
@@ -17,6 +17,12 @@
 # Command line arguments:
 #   tests/people_procincl.xsd
 #
+# Command line:
+#   generateDS.py --no-dates --no-versions --silence --member-specs="list" -f -o "tests/people_procincl2_sup.py" -s "tests/people_procincl2_sub.py" --super="people_procincl2_sup" tests/people_procincl.xsd
+#
+# Current working directory (os.getcwd()):
+#   generateds
+#
 
 import sys
 import getopt
diff --git a/tests/people_procincl2_sub.py b/tests/people_procincl2_sub.py
index e329ddc591223bfd066447332736b5a7e4d79843..043e65d1a333ce6008c702e7c67b714a8b6e56e3 100644
--- a/tests/people_procincl2_sub.py
+++ b/tests/people_procincl2_sub.py
@@ -16,6 +16,12 @@
 # Command line arguments:
 #   tests/people_procincl.xsd
 #
+# Command line:
+#   generateDS.py --no-dates --no-versions --silence --member-specs="list" -f -o "tests/people_procincl2_sup.py" -s "tests/people_procincl2_sub.py" --super="people_procincl2_sup" tests/people_procincl.xsd
+#
+# Current working directory (os.getcwd()):
+#   generateds
+#
 
 import sys
 
diff --git a/tests/people_procincl2_sup.py b/tests/people_procincl2_sup.py
index aa37f609feebac579b394661be01a1d64bc09848..f0be0c6222502dd626d3a5bfc19efed9777e8e51 100644
--- a/tests/people_procincl2_sup.py
+++ b/tests/people_procincl2_sup.py
@@ -17,6 +17,12 @@
 # Command line arguments:
 #   tests/people_procincl.xsd
 #
+# Command line:
+#   generateDS.py --no-dates --no-versions --silence --member-specs="list" -f -o "tests/people_procincl2_sup.py" -s "tests/people_procincl2_sub.py" --super="people_procincl2_sup" tests/people_procincl.xsd
+#
+# Current working directory (os.getcwd()):
+#   generateds
+#
 
 import sys
 import getopt
diff --git a/tests/recursive_simpletype1_sub.py b/tests/recursive_simpletype1_sub.py
index 6ae32d81552193c9387c9ffa6b770efbf68c15fa..131671e0f22a759ee36192e077a8d173863a2617 100644
--- a/tests/recursive_simpletype1_sub.py
+++ b/tests/recursive_simpletype1_sub.py
@@ -16,6 +16,12 @@
 # Command line arguments:
 #   tests/recursive_simpletype.xsd
 #
+# Command line:
+#   generateDS.py --no-dates --no-versions --silence --member-specs="list" -f -o "tests/recursive_simpletype2_sup.py" -s "tests/recursive_simpletype2_sub.py" --super="recursive_simpletype2_sup" tests/recursive_simpletype.xsd
+#
+# Current working directory (os.getcwd()):
+#   generateds
+#
 
 import sys
 
diff --git a/tests/recursive_simpletype1_sup.py b/tests/recursive_simpletype1_sup.py
index f34bf949ebbd83d1cae7b03ec6ccd68a87cf361b..d5f6fe768c10746056800c456e430bb78d8a7396 100644
--- a/tests/recursive_simpletype1_sup.py
+++ b/tests/recursive_simpletype1_sup.py
@@ -17,6 +17,12 @@
 # Command line arguments:
 #   tests/recursive_simpletype.xsd
 #
+# Command line:
+#   generateDS.py --no-dates --no-versions --silence --member-specs="list" -f -o "tests/recursive_simpletype2_sup.py" -s "tests/recursive_simpletype2_sub.py" --super="recursive_simpletype2_sup" tests/recursive_simpletype.xsd
+#
+# Current working directory (os.getcwd()):
+#   generateds
+#
 
 import sys
 import getopt
diff --git a/tests/recursive_simpletype2_sub.py b/tests/recursive_simpletype2_sub.py
index 6ae32d81552193c9387c9ffa6b770efbf68c15fa..131671e0f22a759ee36192e077a8d173863a2617 100644
--- a/tests/recursive_simpletype2_sub.py
+++ b/tests/recursive_simpletype2_sub.py
@@ -16,6 +16,12 @@
 # Command line arguments:
 #   tests/recursive_simpletype.xsd
 #
+# Command line:
+#   generateDS.py --no-dates --no-versions --silence --member-specs="list" -f -o "tests/recursive_simpletype2_sup.py" -s "tests/recursive_simpletype2_sub.py" --super="recursive_simpletype2_sup" tests/recursive_simpletype.xsd
+#
+# Current working directory (os.getcwd()):
+#   generateds
+#
 
 import sys
 
diff --git a/tests/recursive_simpletype2_sup.py b/tests/recursive_simpletype2_sup.py
index f34bf949ebbd83d1cae7b03ec6ccd68a87cf361b..d5f6fe768c10746056800c456e430bb78d8a7396 100644
--- a/tests/recursive_simpletype2_sup.py
+++ b/tests/recursive_simpletype2_sup.py
@@ -17,6 +17,12 @@
 # Command line arguments:
 #   tests/recursive_simpletype.xsd
 #
+# Command line:
+#   generateDS.py --no-dates --no-versions --silence --member-specs="list" -f -o "tests/recursive_simpletype2_sup.py" -s "tests/recursive_simpletype2_sub.py" --super="recursive_simpletype2_sup" tests/recursive_simpletype.xsd
+#
+# Current working directory (os.getcwd()):
+#   generateds
+#
 
 import sys
 import getopt
diff --git a/tests/simplecontent_restriction1_sub.py b/tests/simplecontent_restriction1_sub.py
index 578af26898b7ec38b558ff0aa1477c3deb5e319c..904619e673ffa42e2ea27537e5e0c2ed898f7437 100644
--- a/tests/simplecontent_restriction1_sub.py
+++ b/tests/simplecontent_restriction1_sub.py
@@ -16,6 +16,12 @@
 # Command line arguments:
 #   tests/simplecontent_restriction.xsd
 #
+# Command line:
+#   generateDS.py --no-dates --no-versions --silence --member-specs="list" -f -o "tests/simplecontent_restriction2_sup.py" -s "tests/simplecontent_restriction2_sub.py" --super="simplecontent_restriction2_sup" tests/simplecontent_restriction.xsd
+#
+# Current working directory (os.getcwd()):
+#   generateds
+#
 
 import sys
 
diff --git a/tests/simplecontent_restriction1_sup.py b/tests/simplecontent_restriction1_sup.py
index c2bc1fd9b0a43750b48ce78009eedb9154b8a965..ba9bcf366b4e6b5108b17c443abfc623528d5886 100644
--- a/tests/simplecontent_restriction1_sup.py
+++ b/tests/simplecontent_restriction1_sup.py
@@ -17,6 +17,12 @@
 # Command line arguments:
 #   tests/simplecontent_restriction.xsd
 #
+# Command line:
+#   generateDS.py --no-dates --no-versions --silence --member-specs="list" -f -o "tests/simplecontent_restriction2_sup.py" -s "tests/simplecontent_restriction2_sub.py" --super="simplecontent_restriction2_sup" tests/simplecontent_restriction.xsd
+#
+# Current working directory (os.getcwd()):
+#   generateds
+#
 
 import sys
 import getopt
diff --git a/tests/simplecontent_restriction2_sub.py b/tests/simplecontent_restriction2_sub.py
index 578af26898b7ec38b558ff0aa1477c3deb5e319c..904619e673ffa42e2ea27537e5e0c2ed898f7437 100644
--- a/tests/simplecontent_restriction2_sub.py
+++ b/tests/simplecontent_restriction2_sub.py
@@ -16,6 +16,12 @@
 # Command line arguments:
 #   tests/simplecontent_restriction.xsd
 #
+# Command line:
+#   generateDS.py --no-dates --no-versions --silence --member-specs="list" -f -o "tests/simplecontent_restriction2_sup.py" -s "tests/simplecontent_restriction2_sub.py" --super="simplecontent_restriction2_sup" tests/simplecontent_restriction.xsd
+#
+# Current working directory (os.getcwd()):
+#   generateds
+#
 
 import sys
 
diff --git a/tests/simplecontent_restriction2_sup.py b/tests/simplecontent_restriction2_sup.py
index c2bc1fd9b0a43750b48ce78009eedb9154b8a965..ba9bcf366b4e6b5108b17c443abfc623528d5886 100644
--- a/tests/simplecontent_restriction2_sup.py
+++ b/tests/simplecontent_restriction2_sup.py
@@ -17,6 +17,12 @@
 # Command line arguments:
 #   tests/simplecontent_restriction.xsd
 #
+# Command line:
+#   generateDS.py --no-dates --no-versions --silence --member-specs="list" -f -o "tests/simplecontent_restriction2_sup.py" -s "tests/simplecontent_restriction2_sub.py" --super="simplecontent_restriction2_sup" tests/simplecontent_restriction.xsd
+#
+# Current working directory (os.getcwd()):
+#   generateds
+#
 
 import sys
 import getopt
diff --git a/tests/simpletype_memberspecs1_sub.py b/tests/simpletype_memberspecs1_sub.py
index ed49bf1530e5c499530c35e35cb3bd61f192b075..eae5e69d5d04dabb9b5dbff6bb137455729a31bf 100644
--- a/tests/simpletype_memberspecs1_sub.py
+++ b/tests/simpletype_memberspecs1_sub.py
@@ -16,6 +16,12 @@
 # Command line arguments:
 #   tests/simpletype_memberspecs.xsd
 #
+# Command line:
+#   generateDS.py --no-dates --no-versions --silence --member-specs="list" -f -o "tests/simpletype_memberspecs2_sup.py" -s "tests/simpletype_memberspecs2_sub.py" --super="simpletype_memberspecs2_sup" tests/simpletype_memberspecs.xsd
+#
+# Current working directory (os.getcwd()):
+#   generateds
+#
 
 import sys
 
diff --git a/tests/simpletype_memberspecs1_sup.py b/tests/simpletype_memberspecs1_sup.py
index f29453faf3e5e8dea4423611e46682ea8e0fe686..f84f5c3f32d7728364be237b004fe6cfb9c7baae 100644
--- a/tests/simpletype_memberspecs1_sup.py
+++ b/tests/simpletype_memberspecs1_sup.py
@@ -17,6 +17,12 @@
 # Command line arguments:
 #   tests/simpletype_memberspecs.xsd
 #
+# Command line:
+#   generateDS.py --no-dates --no-versions --silence --member-specs="list" -f -o "tests/simpletype_memberspecs2_sup.py" -s "tests/simpletype_memberspecs2_sub.py" --super="simpletype_memberspecs2_sup" tests/simpletype_memberspecs.xsd
+#
+# Current working directory (os.getcwd()):
+#   generateds
+#
 
 import sys
 import getopt
diff --git a/tests/simpletype_memberspecs2_sub.py b/tests/simpletype_memberspecs2_sub.py
index ed49bf1530e5c499530c35e35cb3bd61f192b075..eae5e69d5d04dabb9b5dbff6bb137455729a31bf 100644
--- a/tests/simpletype_memberspecs2_sub.py
+++ b/tests/simpletype_memberspecs2_sub.py
@@ -16,6 +16,12 @@
 # Command line arguments:
 #   tests/simpletype_memberspecs.xsd
 #
+# Command line:
+#   generateDS.py --no-dates --no-versions --silence --member-specs="list" -f -o "tests/simpletype_memberspecs2_sup.py" -s "tests/simpletype_memberspecs2_sub.py" --super="simpletype_memberspecs2_sup" tests/simpletype_memberspecs.xsd
+#
+# Current working directory (os.getcwd()):
+#   generateds
+#
 
 import sys
 
diff --git a/tests/simpletype_memberspecs2_sup.py b/tests/simpletype_memberspecs2_sup.py
index f29453faf3e5e8dea4423611e46682ea8e0fe686..f84f5c3f32d7728364be237b004fe6cfb9c7baae 100644
--- a/tests/simpletype_memberspecs2_sup.py
+++ b/tests/simpletype_memberspecs2_sup.py
@@ -17,6 +17,12 @@
 # Command line arguments:
 #   tests/simpletype_memberspecs.xsd
 #
+# Command line:
+#   generateDS.py --no-dates --no-versions --silence --member-specs="list" -f -o "tests/simpletype_memberspecs2_sup.py" -s "tests/simpletype_memberspecs2_sub.py" --super="simpletype_memberspecs2_sup" tests/simpletype_memberspecs.xsd
+#
+# Current working directory (os.getcwd()):
+#   generateds
+#
 
 import sys
 import getopt
diff --git a/tests/simpletypes_other1_sub.py b/tests/simpletypes_other1_sub.py
index 06156a25d909423a1f68f1edd4dde18d019cad8b..6eae03bdfe029b9326e0c9956b3b8a342ab94104 100644
--- a/tests/simpletypes_other1_sub.py
+++ b/tests/simpletypes_other1_sub.py
@@ -16,6 +16,12 @@
 # Command line arguments:
 #   tests/simpletypes_other.xsd
 #
+# Command line:
+#   generateDS.py --no-dates --no-versions --silence --member-specs="list" -f -o "tests/simpletypes_other2_sup.py" -s "tests/simpletypes_other2_sub.py" --super="simpletypes_other2_sup" tests/simpletypes_other.xsd
+#
+# Current working directory (os.getcwd()):
+#   generateds
+#
 
 import sys
 
diff --git a/tests/simpletypes_other1_sup.py b/tests/simpletypes_other1_sup.py
index 4573ba420ad3ef00ed18d5d3f7a76212309ace55..9820d241752db006d791d49d6bf58ed81592f6cc 100644
--- a/tests/simpletypes_other1_sup.py
+++ b/tests/simpletypes_other1_sup.py
@@ -17,6 +17,12 @@
 # Command line arguments:
 #   tests/simpletypes_other.xsd
 #
+# Command line:
+#   generateDS.py --no-dates --no-versions --silence --member-specs="list" -f -o "tests/simpletypes_other2_sup.py" -s "tests/simpletypes_other2_sub.py" --super="simpletypes_other2_sup" tests/simpletypes_other.xsd
+#
+# Current working directory (os.getcwd()):
+#   generateds
+#
 
 import sys
 import getopt
diff --git a/tests/simpletypes_other2_sub.py b/tests/simpletypes_other2_sub.py
index 06156a25d909423a1f68f1edd4dde18d019cad8b..6eae03bdfe029b9326e0c9956b3b8a342ab94104 100644
--- a/tests/simpletypes_other2_sub.py
+++ b/tests/simpletypes_other2_sub.py
@@ -16,6 +16,12 @@
 # Command line arguments:
 #   tests/simpletypes_other.xsd
 #
+# Command line:
+#   generateDS.py --no-dates --no-versions --silence --member-specs="list" -f -o "tests/simpletypes_other2_sup.py" -s "tests/simpletypes_other2_sub.py" --super="simpletypes_other2_sup" tests/simpletypes_other.xsd
+#
+# Current working directory (os.getcwd()):
+#   generateds
+#
 
 import sys
 
diff --git a/tests/simpletypes_other2_sup.py b/tests/simpletypes_other2_sup.py
index 4573ba420ad3ef00ed18d5d3f7a76212309ace55..9820d241752db006d791d49d6bf58ed81592f6cc 100644
--- a/tests/simpletypes_other2_sup.py
+++ b/tests/simpletypes_other2_sup.py
@@ -17,6 +17,12 @@
 # Command line arguments:
 #   tests/simpletypes_other.xsd
 #
+# Command line:
+#   generateDS.py --no-dates --no-versions --silence --member-specs="list" -f -o "tests/simpletypes_other2_sup.py" -s "tests/simpletypes_other2_sub.py" --super="simpletypes_other2_sup" tests/simpletypes_other.xsd
+#
+# Current working directory (os.getcwd()):
+#   generateds
+#
 
 import sys
 import getopt
diff --git a/tests/to_etree1_sub.py b/tests/to_etree1_sub.py
index ca067b6089d81fa070795b4076f3e9978e88fa34..295c01140ce1cede5e4731b3cb40d8691b548c78 100644
--- a/tests/to_etree1_sub.py
+++ b/tests/to_etree1_sub.py
@@ -18,6 +18,12 @@
 # Command line arguments:
 #   tests/to_etree.xsd
 #
+# Command line:
+#   generateDS.py --no-dates --no-versions --silence --member-specs="list" -f -o "tests/to_etree2_sup.py" -s "tests/to_etree2_sub.py" --export="etree" --silence --super="to_etree2_sup" tests/to_etree.xsd
+#
+# Current working directory (os.getcwd()):
+#   generateds
+#
 
 import sys
 
diff --git a/tests/to_etree1_sup.py b/tests/to_etree1_sup.py
index ab64d41bc811c37b38476eafb77a21179163affe..5ea20e90f511325944928639fdf34ae5190cdb71 100644
--- a/tests/to_etree1_sup.py
+++ b/tests/to_etree1_sup.py
@@ -19,6 +19,12 @@
 # Command line arguments:
 #   tests/to_etree.xsd
 #
+# Command line:
+#   generateDS.py --no-dates --no-versions --silence --member-specs="list" -f -o "tests/to_etree2_sup.py" -s "tests/to_etree2_sub.py" --export="etree" --silence --super="to_etree2_sup" tests/to_etree.xsd
+#
+# Current working directory (os.getcwd()):
+#   generateds
+#
 
 import sys
 import getopt
diff --git a/tests/to_etree2_sub.py b/tests/to_etree2_sub.py
index ca067b6089d81fa070795b4076f3e9978e88fa34..295c01140ce1cede5e4731b3cb40d8691b548c78 100644
--- a/tests/to_etree2_sub.py
+++ b/tests/to_etree2_sub.py
@@ -18,6 +18,12 @@
 # Command line arguments:
 #   tests/to_etree.xsd
 #
+# Command line:
+#   generateDS.py --no-dates --no-versions --silence --member-specs="list" -f -o "tests/to_etree2_sup.py" -s "tests/to_etree2_sub.py" --export="etree" --silence --super="to_etree2_sup" tests/to_etree.xsd
+#
+# Current working directory (os.getcwd()):
+#   generateds
+#
 
 import sys
 
diff --git a/tests/to_etree2_sup.py b/tests/to_etree2_sup.py
index ab64d41bc811c37b38476eafb77a21179163affe..5ea20e90f511325944928639fdf34ae5190cdb71 100644
--- a/tests/to_etree2_sup.py
+++ b/tests/to_etree2_sup.py
@@ -19,6 +19,12 @@
 # Command line arguments:
 #   tests/to_etree.xsd
 #
+# Command line:
+#   generateDS.py --no-dates --no-versions --silence --member-specs="list" -f -o "tests/to_etree2_sup.py" -s "tests/to_etree2_sub.py" --export="etree" --silence --super="to_etree2_sup" tests/to_etree.xsd
+#
+# Current working directory (os.getcwd()):
+#   generateds
+#
 
 import sys
 import getopt