Update wrappers and misc files for vcpkg compatibility

- Update Obj-C and Swift wrappers for optional module resilience
- Update Package.swift for vcpkg install paths
- Add export-ignore entries to .gitattributes
- Add vcpkg build artifacts to .gitignore
- Fix AISendTests.cpp journal cleanup for iOS

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: bmehta001

.gitattributes

@@ -87,6 +87,12 @@ GNUmakefile             text
 *.xml                   text
 *.cfg                   text
 
+## Exclude vcpkg port and test scaffolding from GitHub tarballs.
+## This avoids a chicken-and-egg problem: the portfile contains a SHA512
+## of the tarball, so changes to the portfile must not change the tarball.
+tools/ports/            export-ignore
+tests/vcpkg/            export-ignore
+
 ## Self-reference =)
 .gitignore              text
 .gitattributes          text

.gitignore

@@ -405,3 +405,6 @@ build/.cmake/api/v1/query/client-vscode/query.json
 
 #Test files generated locally.
 *.ses
+
+# vcpkg test build directories
+tests/vcpkg/build-*/

tests/functests/AISendTests.cpp

@@ -142,6 +142,9 @@ class AISendTests : public ::testing::Test,
         fileName += PATH_SEPARATOR_CHAR;
         fileName += TEST_STORAGE_FILENAME;
         std::remove(fileName.c_str());
+        std::remove((fileName + "-wal").c_str());
+        std::remove((fileName + "-shm").c_str());
+        std::remove((fileName + "-journal").c_str());
     }
 
     virtual void Initialize(DebugEventListener& debugListener, std::string const& path, bool compression)

tests/vcpkg/test-vcpkg-ios.sh

@@ -9,8 +9,20 @@
 #import "ODWLogConfiguration.h"
 #import "ODWSemanticContext.h"
 #import "ODWSemanticContext_private.h"
+
+#if __has_include("PrivacyGuard.hpp")
+#define MATSDK_OBJC_PRIVACYGUARD_AVAILABLE 1
 #import "ODWPrivacyGuard_private.h"
+#else
+#define MATSDK_OBJC_PRIVACYGUARD_AVAILABLE 0
+#endif
+
+#if __has_include("Sanitizer.hpp")
+#define MATSDK_OBJC_SANITIZER_AVAILABLE 1
 #import "ODWSanitizer_private.h"
+#else
+#define MATSDK_OBJC_SANITIZER_AVAILABLE 0
+#endif
 
 #include "EventProperties.hpp"
 
@@ -411,17 +423,35 @@ void PerformActionWithCppExceptionsCatch(void (^block)())
 }
 
 -(void)initializePrivacyGuardWithODWPrivacyGuardInitConfig:(ODWPrivacyGuardInitConfig *)initConfigObject
-{    
+{
+#if MATSDK_OBJC_PRIVACYGUARD_AVAILABLE
     [ODWPrivacyGuard initializePrivacyGuard:_wrappedLogger withODWPrivacyGuardInitConfig:initConfigObject];
+#else
+    (void)initConfigObject;
+    [ODWLogger traceException:"Privacy Guard is not available in this build."];
+#endif
 }
 
 -(void)initializeSanitizerWithODWSanitizerInitConfig:(ODWSanitizerInitConfig *)initConfigObject
 {
+#if MATSDK_OBJC_SANITIZER_AVAILABLE
     [ODWSanitizer initializeSanitizer:_wrappedLogger withODWSanitizerInitConfig:initConfigObject];
+#else
+    (void)initConfigObject;
+    [ODWLogger traceException:"Sanitizer is not available in this build."];
+#endif
 }
 
 -(void)initializeSanitizerWithODWSanitizerInitConfig:(ODWSanitizerInitConfig *)initConfigObject urlDomains:(NSArray<NSString *> *)urlDomains emailDomains:(NSArray<NSString *> *)emailDomains analyzerOptions:(int)analyzerOptions
 {
+#if MATSDK_OBJC_SANITIZER_AVAILABLE
     [ODWSanitizer initializeSanitizer:_wrappedLogger withODWSanitizerInitConfig:initConfigObject urlDomains:urlDomains emailDomains:emailDomains analyzerOptions:analyzerOptions];
+#else
+    (void)initConfigObject;
+    (void)urlDomains;
+    (void)emailDomains;
+    (void)analyzerOptions;
+    [ODWLogger traceException:"Sanitizer is not available in this build."];
+#endif
 }
 @end

tests/vcpkg/test-vcpkg-linux.sh

@@ -2,6 +2,45 @@
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
+import Foundation
+
+let packageDirectory = URL(fileURLWithPath: #filePath).deletingLastPathComponent()
+
+func moduleExists(_ relativePath: String) -> Bool {
+    FileManager.default.fileExists(atPath: packageDirectory.appendingPathComponent(relativePath).standardizedFileURL.path)
+}
+
+let hasDiagnosticDataViewer = moduleExists("../../lib/modules/dataviewer")
+let hasPrivacyGuard = moduleExists("../../lib/modules/privacyguard")
+let hasSanitizer = moduleExists("../../lib/modules/sanitizer")
+
+var excludedSources: [String] = []
+var swiftSettings: [SwiftSetting] = []
+
+if hasDiagnosticDataViewer {
+    swiftSettings.append(.define("MATSDK_DATAVIEWER_AVAILABLE"))
+} else {
+    excludedSources.append("DiagnosticDataViewer.swift")
+}
+
+if hasPrivacyGuard {
+    swiftSettings.append(.define("MATSDK_PRIVACYGUARD_AVAILABLE"))
+} else {
+    excludedSources.append(contentsOf: [
+        "CommonDataContext.swift",
+        "PrivacyGuard.swift",
+        "PrivacyGuardInitConfig.swift",
+    ])
+}
+
+if hasSanitizer {
+    swiftSettings.append(.define("MATSDK_SANITIZER_AVAILABLE"))
+} else {
+    excludedSources.append(contentsOf: [
+        "Sanitizer.swift",
+        "SanitizerInitConfig.swift",
+    ])
+}
 
 let package = Package(
     name: "OneDSSwiftWrapper",
@@ -21,8 +60,11 @@ let package = Package(
         .target(
             name: "OneDSSwift",
             dependencies: [],
+            path: "Sources/OneDSSwift",
+            exclude: excludedSources,
             cSettings: [
                 .headerSearchPath("../../Modules/")
-            ]),
+            ],
+            swiftSettings: swiftSettings),
     ]
 )

tests/vcpkg/test-vcpkg-macos.sh

@@ -137,10 +137,12 @@ public final class Logger {
 
     /**
     Initializes and gets an instance of Privacy Guard.
-    */
+     */
+    #if MATSDK_PRIVACYGUARD_AVAILABLE
     public func apply(config initConfigObject: PrivacyGuardInitConfig) {
         odwLogger.initializePrivacyGuard(with: initConfigObject.getODWPrivacyGuardInitConfig())
     }
+    #endif
 
     // MARK: Set Context methods