merge to main

.gitattributes

@@ -3,6 +3,10 @@
 ###############################################################################
 * text=auto
 
+# Force bash scripts to always use LF line endings so that if a repo is accessed
+# in Unix via a file share from Windows, the scripts will work.
+*.sh text eol=lf
+
 ###############################################################################
 # Set default behavior for command prompt diff.
 #

.github/workflows/python-publish.yml

@@ -14,6 +14,7 @@ on:
   push:
     branches:
       - release
+      #- development
 
 permissions:
   contents: read
@@ -43,3 +44,4 @@ jobs:
       with:
         user: __token__
         password: ${{ secrets.PYPI_API_TOKEN_PYODBDESIGNLIB }}
+        packages_dir: PyOdbDesignLib/dist

.gitignore

@@ -10,10 +10,13 @@ PyOdbDesignLib/_PyOdbDesignLib.dll
 PyOdbDesignLib/PyOdbDesignLib.py
 PyOdbDesignLib/_PyOdbDesignLib.pyd
 PyOdbDesignLib/__pycache__/
-OdbDesignServer/Lib/
-OdbDesignServer/OdbDesignServer/__pycache__/
-OdbDesignServer/pyvenv.cfg
-OdbDesignServer/db.sqlite3
-OdbDesignServer/Scripts/
-OdbDesignServer/api/__pycache__/
-OdbDesignServer/PyOdbDesignLib/
+PyOdbDesignServer/Lib/
+PyOdbDesignServer/PyOdbDesignServer/__pycache__/
+PyOdbDesignServer/pyvenv.cfg
+PyOdbDesignServer/db.sqlite3
+PyOdbDesignServer/Scripts/
+PyOdbDesignServer/api/__pycache__/
+PyOdbDesignServer/PyOdbDesignLib/
+/cmake-build-debug
+build/
+/vcpkg_installed

CMakeLists.txt

@@ -23,14 +23,15 @@ endif()
 
 project ("OdbDesign")
 
-if (MSVC)
-    # control where the static and shared libraries are built so that on windows
-    # we don't need to tinker with the path to run the executable
-    set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}")
-    set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}")
-    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}")
-endif()
-
+#if (false AND MSVC)
+#    # control where the static and shared libraries are built so that on windows
+#    # we don't need to tinker with the path to run the executable
+#    set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}")
+#    set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}")
+#    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}")
+#endif()
+
+# increase warnings in a compiler-specific manner
 if (MSVC)
     # warning level 4
     add_compile_options(/W4)
@@ -50,7 +51,10 @@ else()
 endif()
 
 # Include sub-projects.
-add_subdirectory("OdbDesignApp")
 add_subdirectory("OdbDesignLib")
+add_subdirectory("OdbDesignApp")
+add_subdirectory("OdbDesignServer")
 
-target_link_libraries(OdbDesignApp PUBLIC OdbDesign)
+# link to OdbDesign library in both executable targets
+target_link_libraries(OdbDesignApp PUBLIC OdbDesign)
+target_link_libraries(OdbDesignServer PUBLIC OdbDesign)

CMakePresets.json

@@ -37,6 +37,14 @@
         "CMAKE_BUILD_TYPE": "Debug"
       }
     },
+    {
+      "name": "python-x64-debug",
+      "displayName": "Python x64 Debug",
+      "inherits": "x64-debug",
+      "cacheVariables": {
+        "PYTHON_MODULE_BUILD": true
+      }
+    },
     {
       "name": "x64-release",
       "displayName": "x64 Release",
@@ -45,6 +53,14 @@
         "CMAKE_BUILD_TYPE": "Release"
       }
     },
