Commit bc48e9eb authored by Dave Kuhlman's avatar Dave Kuhlman

v. 2.29.19. Added --mixed-case-enums

parent af5ed046
......@@ -141,6 +141,14 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Change history
--------------
Version 2.29.19 (07/20/2018)
- Merged pull request that makes generated enums for each simpleType
uppercase. Thanks to Mustafa Şenol Coşar for this enhancement.
- Added new command line option "--mixed-case-enums" to control
whether simpleType enums are changed to upper case. The default
is True.
Version 2.29.18 (07/19/2018)
- Fixes to the example code underneath `Demos/`. Thanks to Witold
......
......@@ -220,7 +220,7 @@ They are used by updateversion.py. -->
<col class="field-name" />
<col class="field-body" />
<tbody valign="top">
<tr class="field"><th class="field-name">revision:</th><td class="field-body">2.29.17</td>
<tr class="field"><th class="field-name">revision:</th><td class="field-body">2.29.19</td>
</tr>
</tbody>
</table>
......@@ -229,7 +229,7 @@ They are used by updateversion.py. -->
<col class="field-name" />
<col class="field-body" />
<tbody valign="top">
<tr class="field"><th class="field-name">date:</th><td class="field-body">July 11, 2018</td>
<tr class="field"><th class="field-name">date:</th><td class="field-body">July 20, 2018</td>
</tr>
</tbody>
</table>
......@@ -659,6 +659,8 @@ Options:
search pattern and second is a replacement.
Example: &quot;[('[-:.]', '_'), ('^__', 'Special')]&quot;
Default: &quot;[('[-:.]', '_')]&quot;
--mixed-case-enums If used, do not uppercase simpleType enums names.
Default is to make enum names uppercase.
-q, --no-questions Do not ask questions, for example,
force overwrite.
--no-warnings Do not print warning messages.
......@@ -973,6 +975,10 @@ characters. Example:
<tt class="docutils literal"><span class="pre">[(':',</span> <span class="pre">'colon'),</span> <span class="pre">('-',</span> <span class="pre">'dash'),</span> <span class="pre">('.',</span> <span class="pre">'dot')]</span></tt>.</p>
<p class="last">The default when omitted is <tt class="docutils literal"><span class="pre">[('[-:.]',</span> <span class="pre">'_')]</span></tt>.</p>
</dd>
<dt>mixed-case-enums</dt>
<dd>Do not uppercase the names of simpleType enums. The default (if
this option is omitted) is to make generated enum names
uppercase.</dd>
<dt>q, no-questions</dt>
<dd>Do not ask questions. For example, if the &quot;-f&quot; command line
option is omitted and the ouput file exists, then generateDS.py
......@@ -3386,7 +3392,7 @@ following among others:</p>
<div class="footer">
<hr class="footer" />
<a class="reference external" href="generateDS.txt">View document source</a>.
Generated on: 2018-07-11 18:42 UTC.
Generated on: 2018-07-20 18:42 UTC.
Generated by <a class="reference external" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference external" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source.
</div>
......
......@@ -124,6 +124,8 @@ Options:
search pattern and second is a replacement.
Example: "[('[-:.]', '_'), ('^__', 'Special')]"
Default: "[('[-:.]', '_')]"
--mixed-case-enums If used, do not uppercase simpleType enums names.
Default is to make enum names uppercase.
-q, --no-questions Do not ask questions, for example,
force overwrite.
--no-warnings Do not print warning messages.
......@@ -225,7 +227,7 @@ _log = logging.getLogger(__name__)
# Do not modify the following VERSION comments.
# Used by updateversion.py.
##VERSION##
VERSION = '2.29.18'
VERSION = '2.29.19'
##VERSION##
BaseStrTypes = six.string_types
......@@ -7253,7 +7255,8 @@ def main():
ModuleSuffix, UseOldSimpleTypeValidators, \
UseGeneratedssuperLookup, UseSourceFileAsModuleName, \
PreserveCdataTags, CleanupNameList, \
NoWarnings, AlwaysExportDefault
NoWarnings, AlwaysExportDefault, \
UppercaseEnums
outputText = True
args = sys.argv[1:]
try:
......@@ -7275,7 +7278,7 @@ def main():
'use-source-file-as-module-name',
'no-warnings',
'no-collect-includes', 'no-redefine-groups',
'always-export-default',
'always-export-default', 'mixed-case-enums',
])
except getopt.GetoptError:
usage()
......@@ -7298,6 +7301,7 @@ def main():
catalogFilename = None
noCollectIncludes = False
noRedefineGroups = False
UppercaseEnums = True
for option in options:
if option[0] == '--session':
sessionFilename = option[1]
......@@ -7480,6 +7484,8 @@ def main():
noRedefineGroups = True
elif option[0] == '--always-export-default':
AlwaysExportDefault = True
elif option[0] == '--mixed-case-enums':
UppercaseEnums = False
if showVersion:
print('generateDS.py version %s' % VERSION)
sys.exit(0)
......
......@@ -12,7 +12,7 @@ generateDS -- Generate Data Structures from XML Schema
.. version
:revision: 2.29.18
:revision: 2.29.19
.. version
......@@ -346,6 +346,8 @@ Here is the usage message displayed by ``generateDS.py``::
search pattern and second is a replacement.
Example: "[('[-:.]', '_'), ('^__', 'Special')]"
Default: "[('[-:.]', '_')]"
--mixed-case-enums If used, do not uppercase simpleType enums names.
Default is to make enum names uppercase.
-q, --no-questions Do not ask questions, for example,
force overwrite.
--no-warnings Do not print warning messages.
......@@ -694,6 +696,11 @@ cleanup-name-list=<replacement-map>
The default when omitted is ``[('[-:.]', '_')]``.
mixed-case-enums
Do not uppercase the names of simpleType enums. The default (if
this option is omitted) is to make generated enum names
uppercase.
q, no-questions
Do not ask questions. For example, if the "-f" command line
option is omitted and the ouput file exists, then generateDS.py
......
......@@ -220,7 +220,7 @@ They are used by updateversion.py. -->
<col class="field-name" />
<col class="field-body" />
<tbody valign="top">
<tr class="field"><th class="field-name">revision:</th><td class="field-body">2.29.17</td>
<tr class="field"><th class="field-name">revision:</th><td class="field-body">2.29.19</td>
</tr>
</tbody>
</table>
......@@ -229,7 +229,7 @@ They are used by updateversion.py. -->
<col class="field-name" />
<col class="field-body" />
<tbody valign="top">
<tr class="field"><th class="field-name">date:</th><td class="field-body">July 11, 2018</td>
<tr class="field"><th class="field-name">date:</th><td class="field-body">July 20, 2018</td>
</tr>
</tbody>
</table>
......@@ -401,7 +401,7 @@ $ mv generateds_gui.mo locale/ru/LC_MESSAGES/
<div class="footer">
<hr class="footer" />
<a class="reference external" href="generateds_gui_notes.txt">View document source</a>.
Generated on: 2018-07-11 18:42 UTC.
Generated on: 2018-07-20 18:42 UTC.
Generated by <a class="reference external" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference external" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source.
</div>
......
......@@ -12,7 +12,7 @@ GenerateDS GUI Notes
.. version
:revision: 2.29.18
:revision: 2.29.19
.. version
......
......@@ -41,7 +41,7 @@ from libgenerateDS.gui import generateds_gui_session
# Do not modify the following VERSION comments.
# Used by updateversion.py.
##VERSION##
VERSION = '2.29.18'
VERSION = '2.29.19'
##VERSION##
......
......@@ -217,7 +217,7 @@ dkuhlman (at) davekuhlman (dot) org
<col class="field-name" />
<col class="field-body" />
<tbody valign="top">
<tr class="field"><th class="field-name">revision:</th><td class="field-body">2.29.17</td>
<tr class="field"><th class="field-name">revision:</th><td class="field-body">2.29.19</td>
</tr>
</tbody>
</table>
......@@ -226,7 +226,7 @@ dkuhlman (at) davekuhlman (dot) org
<col class="field-name" />
<col class="field-body" />
<tbody valign="top">
<tr class="field"><th class="field-name">date:</th><td class="field-body">July 11, 2018</td>
<tr class="field"><th class="field-name">date:</th><td class="field-body">July 20, 2018</td>
</tr>
</tbody>
</table>
......@@ -380,7 +380,7 @@ this command for your needs. For example, you may need to use
<div class="footer">
<hr class="footer" />
<a class="reference external" href="librarytemplate_howto.txt">View document source</a>.
Generated on: 2018-07-11 18:42 UTC.
Generated on: 2018-07-20 18:42 UTC.
Generated by <a class="reference external" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference external" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source.
</div>
......
......@@ -8,7 +8,7 @@ How to package a generateDS.py generated library
.. version
:revision: 2.29.18
:revision: 2.29.19
.. version
......
......@@ -40,7 +40,7 @@ except ImportError:
# Do not modify the following VERSION comments.
# Used by updateversion.py.
##VERSION##
VERSION = '2.29.18'
VERSION = '2.29.19'
##VERSION##
CatalogDict = {}
......
......@@ -8,7 +8,7 @@ setup(
# Do not modify the following VERSION comments.
# Used by updateversion.py.
##VERSION##
version="2.29.18",
version="2.29.19",
##VERSION##
author="Dave Kuhlman",
author_email="dkuhlman@davekuhlman.org",
......
......@@ -2,7 +2,7 @@
#
# Generated by generateDS.py.
# Python 2.7.15 |Anaconda, Inc.| (default, May 1 2018, 23:32:55) [GCC 7.2.0]
# Python 2.7.15 |Anaconda custom (64-bit)| (default, May 1 2018, 23:32:55) [GCC 7.2.0]
#
# Command line options:
# ('--no-dates', '')
......
......@@ -3,7 +3,7 @@
#
# Generated by generateDS.py.
# Python 2.7.15 |Anaconda, Inc.| (default, May 1 2018, 23:32:55) [GCC 7.2.0]
# Python 2.7.15 |Anaconda custom (64-bit)| (default, May 1 2018, 23:32:55) [GCC 7.2.0]
#
# Command line options:
# ('--no-dates', '')
......
......@@ -2,7 +2,7 @@
#
# Generated by generateDS.py.
# Python 2.7.15 |Anaconda, Inc.| (default, May 1 2018, 23:32:55) [GCC 7.2.0]
# Python 2.7.15 |Anaconda custom (64-bit)| (default, May 1 2018, 23:32:55) [GCC 7.2.0]
#
# Command line options:
# ('--no-dates', '')
......
......@@ -3,7 +3,7 @@
#
# Generated by generateDS.py.
# Python 2.7.15 |Anaconda, Inc.| (default, May 1 2018, 23:32:55) [GCC 7.2.0]
# Python 2.7.15 |Anaconda custom (64-bit)| (default, May 1 2018, 23:32:55) [GCC 7.2.0]
#
# Command line options:
# ('--no-dates', '')
......
......@@ -2,7 +2,7 @@
#
# Generated by generateDS.py.
# Python 2.7.15 |Anaconda, Inc.| (default, May 1 2018, 23:32:55) [GCC 7.2.0]
# Python 2.7.15 |Anaconda custom (64-bit)| (default, May 1 2018, 23:32:55) [GCC 7.2.0]
#
# Command line options:
# ('--no-dates', '')
......
......@@ -3,7 +3,7 @@
#
# Generated by generateDS.py.
# Python 2.7.15 |Anaconda, Inc.| (default, May 1 2018, 23:32:55) [GCC 7.2.0]
# Python 2.7.15 |Anaconda custom (64-bit)| (default, May 1 2018, 23:32:55) [GCC 7.2.0]
#
# Command line options:
# ('--no-dates', '')
......
......@@ -2,7 +2,7 @@
#
# Generated by generateDS.py.
# Python 2.7.15 |Anaconda, Inc.| (default, May 1 2018, 23:32:55) [GCC 7.2.0]
# Python 2.7.15 |Anaconda custom (64-bit)| (default, May 1 2018, 23:32:55) [GCC 7.2.0]
#
# Command line options:
# ('--no-dates', '')
......
......@@ -3,7 +3,7 @@
#
# Generated by generateDS.py.
# Python 2.7.15 |Anaconda, Inc.| (default, May 1 2018, 23:32:55) [GCC 7.2.0]
# Python 2.7.15 |Anaconda custom (64-bit)| (default, May 1 2018, 23:32:55) [GCC 7.2.0]
#
# Command line options:
# ('--no-dates', '')
......
......@@ -219,7 +219,7 @@ They are used by updateversion.py. -->
<col class="field-name" />
<col class="field-body" />
<tbody valign="top">
<tr class="field"><th class="field-name">revision:</th><td class="field-body">2.29.17</td>
<tr class="field"><th class="field-name">revision:</th><td class="field-body">2.29.19</td>
</tr>
</tbody>
</table>
......@@ -228,7 +228,7 @@ They are used by updateversion.py. -->
<col class="field-name" />
<col class="field-body" />
<tbody valign="top">
<tr class="field"><th class="field-name">date:</th><td class="field-body">July 11, 2018</td>
<tr class="field"><th class="field-name">date:</th><td class="field-body">July 20, 2018</td>
</tr>
</tbody>
</table>
......@@ -1210,7 +1210,7 @@ named <tt class="docutils literal">garden_api.py</tt>, you can create an instanc
<div class="footer">
<hr class="footer" />
<a class="reference external" href="generateds_tutorial.txt">View document source</a>.
Generated on: 2018-07-11 18:42 UTC.
Generated on: 2018-07-20 18:42 UTC.
Generated by <a class="reference external" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference external" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source.
</div>
......
......@@ -11,7 +11,7 @@ generateDS -- Introduction and Tutorial
.. version
:revision: 2.29.18
:revision: 2.29.19
.. version
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment