Merge branch 'v900'

Author: drebbe-intrepid

doc/source/conf.py

@@ -56,9 +56,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '3.0'
+version = '4.0'
 # The full version, including alpha/beta/rc tags.
-release = '3.0'
+release = '4.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

doc/source/index.rst

@@ -1,3 +1,28 @@
+============================================================
+Versioning Information
+============================================================
+
+Minor differences can occur between different icsnVC40.h versions. These differences are usually just structures and constant differences. Below is a list of how the python_ics version correlates to the icsnVC40.h version:
+
+v802
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+``pip install 'python_ics>=2.0,<3.0' --force-reinstall``
+
+    **Note:** Refer to platform specific installation if not on Windows
+
+v803
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+``pip install 'python_ics>=3.0,<4.0' --force-reinstall``
+
+    **Note:** Refer to platform specific installation if not on Windows
+
+v900
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+``pip install 'python_ics>=4.0,<5.0' --force-reinstall``
+
+    **Note:** Refer to platform specific installation if not on Windows
+
+
 ============================================================
 Installation on Windows
 ============================================================

extract_icsneo40_defines.py

@@ -46,7 +46,9 @@
                 print("\n#ifdef _USE_INTERNAL_HEADER_ /* ALL THESE DEFINES ARE SPECIFIED IN THE INTERNAL HEADER */\n", file=f)
             inside_enum = False
             inside_comment = False
+            line_number = 0
             for line in fname:
+                line_number += 1
                 if line.lstrip().startswith('//'):
                     continue
                 if inside_enum and '}' in line:
@@ -73,10 +75,10 @@
                     continue
                 if '#define' in line:
                     sline = line.split()
-                    #print('\t\t' + str(sline))
+                    # DEBUG: print('\t\t' + str(line_number) + '\t' + str(sline))
                     if any(x in sline[1] for x in ignores):
                         continue
-                    if re.match("^\d+?\.\d+?$", sline[2]) is not None:
+                    if len(sline) >= 3 and re.match("^\d+?\.\d+?$", sline[2]) is not None:
                         # Value is a float
                         print('\tresult += PyModule_AddObject(module, "{0}", PyFloat_FromDouble({0}));'.format(sline[1]), file=f)
                     else: