From 85dfa81977b4fe79582cabb20d26d6205c0a9fe5 Mon Sep 17 00:00:00 2001
From: Rob Fisher <rob.fisher@hbkworld.com>
Date: Tue, 21 Jan 2025 20:37:16 +0000
Subject: [PATCH 1/2] Installs python package to dist-packages on linux

---
 .devcontainer/Dockerfile.ubuntu | 2 +-
 cmake/mscl_python_swig.cmake    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.devcontainer/Dockerfile.ubuntu b/.devcontainer/Dockerfile.ubuntu
index 056ab44a4..5016c5921 100644
--- a/.devcontainer/Dockerfile.ubuntu
+++ b/.devcontainer/Dockerfile.ubuntu
@@ -53,7 +53,7 @@ RUN set -ex \
 ARG BOOST_VERSION=1.68.0
 RUN set -ex \
     && export boost_version_underscore=$(echo ${BOOST_VERSION} | tr '.' '_') \
-    && curl -fsSLo /tmp/boost_${boost_version_underscore}.tar.gz https://boostorg.jfrog.io/artifactory/main/release/1.68.0/source/boost_${boost_version_underscore}.tar.gz \
+    && curl -fsSLo /tmp/boost_${boost_version_underscore}.tar.gz https://archives.boost.io/release/1.68.0/source/boost_${boost_version_underscore}.tar.gz \
     && tar -C /tmp/ -xzf /tmp/boost_${boost_version_underscore}.tar.gz \
     && cd /tmp/boost_${boost_version_underscore} \
     && ./bootstrap.sh \
diff --git a/cmake/mscl_python_swig.cmake b/cmake/mscl_python_swig.cmake
index 593aac7af..7473c42ee 100644
--- a/cmake/mscl_python_swig.cmake
+++ b/cmake/mscl_python_swig.cmake
@@ -75,20 +75,20 @@ macro(mscl_python_swig)
     )
 
     if(MSVC)
-        set(PYTHON_SITE_PACKAGES_DIR "${mscl_python_swig_PYTHON_VERSION}/${MSCL_ARCH_NAME}/$<CONFIG>")
+        set(PYTHON_DIST_PACKAGES_DIR "${mscl_python_swig_PYTHON_VERSION}/${MSCL_ARCH_NAME}/$<CONFIG>")
     else()
-        set(PYTHON_SITE_PACKAGES_DIR lib/python${mscl_python_swig_PYTHON_VERSION}/site-packages)
+        set(PYTHON_DIST_PACKAGES_DIR lib/python${mscl_python_swig_PYTHON_VERSION}/dist-packages)
     endif()
 
     set(MSCL_PYTHON${mscl_python_swig_PYTHON_VERSION}_INSTALL_COMPONENT ${PROJECT_NAME}_PYTHON${mscl_python_swig_PYTHON_VERSION})
     install(
         TARGETS ${mscl_python_swig_MODULE_NAME}
-        DESTINATION "${PYTHON_SITE_PACKAGES_DIR}"
+        DESTINATION "${PYTHON_DIST_PACKAGES_DIR}"
         COMPONENT ${MSCL_PYTHON${mscl_python_swig_PYTHON_VERSION}_INSTALL_COMPONENT}
     )
     install(
         FILES "${PYTHON_INTERFACE_FILE}"
-        DESTINATION "${PYTHON_SITE_PACKAGES_DIR}"
+        DESTINATION "${PYTHON_DIST_PACKAGES_DIR}"
         COMPONENT ${MSCL_PYTHON${mscl_python_swig_PYTHON_VERSION}_INSTALL_COMPONENT}
     )
 endmacro()

From 15c54c0cbb3c01814140af2c090b3e1f86a4b6b1 Mon Sep 17 00:00:00 2001
From: Nick DaCosta <nick.dacosta@hbkworld.com>
Date: Wed, 22 Jan 2025 09:55:05 -0500
Subject: [PATCH 2/2] Updated boost download url for Windows docker

Added changelog descriptions for new changes
---
 .devcontainer/Dockerfile.windows | 4 ++--
 CHANGELOG.md                     | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.devcontainer/Dockerfile.windows b/.devcontainer/Dockerfile.windows
index e146a6fec..8f09b4e68 100644
--- a/.devcontainer/Dockerfile.windows
+++ b/.devcontainer/Dockerfile.windows
@@ -49,8 +49,8 @@ ARG BOOST_VERSION_UNDERSCORE=1_68_0
 ARG BOOST_MSVC_VERSION=14.0
 RUN echo Installing Boost `
     # Download the boost installer
-    && curl -SL --output %DOCKER_TEMP_DIR%/boost_%BOOST_VERSION_UNDERSCORE%-msvc-%BOOST_MSVC_VERSION%-32.exe https://boostorg.jfrog.io/artifactory/main/release/%BOOST_VERSION%/binaries/boost_%BOOST_VERSION_UNDERSCORE%-msvc-%BOOST_MSVC_VERSION%-32.exe `
-    && curl -SL --output %DOCKER_TEMP_DIR%/boost_%BOOST_VERSION_UNDERSCORE%-msvc-%BOOST_MSVC_VERSION%-64.exe https://boostorg.jfrog.io/artifactory/main/release/%BOOST_VERSION%/binaries/boost_%BOOST_VERSION_UNDERSCORE%-msvc-%BOOST_MSVC_VERSION%-64.exe `
+    && curl -SL --output %DOCKER_TEMP_DIR%/boost_%BOOST_VERSION_UNDERSCORE%-msvc-%BOOST_MSVC_VERSION%-32.exe https://archives.boost.io/release/%BOOST_VERSION%/binaries/boost_%BOOST_VERSION_UNDERSCORE%-msvc-%BOOST_MSVC_VERSION%-32.exe `
+    && curl -SL --output %DOCKER_TEMP_DIR%/boost_%BOOST_VERSION_UNDERSCORE%-msvc-%BOOST_MSVC_VERSION%-64.exe https://archives.boost.io/release/%BOOST_VERSION%/binaries/boost_%BOOST_VERSION_UNDERSCORE%-msvc-%BOOST_MSVC_VERSION%-64.exe `
     `
     # Install
     && (start /w %DOCKER_TEMP_DIR%/boost_%BOOST_VERSION_UNDERSCORE%-msvc-%BOOST_MSVC_VERSION%-32.exe /VERYSILENT /DIR=%LIB_PATH%/boost) `
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d946931ea..3b26ab5df 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@ REMOVED - A function/class has been removed.
 ___
 
 ## Forthcoming
+- Fixed Python install directory for Linux
 
 ## 67.0.0 - 2024-12-19
 - CHANGED Fixed typo for mscl::InertialNode::setAidingMeasurementReferenceFrames()