Separate headers into cpp source files

2026-03-02 06:26:15 +01:00 · 2025-08-14 17:02:58 -06:00
parent 54caafb4da
commit a16405f011
24 changed files with 940 additions and 616 deletions
--- a/cpp/examples/CMakeLists.txt
+++ b/cpp/examples/CMakeLists.txt
@@ -1,13 +1,17 @@
 # Jackson Coxson

-set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.15)
 project(IdeviceFFI CXX)

+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)

-# Set the paths
-set(HEADER_FILE ${CMAKE_SOURCE_DIR}/../../ffi/idevice.h)
+# Paths
+set(IDEVICE_CPP_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/../include)   # public C++ headers
+set(IDEVICE_CPP_SRC_DIR     ${CMAKE_SOURCE_DIR}/../src)       # C++ .cpp files
+set(IDEVICE_FFI_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/../../ffi)    # Rust FFI headers (idevice.h)
 if (MSVC)
  set(STATIC_LIB ${CMAKE_SOURCE_DIR}/../../target/release/idevice_ffi.lib)
 else()
@@ -16,57 +20,84 @@ endif()
 set(EXAMPLES_DIR ${CMAKE_SOURCE_DIR}/../examples)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)

-set(IDEVICE_CPP_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/../include)  # cpp/include
-set(IDEVICE_FFI_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/../../ffi)    # ffi/
-
-set(CMAKE_CXX_STANDARD 17)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
+# Warnings
 if (MSVC)
  add_compile_options(/W4 /permissive- /EHsc)
 else()
  add_compile_options(-Wall -Wextra -Wpedantic)
 endif()

