- Updated MIGRATION_STATUS.md with current build status and blockers - Updated combined-migration-compact.prompt.md with latest instructions - Updated Dockerfile for migration pipeline with RTI 7.7 support - Updated build scripts for Docker-based migration workflow Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Entire-Checkpoint: 01M1BQ6VBZ20E1WJ29NYGT8EWJ
This commit is contained in:
1 parent
121c873816
commit
0f23fad65b
3 files changed
+47
-24
No files matched your search
+1
-1
@@ -63,7 +63,7 @@ RUN python3 -m venv /opt/venv \
|
||||
&& /opt/venv/bin/pip install --upgrade pip setuptools wheel \
|
||||
&& /opt/venv/bin/pip install -r /app/requirements.txt aqtinstall \
|
||||
&& mkdir -p "${QT_BASE_DIR}" \
|
||||
&& /opt/venv/bin/python -m aqt install-qt linux desktop "${QT_VERSION}" "${QT_ARCH}" -m qtmultimedia qtserialport qtimageformats qtwebsockets qtwebengine qtpdf qtwebview qt5compat qtwebchannel qtpositioning qtlocation --outputdir "${QT_BASE_DIR}" \
|
||||
&& /opt/venv/bin/python -m aqt install-qt linux desktop "${QT_VERSION}" "${QT_ARCH}" -m qtmultimedia qtserialport qtimageformats qtwebsockets qtwebengine qtpdf qtwebview qt5compat qtwebchannel qtpositioning qtlocation qtsensors --outputdir "${QT_BASE_DIR}" \
|
||||
&& test -f "${QT_ROOT}/lib/cmake/Qt6/Qt6Config.cmake"
|
||||
|
||||
# Build and install Log4Qt via script in /app (keeps Dockerfile small)
|
||||
|
||||
+32
-9
@@ -2,20 +2,43 @@
|
||||
set -e
|
||||
|
||||
cd /tmp
|
||||
rm -rf ./log4qt
|
||||
git clone --depth 1 https://github.com/MEONMedical/Log4Qt.git ./log4qt
|
||||
cd log4qt
|
||||
|
||||
# Patch source files BEFORE build for C++17 compatibility
|
||||
# Fix 1: Replace C++20 spaceship operator in level.h
|
||||
sed -i 's/\[\[nodiscard\]\] constexpr auto operator<=>(const Level\& other) const noexcept = default;/bool operator<(const Level\& other) const noexcept { return mValue < other.mValue; }\n bool operator<=(const Level\& other) const noexcept { return mValue <= other.mValue; }\n bool operator>(const Level\& other) const noexcept { return mValue > other.mValue; }\n bool operator>=(const Level\& other) const noexcept { return mValue >= other.mValue; }\n bool operator==(const Level\& other) const noexcept { return mValue == other.mValue; }/' src/log4qt/level.h
|
||||
|
||||
# Fix 2: Ensure mThreshold.load() is used in appenderskeleton.h
|
||||
sed -i 's/return (mThreshold <= level)/return (mThreshold.load() <= level)/g' src/log4qt/appenderskeleton.h
|
||||
|
||||
mkdir build && cd build
|
||||
cmake .. -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_STANDARD=17
|
||||
cmake .. \
|
||||
-DCMAKE_INSTALL_PREFIX=/usr/local \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DCMAKE_CXX_STANDARD=17 \
|
||||
-DCMAKE_CXX_STANDARD_REQUIRED=ON \
|
||||
-DLOG4QT_BUILD_TESTS=OFF \
|
||||
-DLOG4QT_EXAMPLES=OFF \
|
||||
-DLOG4QT_BUILD_SHARED_LIBS=ON
|
||||
make -j$(nproc)
|
||||
make install
|
||||
|
||||
# Patch installed headers for C++17 compatibility
|
||||
# Fix 1: Replace C++20 spaceship operator with traditional comparison operators in level.h
|
||||
# Uses mValue (the actual member variable) instead of mLevel
|
||||
sed -i 's/\[\[nodiscard\]\] constexpr auto operator<=>(const Level\& other) const noexcept = default;/bool operator<(const Level\& other) const noexcept { return mValue < other.mValue; }\n bool operator<=(const Level\& other) const noexcept { return mValue <= other.mValue; }\n bool operator>(const Level\& other) const noexcept { return mValue > other.mValue; }\n bool operator>=(const Level\& other) const noexcept { return mValue >= other.mValue; }\n bool operator==(const Level\& other) const noexcept { return mValue == other.mValue; }/' /usr/local/include/log4qt/level.h
|
||||
# Verify CMake config files were installed
|
||||
if [ -f /usr/local/lib/cmake/Log4Qt/Log4QtConfig.cmake ]; then
|
||||
echo "Log4Qt CMake config installed successfully"
|
||||
else
|
||||
echo "WARNING: Log4Qt CMake config not found, creating manually..."
|
||||
mkdir -p /usr/local/lib/cmake/Log4Qt
|
||||
cat > /usr/local/lib/cmake/Log4Qt/Log4QtConfig.cmake << 'EOF'
|
||||
include(CMakeFindDependencyMacro)
|
||||
find_dependency(Qt6 COMPONENTS Core)
|
||||
include("${CMAKE_CURRENT_LIST_DIR}/Log4QtTargets.cmake")
|
||||
set(Log4Qt_FOUND TRUE)
|
||||
set(Log4Qt_INCLUDE_DIRS "/usr/local/include")
|
||||
set(Log4Qt_LIBRARIES "log4qt")
|
||||
EOF
|
||||
fi
|
||||
|
||||
# Fix 2: Ensure mThreshold.load() is used in appenderskeleton.h
|
||||
sed -i 's/return (mThreshold <= level)/return (mThreshold.load() <= level)/g' /usr/local/include/log4qt/appenderskeleton.h
|
||||
|
||||
echo "log4qt built and patched for C++17"
|
||||
echo "log4qt built and installed with CMake config"
|
||||
Reference in new issue
Block a user