Merge pull request #226 from FloatingArrayDesign/dev

v2.3.3

Author: sanguinariojoe

CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.10)
 set(MOORDYN_MAJOR_VERSION 2)
 set(MOORDYN_MINOR_VERSION 3)
-set(MOORDYN_PATCH_VERSION 2)
+set(MOORDYN_PATCH_VERSION 3)
 set(MOORDYN_VERSION ${MOORDYN_MAJOR_VERSION}.${MOORDYN_MINOR_VERSION})
 project(Moordyn VERSION ${MOORDYN_VERSION})
 

wrappers/python/wheels.github/set_version.py

@@ -28,21 +28,24 @@
 """
 
 # Read the version from the CMakeLists.txt
-version = ""
+version = []
 with open('CMakeLists.txt', 'r') as f:
     txt = f.read()
     for name in ('MAJOR', 'MINOR', 'PATCH'):
         prefix = 'set(MOORDYN_{}_VERSION '.format(name)
         subtxt = txt[txt.find(prefix) + len(prefix):]
         subtxt = subtxt[:subtxt.find(')\n')]
-        version = version + subtxt + '.'
-    version = version[:-1]
+        version += subtxt
 
 
-with open('pyproject.toml', 'r') as f:
-    txt = f.read()
+for fname in ('pyproject.toml', 'setup.py'):
+    with open(fname, 'r') as f:
+        txt = f.read()
 
-txt = txt.replace(r"${MOORDYN_VERSION}", version)
+    for i, name in enumerate(('MAJOR', 'MINOR', 'PATCH')):
+        txt = txt.replace(r"${MOORDYN_" + name + r"_VERSION}", version[i])
+    txt = txt.replace(r"${MOORDYN_VERSION}",
+                    version[0] + "." + version[1] + "." + version[2])
 
-with open('pyproject.toml', 'w') as f:
-    f.write(txt)
+    with open(fname, 'w') as f:
+        f.write(txt)

wrappers/python/wheels.github/setup.py

@@ -90,7 +90,10 @@ def arefiles(files):
 elif platform.system() == "Darwin":
     # To avoid errors with std::filesystem::path
     extra_compile_args.append("-mmacosx-version-min=10.15")
-definitions = [('MoorDyn_EXPORTS', '1'),]
+definitions = [('MoorDyn_EXPORTS', '1'),
+               ('MOORDYN_MAJOR_VERSION', '${MOORDYN_MAJOR_VERSION}'),
+               ('MOORDYN_MINOR_VERSION', '${MOORDYN_MINOR_VERSION}'),
+               ('MOORDYN_PATCH_VERSION', '${MOORDYN_PATCH_VERSION}')]
 include_dirs = [MOORDYN_PATH, "vtk/include/vtk-" + vtk_version]
 if platform.system() == "Windows":
     extra_link_args = [