add upstream sources

rzblue · Sep 10, 2024 · 797be8c · 797be8c
1 parent dcce108
commit 797be8c
Show file tree

Hide file tree

Showing 6 changed files with 4,801 additions and 1 deletion.
diff --git a/upstream_utils/concurrent_queue.py b/upstream_utils/concurrent_queue.py
@@ -0,0 +1,39 @@
+#!/usr/bin/env python3
+
+import os
+import shutil
+
+from upstream_utils import Lib
+
+def copy_upstream_src(wpilib_root):
+    wpiutil = os.path.join(wpilib_root, "wpiutil")
+
+    headers = ["blockingconcurrentqueue.h", "concurrentqueue.h", "lightweightsemaphore.h"]
+    # Copy headers into allwpilib
+    for header in headers:
+        dest_filename = os.path.join(
+            wpiutil, f"src/main/native/thirdparty/concurrentqueue/include/wpi/{header}"
+        )
+        shutil.copyfile(header, dest_filename)
+        # Rename namespace from moodycamel to wpi, and detail to detail_expected
+        with open(dest_filename) as f:
+            content = f.read()
+        content = content.replace("namespace moodycamel", "namespace wpi")
+        content = content.replace("moodycamel::", "wpi::")
+        content = content.replace("MOODYCAMEL_", "WPI_CQ_")
+        with open(dest_filename, "w") as f:
+            f.write(content)
+
+
+def main():
+    name = "concurrentqueue"
+    url = "https://github.com/cameron314/concurrentqueue"
+    # master on 2024-01-25
+    tag = "6dd38b8a1dbaa7863aa907045f32308a56a6ff5d"
+
+    expected = Lib(name, url, tag, copy_upstream_src)
+    expected.main()
+
+
+if __name__ == "__main__":
+    main()
diff --git a/wpiutil/CMakeLists.txt b/wpiutil/CMakeLists.txt
@@ -186,6 +186,7 @@ endif()
 install(
     DIRECTORY
         src/main/native/include/
+        src/main/native/thirdparty/concurrentqueue/include/
         src/main/native/thirdparty/expected/include/
         src/main/native/thirdparty/json/include/
         src/main/native/thirdparty/llvm/include/
@@ -198,6 +199,7 @@ target_include_directories(
     wpiutil
     PUBLIC
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/include>
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/thirdparty/concurrentqueue/include>
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/thirdparty/expected/include>
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/thirdparty/json/include>
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/thirdparty/llvm/include>

diff --git a/wpiutil/build.gradle b/wpiutil/build.gradle
@@ -183,6 +183,9 @@ cppHeadersZip {
     from('src/main/native/thirdparty/expected/include') {
         into '/'
     }
+    from('src/main/native/include/thirdparty/concurrentqueue/include') {
+        into '/'
+    }
     from('src/main/native/thirdparty/fmtlib/include') {
         into '/'
     }
@@ -235,7 +238,7 @@ model {
         all {
             it.sources.each {
                 it.exportedHeaders {
-                    srcDirs 'src/main/native/include', 'src/main/native/thirdparty/expected/include', 'src/main/native/thirdparty/fmtlib/include', 'src/main/native/thirdparty/llvm/include', 'src/main/native/thirdparty/sigslot/include', 'src/main/native/thirdparty/json/include', 'src/main/native/thirdparty/memory/include', 'src/main/native/thirdparty/mpack/include', 'src/main/native/thirdparty/protobuf/include'
+                    srcDirs 'src/main/native/include', 'src/main/native/include/thirdparty/concurrentqueue/include', 'src/main/native/thirdparty/expected/include', 'src/main/native/thirdparty/fmtlib/include', 'src/main/native/thirdparty/llvm/include', 'src/main/native/thirdparty/sigslot/include', 'src/main/native/thirdparty/json/include', 'src/main/native/thirdparty/memory/include', 'src/main/native/thirdparty/mpack/include', 'src/main/native/thirdparty/protobuf/include'
                 }
             }
         }