+    {
+      "name": "python-x64-release",
+      "displayName": "Python x64 Release",
+      "inherits": "x64-release",
+      "cacheVariables": {
+        "PYTHON_MODULE_BUILD": true
+      }
+    },
     {
       "name": "x86-debug",
       "displayName": "x86 Debug",
@@ -72,7 +88,12 @@
       "binaryDir": "${sourceDir}/out/build/${presetName}",
       "installDir": "${sourceDir}/out/install/${presetName}",
       "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "Debug"
+        "CMAKE_BUILD_TYPE": "Debug",
+        "CMAKE_TOOLCHAIN_FILE": {
+          "value": "$env{HOME}/src/github/microsoft/vcpkg/scripts/buildsystems/vcpkg.cmake",
+          //"value": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
+          "type": "FILEPATH"
+        }
       },
       "condition": {
         "type": "equals",
@@ -92,7 +113,11 @@
       "binaryDir": "${sourceDir}/out/build/${presetName}",
       "installDir": "${sourceDir}/out/install/${presetName}",
       "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "Release"
+        "CMAKE_BUILD_TYPE": "Release",
+        "CMAKE_TOOLCHAIN_FILE": {
+          "value": "$env{HOME}/src/github/microsoft/vcpkg/scripts/buildsystems/vcpkg.cmake",
+          "type": "FILEPATH"
+        }
       },
       "condition": {
         "type": "equals",
@@ -105,6 +130,22 @@
         }
       }
     },
+    {
+      "name": "python-linux-release",
+      "displayName": "Python Linux Release",
+      "inherits": "linux-release",
+      "cacheVariables": {        
+        "PYTHON_MODULE_BUILD": true
+      }
+    },
+    {
+      "name": "python-linux-debug",
+      "displayName": "Python Linux Debug",
+      "inherits": "linux-debug",
+      "cacheVariables": {        
+        "PYTHON_MODULE_BUILD": true
+      }
+    },
     {
       "name": "linux-mingw-w64-debug",
       "displayName": "Linux MinGW-w64 Debug",
@@ -115,7 +156,11 @@
         "CMAKE_BUILD_TYPE": "Debug",
         "CMAKE_C_COMPILER": "x86_64-w64-mingw32-gcc",
         "CMAKE_CXX_COMPILER": "x86_64-w64-mingw32-g++",
-        "CMAKE_CXX_FLAGS": "-static-libgcc -static-libstdc++"
+        "CMAKE_CXX_FLAGS": "-static-libgcc -static-libstdc++",
+        "CMAKE_TOOLCHAIN_FILE": {
+          "value": "$env{HOME}/src/github/microsoft/vcpkg/scripts/buildsystems/vcpkg.cmake",
+          "type": "FILEPATH"
+        }
       },
       "condition": {
         "type": "equals",
@@ -138,7 +183,11 @@
         "CMAKE_BUILD_TYPE": "Release",
         "CMAKE_C_COMPILER": "x86_64-w64-mingw32-gcc",
         "CMAKE_CXX_COMPILER": "x86_64-w64-mingw32-g++",
-        "CMAKE_CXX_FLAGS": "-static-libgcc -static-libstdc++"
+        "CMAKE_CXX_FLAGS": "-static-libgcc -static-libstdc++",
+        "CMAKE_TOOLCHAIN_FILE": {
+          "value": "$env{HOME}/src/github/microsoft/vcpkg/scripts/buildsystems/vcpkg.cmake",
+          "type": "FILEPATH"
+        }
       },
       "condition": {
         "type": "equals",
@@ -194,7 +243,7 @@
       "displayName": "x64 Release",
       "inherits": "windows-base",
       "configurePreset": "x64-release"
-    },
+    },    
     {
       "name": "x86-debug",
       "displayName": "x86 Debug",
@@ -207,6 +256,18 @@
       "inherits": "windows-base",
       "configurePreset": "x86-release"
     },
+    {
+      "name": "python-x64-debug",
+      "displayName": "Python x64 Debug",
+      "inherits": "windows-base",
+      "configurePreset": "python-x64-debug"
+    },
+    {
+      "name": "python-x64-release",
+      "displayName": "Python x64 Release",
+      "inherits": "windows-base",
+      "configurePreset": "python-x64-release"
+    },
     {
       "name": "linux-base",
       "hidden": true,
@@ -229,6 +290,18 @@
       "configurePreset": "linux-release",
       "inherits": "linux-base"
     },