-# Find all C++ example files
+# ---- Build the C++ wrapper library -----------------------------------------
+
+# Collect your .cpps (prefer listing explicitly in real projects)
+file(GLOB IDEVICE_CPP_SOURCES
+  ${IDEVICE_CPP_SRC_DIR}/*.cpp
+)
+
+add_library(idevice_cpp STATIC ${IDEVICE_CPP_SOURCES})
+
+# Public headers for consumers; FFI headers are needed by your .cpps only
+target_include_directories(idevice_cpp
+  PUBLIC
+    ${IDEVICE_CPP_INCLUDE_DIR}
+  PRIVATE
+    ${IDEVICE_FFI_INCLUDE_DIR}
+)
+
+# Link to the Rust static lib (+ system libs/frameworks). Mark as PUBLIC so dependents inherit.
+target_link_libraries(idevice_cpp
+  PUBLIC
+    ${STATIC_LIB}
+)
+
+# Unix-y extras frequently required by Rust static libs
+if (UNIX AND NOT APPLE)
+  find_package(Threads REQUIRED)
+  target_link_libraries(idevice_cpp PUBLIC Threads::Threads dl m)
+endif()
+
+# Apple frameworks (propagate to dependents)
+if (APPLE)
+  target_link_libraries(idevice_cpp PUBLIC
+    "-framework CoreFoundation"
+    "-framework Security"
+    "-framework SystemConfiguration"
+    "-framework CoreServices"
+    "-framework IOKit"
+    "-framework CFNetwork"
+  )
+endif()
+
+# Windows system libs often needed with Rust std/tokio/ring
+if (WIN32)
+  target_link_libraries(idevice_cpp PUBLIC
+    ws2_32
+    userenv
+    ntdll
+    bcrypt
+    # iphlpapi  # uncomment if needed
+    # secur32 crypt32 ncrypt # if you switch TLS stacks
+  )
+endif()
+
+# Optional: position independent code if you later turn idevice_cpp into a shared lib
+set_target_properties(idevice_cpp PROPERTIES POSITION_INDEPENDENT_CODE ON)
+
+# ---- Build each example and link against idevice_cpp ------------------------
+
 file(GLOB EXAMPLE_SOURCES ${EXAMPLES_DIR}/*.cpp)

-# Create an executable for each example file
 foreach(EXAMPLE_FILE ${EXAMPLE_SOURCES})
-    get_filename_component(EXAMPLE_NAME ${EXAMPLE_FILE} NAME_WE)
-    add_executable(${EXAMPLE_NAME} ${EXAMPLE_FILE})
+  get_filename_component(EXAMPLE_NAME ${EXAMPLE_FILE} NAME_WE)
+  add_executable(${EXAMPLE_NAME} ${EXAMPLE_FILE})

-    target_include_directories(${EXAMPLE_NAME} PRIVATE
-        ${IDEVICE_CPP_INCLUDE_DIR}
-        ${IDEVICE_FFI_INCLUDE_DIR}
-    )
+  # Examples include public headers and (if they directly include FFI headers) the FFI dir.
+  target_include_directories(${EXAMPLE_NAME} PRIVATE
+    ${IDEVICE_CPP_INCLUDE_DIR}
+    ${IDEVICE_FFI_INCLUDE_DIR}
+  )

-    # Include the generated header
-    target_include_directories(${EXAMPLE_NAME} PRIVATE ${CMAKE_SOURCE_DIR}/..)
-
-    # Link the static Rust library
-    target_link_libraries(${EXAMPLE_NAME} PRIVATE ${STATIC_LIB})
-
-    # Bulk-link common macOS system frameworks
-    if(APPLE)
-      target_link_libraries(${EXAMPLE_NAME} PRIVATE
-          "-framework CoreFoundation"
-          "-framework Security"
-          "-framework SystemConfiguration"
-          "-framework CoreServices"
-          "-framework IOKit"
-          "-framework CFNetwork"
-      )
-    elseif (WIN32)
-      # System libs required by Rust std/tokio/reqwest/ring on Windows
-      target_link_libraries(${EXAMPLE_NAME} PRIVATE
-        ws2_32        # WSAStartup/WSACleanup, closesocket, freeaddrinfo
-        userenv       # GetUserProfileDirectoryW
-        ntdll         # NtReadFile, RtlNtStatusToDosError
-        bcrypt        # ring RNG (BCryptGenRandom)
-        # iphlpapi    # (optional) GetAdaptersAddresses, if you ever see it unresolved
-        # secur32 crypt32 ncrypt # (only if you switch to schannel/native-tls)
-      )
-    endif()
+  # Link to your C++ wrapper (inherits Rust lib + frameworks/system libs)
+  target_link_libraries(${EXAMPLE_NAME} PRIVATE idevice_cpp)
 endforeach()

-
--- a/cpp/examples/idevice_id.cpp
+++ b/cpp/examples/idevice_id.cpp
@@ -1,13 +1,10 @@
 // Jackson Coxson

-#include "ffi.hpp"
-#include "usbmuxd.hpp"
+#include <idevice++/usbmuxd.hpp>
 #include <iostream>
 #include <optional>

 int main() {
-    std::cout << "Getting devices from usbmuxd\n";
-
    IdeviceFFI::FfiError                         e;
    std::optional<IdeviceFFI::UsbmuxdConnection> u =
        IdeviceFFI::UsbmuxdConnection::default_new(0, e);
--- a/cpp/examples/ideviceinfo.cpp
+++ b/cpp/examples/ideviceinfo.cpp
@@ -0,0 +1,64 @@
+// Jackson Coxson
+
+#include <idevice++/lockdown.hpp>
+#include <idevice++/provider.hpp>
+#include <idevice++/usbmuxd.hpp>
+#include <iostream>
+#include <optional>
+
+int main() {
+    idevice_init_logger(Debug, Disabled, NULL);
+
+    IdeviceFFI::FfiError                         e;
+    std::optional<IdeviceFFI::UsbmuxdConnection> u =
+        IdeviceFFI::UsbmuxdConnection::default_new(0, e);
+    if (!u) {
+        std::cerr << "failed to connect to usbmuxd";
+        std::cerr << e.message;
+    }
+
+    auto devices = u->get_devices(e);
+    if (!devices) {
+        std::cerr << "failed to get devices from usbmuxd";
+        std::cerr << e.message;
+    }
+    if (devices->empty()) {
+        std::cerr << "no devices connected";
+        std::cerr << e.message;
+    }
+
+    auto& dev  = (*devices)[0];
+
+    auto  udid = dev.get_udid();
+    if (!udid) {
+        std::cerr << "no udid\n";
+        return 1;
+    }
+
+    auto id = dev.get_id();
+    if (!id) {
+        std::cerr << "no id\n";
+        return 1;
+    }
+
+    IdeviceFFI::UsbmuxdAddr addr = IdeviceFFI::UsbmuxdAddr::default_new();
+    auto                    prov =
+        IdeviceFFI::Provider::usbmuxd_new(std::move(addr), /*tag*/ 0, *udid, *id, "reeeeeeeee", e);
+    if (!prov) {
+        std::cerr << "provider failed: " << e.message << "\n";
+        return 1;
+    }
+
+    auto client = IdeviceFFI::Lockdown::connect(*prov, e);
+    if (!client) {
+        std::cerr << "lockdown connect failed: " << e.message << "\n";
+        return 1;
+    }
+
+    auto values = client->get_value("", "", e);
+    if (!values) {
+        std::cerr << "get values failed: " << e.message << "\n";
+        return 1;
+    }
+    plist_free(*values);
+}