Fix: Process configs for replace dataRefs and textures

Update Github actions to latest versions and with debug info

Author: TwinFan

.github/actions/build-lin/action.yml

@@ -18,6 +18,9 @@ outputs:
   xpl-file-name:
     description: Path to the resulting xpl file
     value: ${{ steps.return.outputs.xpl-file-name }}
+  pdb-file-name:
+    description: Path to the resulting .debug.zip file (debug symbol info)
+    value: ${{ steps.return.outputs.pdb-file-name }}
 
 runs:
   using: "composite"
@@ -52,9 +55,23 @@ runs:
         echo Expected target build not found: "$TARGET_XPL"
         exit 1
       fi
+  - name: Extract symbol info
+    shell: bash
+    env:
+      TARGET_XPL: build-lin/${{ inputs.archFolder }}/${{ inputs.pluginName }}.xpl
+      TARGET_DBG: build-lin/${{ inputs.archFolder }}/${{ inputs.pluginName }}.xpl.debug
+      TARGET_PDB: build-lin/${{ inputs.archFolder }}/${{ inputs.pluginName }}.xpl.debug.zip
+    run: |
+      objcopy --only-keep-debug "$TARGET_XPL" "$TARGET_DBG"
+      strip --strip-debug --strip-unneeded "$TARGET_XPL"
+      objcopy --add-gnu-debuglink="$TARGET_DBG" "$TARGET_XPL"
+      zip -9 "$TARGET_PDB" "$TARGET_DBG"
   - name: Return Value
     id: return
     shell: bash
     env:
       TARGET_XPL: build-lin/${{ inputs.archFolder }}/${{ inputs.pluginName }}.xpl
-    run: echo "xpl-file-name=$(echo $TARGET_XPL)" >> $GITHUB_OUTPUT
+      TARGET_PDB: build-lin/${{ inputs.archFolder }}/${{ inputs.pluginName }}.xpl.debug.zip
+    run: |
+      echo "xpl-file-name=$(echo $TARGET_XPL)" >> $GITHUB_OUTPUT
+      echo "pdb-file-name=$(echo $TARGET_PDB)" >> $GITHUB_OUTPUT

.github/actions/build-mac/action.yml

@@ -18,6 +18,9 @@ outputs:
   xpl-file-name:
     description: Path to the resulting xpl file
     value: ${{ steps.return.outputs.xpl-file-name }}
+  pdb-file-name:
+    description: Path to the resulting .dSYM.zip file (debug symbol info)
+    value: ${{ steps.return.outputs.pdb-file-name }}
 
 runs:
   using: "composite"
@@ -51,9 +54,23 @@ runs:
         echo Expected target build not found: "$TARGET_XPL"
         exit 1
       fi
+  - name: Extract symbol info
+    shell: bash
+    env:
+      TARGET_XPL: build-mac/${{ inputs.archFolder }}/${{ inputs.pluginName }}.xpl
+      TARGET_DSYM: build-mac/${{ inputs.archFolder }}/${{ inputs.pluginName }}.xpl.dSYM
+      TARGET_PDB: build-mac/${{ inputs.archFolder }}/${{ inputs.pluginName }}.xpl.dSYM.zip
+    run: |
+      dsymutil "$TARGET_XPL"
+      zip -9r "$TARGET_PDB" "$TARGET_DSYM"
+      rm -rf "$TARGET_DSYM"
+      strip -S "$TARGET_XPL"
   - name: Return Value
     id: return
     shell: bash
     env:
       TARGET_XPL: build-mac/${{ inputs.archFolder }}/${{ inputs.pluginName }}.xpl
-    run: echo "xpl-file-name=$(echo $TARGET_XPL)" >> $GITHUB_OUTPUT
+      TARGET_PDB: build-mac/${{ inputs.archFolder }}/${{ inputs.pluginName }}.xpl.dSYM.zip
+    run: |
+      echo "xpl-file-name=$(echo $TARGET_XPL)" >> $GITHUB_OUTPUT
+      echo "pdb-file-name=$(echo $TARGET_PDB)" >> $GITHUB_OUTPUT

.github/workflows/build.yml

@@ -20,7 +20,7 @@ jobs:
   #####################################
   # Linux with GCC
   build-lin:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     env:
       platform: lin
     steps:
@@ -40,11 +40,12 @@ jobs:
         pluginName:   ${{ env.PRJ_NAME }}
         archFolder:   lin_x64
         xplFileName:  "${{ steps.build.outputs.xpl-file-name }}"
+        pdbFileName:  "${{ steps.build.outputs.pdb-file-name }}"
 
   #####################################
   # MacOS with CMake/clang and sign/notarize in self-written script
   build-mac:
-    runs-on: macos-12
+    runs-on: macos-14
     env:
       platform: mac
     steps:
@@ -85,6 +86,7 @@ jobs:
         pluginName:   ${{ env.PRJ_NAME }}
         archFolder:   mac_x64
         xplFileName:  ${{ steps.build.outputs.xpl-file-name }}
+        pdbFileName:  "${{ steps.build.outputs.pdb-file-name }}"
 
   #####################################
   # Windows with MS Visual Studio

CMakeLists.txt

@@ -24,7 +24,7 @@ else()
 endif()
 
 project(XPMP2RemoteClient
-        VERSION 3.4.0
+        VERSION 3.4.1
         DESCRIPTION "XPMP2-Remote client plugin for X-Plane")
 
 # Provide compile macros from the above project version definition

XPMP2-Remote.xcodeproj/project.pbxproj

@@ -364,7 +364,7 @@
 				XPLANE11_ROOT = "$(USER_APPS_DIR)/X-Plane/11";
 				XPMP2_RC_VER_MAJOR = 3;
 				XPMP2_RC_VER_MINOR = 4;
-				XPMP2_RC_VER_PATCH = 0;
+				XPMP2_RC_VER_PATCH = 1;
 				XPSDK_ROOT = lib/XPMP2/lib/SDK;
 			};
 			name = Debug;
@@ -473,7 +473,7 @@
 				XPLANE11_ROOT = "$(USER_APPS_DIR)/X-Plane/11";
 				XPMP2_RC_VER_MAJOR = 3;
 				XPMP2_RC_VER_MINOR = 4;
-				XPMP2_RC_VER_PATCH = 0;
+				XPMP2_RC_VER_PATCH = 1;
 				XPSDK_ROOT = lib/XPMP2/lib/SDK;
 			};
 			name = Release;

lib/XPMP2

@@ -386,8 +386,8 @@ void ClientProcSettings (const std::uint32_t from[4],
         const XPMP2::RemoteMsgSettingsTy& otherS = itSender->second.settings;
         if (otherS.logLvl < rcGlob.mergedS.logLvl) rcGlob.mergedS.logLvl = otherS.logLvl;
         if ( otherS.bLogMdlMatch)               rcGlob.mergedS.bLogMdlMatch = true;
-        if ( otherS.bObjReplDataRefs)           rcGlob.mergedS.bLogMdlMatch = true;
-        if ( otherS.bObjReplTextures)           rcGlob.mergedS.bLogMdlMatch = true;
+        if ( otherS.bObjReplDataRefs)           rcGlob.mergedS.bObjReplDataRefs = true;
+        if ( otherS.bObjReplTextures)           rcGlob.mergedS.bObjReplTextures = true;
         if (!otherS.bLabelCutOffAtVisibility)   rcGlob.mergedS.bLabelCutOffAtVisibility = false;
         if ( otherS.bMapEnabled)                rcGlob.mergedS.bMapEnabled = true;
         if ( otherS.bMapLabels)                 rcGlob.mergedS.bMapLabels = true;