+    {
+      "name": "python-linux-debug",
+      "displayName": "Python Linux Debug",
+      "configurePreset": "python-linux-debug",
+      "inherits": "linux-base"
+    },
+    {
+      "name": "python-linux-release",
+      "displayName": "Python Linux Release",
+      "configurePreset": "python-linux-release",
+      "inherits": "linux-base"
+    },
     {
       "name": "linux-mingw-w64-base",
       "hidden": true,

Dockerfile

@@ -1,3 +1,4 @@
+#FROM debian:bookworm-20230522-slim AS build
 FROM debian:bookworm-20230522-slim AS build
 
 # install dependencies
@@ -11,72 +12,43 @@ RUN apt-get update && \
         cmake \            
         g++ \
         ninja-build \
-        python3-dev \
-        #python3-pip \
-        #python3-virtualenv \
+        python3-dev \   
         # mingw-w64 \        
         swig      
 
-# add MS PowerShell repo
-RUN curl https://packages.microsoft.com/keys/microsoft.asc | gpg --yes --dearmor --output /usr/share/keyrings/microsoft.gpg
-RUN sh -c 'echo "deb [arch=amd64 signed-by=/usr/share/keyrings/microsoft.gpg] https://packages.microsoft.com/repos/microsoft-debian-bullseye-prod bullseye main" > /etc/apt/sources.list.d/microsoft.list'
-
-# install PowerShell
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends \
-        powershell
-
 # copy source
-RUN mkdir -p /src/OdbDesign
+COPY . /src/OdbDesign
 WORKDIR /src/OdbDesign
-COPY . .
 
 # generate SWIG python bindings
-RUN chmod +x scripts/generate-python-module.ps1
-RUN scripts/generate-python-module.ps1
+RUN chmod +x scripts/generate-python-module.sh
+RUN ./scripts/generate-python-module.sh
 
 # configure & build using presets
 # linux-release
-RUN cmake --preset linux-release
-RUN cmake --build --preset linux-release
-# # linux-debug
-# RUN cmake --preset linux-debug
-# RUN cmake --build --preset linux-debug
-
-## build PyOdbDesignLib python package
-#RUN python3 -m pip install -r PyOdbDesignLib/pkg-build-requirements.txt --break-system-packages
-WORKDIR /src/OdbDesign/PyOdbDesignLib
-# copy C++ wrapper library to a format that Python expects for extension modules
-RUN cp /src/OdbDesign/out/build/linux-release/OdbDesignLib/libOdbDesign.so ./_PyOdbDesignLib.so
-## build Python package
-#RUN python3 -m build
+RUN cmake --preset python-linux-release
+RUN cmake --build --preset python-linux-release
 
 # much smaller runtime image
-FROM debian:bookworm-20230522-slim AS run
+#FROM python:3.11.4-bullseye AS run
+FROM debian:bookworm-20230522-slim as run
 
-RUN mkdir /OdbDesign
-WORKDIR /OdbDesign
+# copy PyPyPyOdbDesignServer files
+COPY --from=build /src/OdbDesign/PyOdbDesignServer PyOdbDesignServer
 
-# copy binaries
-RUN mkdir bin
-COPY --from=build /src/OdbDesign/out/build/linux-release/OdbDesignLib/libOdbDesign.so ./bin/
-COPY --from=build /src/OdbDesign/out/build/linux-release/OdbDesignApp/OdbDesignApp ./bin/
-# copy Python files
-COPY --from=build /src/OdbDesign/PyOdbDesignLib /OdbDesign/PyOdbDesignLib
+# copy PyOdbDesignLib files
+COPY --from=build /src/OdbDesign/out/build/python-linux-release/OdbDesignLib/_PyOdbDesignLib.so /PyOdbDesignServer/PyOdbDesignLib/
+COPY --from=build /src/OdbDesign/PyOdbDesignLib/PyOdbDesignLib.py /PyOdbDesignServer/PyOdbDesignLib/
+RUN touch /PyOdbDesignServer/PyOdbDesignLib/__init__.py
 
-# install Python3 dev
 RUN apt-get update && \
-    apt-get install -y --no-install-recommends \
-        python3-dev
-        #python3-pip \
-        #python3-virtualenv
+    apt-get install -y --no-install-recommends \       
+        python3-dev \
+        python3-pip
 
-# # install package into Python environment
-# RUN python3 -m pip install --break-system-packages \
-#                            --no-index \
-#                            --find-links PyOdbDesignLib/dist/*.whl \
-#                            PyOdbDesignLib
+RUN python3 -m pip install -r /PyOdbDesignServer/requirements.txt --break-system-packages
 
 # run
-ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/OdbDesign/bin
-ENTRYPOINT [ "bin/OdbDesignApp" ]
+WORKDIR /PyOdbDesignServer
+EXPOSE 8000
+CMD ["gunicorn", "--bind", ":8000", "--workers", "3", "PyOdbDesignServer.wsgi:application"]