Merge pull request #1 from externpro/xpro

smanders · web-flow · commit 6a9c997b817d · 2025-09-20T14:32:53.000-06:00
externpro devel package
diff --git a/.devcontainer b/.devcontainer
@@ -0,0 +1 @@
+Subproject commit fc813e223b191ee63f630e7d206b9d0fa8013194
diff --git a/.github/workflows/xpbuild.yml b/.github/workflows/xpbuild.yml
@@ -0,0 +1,30 @@
+name: Build
+on:
+  push:
+    branches: [ "dev" ]
+  pull_request:
+    branches: [ "dev" ]
+  workflow_dispatch:
+jobs:
+  linux:
+    uses: externpro/externpro/.github/workflows/build-linux.yml@25.05.1
+    with:
+      cmake-workflow-preset: Linux
+      runon: ubuntu-latest
+    secrets: inherit
+  linux-arm64:
+    uses: externpro/externpro/.github/workflows/build-linux.yml@25.05.1
+    with:
+      cmake-workflow-preset: Linux
+      runon: ubuntu-24.04-arm
+    secrets: inherit
+  macos:
+    uses: externpro/externpro/.github/workflows/build-macos.yml@25.05.1
+    with:
+      cmake-workflow-preset: Darwin
+    secrets: inherit
+  windows:
+    uses: externpro/externpro/.github/workflows/build-windows.yml@25.05.1
+    with:
+      cmake-workflow-preset: Windows
+    secrets: inherit
diff --git a/.github/workflows/xprelease.yml b/.github/workflows/xprelease.yml
@@ -0,0 +1,20 @@
+name: Release
+on:
+  workflow_dispatch:
+    inputs:
+      workflow_run_url:
+        description: 'URL of the workflow run containing artifacts to upload (e.g., https://github.com/owner/repo/actions/runs/123456789)'
+        required: true
+        type: string
+jobs:
+  # Upload build artifacts as release assets
+  release-from-build:
+    uses: externpro/externpro/.github/workflows/release-from-build.yml@25.05.1
+    with:
+      workflow_run_url: ${{ github.event.inputs.workflow_run_url }}
+      artifact_pattern: "*.tar.xz"
+    permissions:
+      contents: write
+      id-token: write
+      attestations: write
+    secrets: inherit
diff --git a/.gitignore b/.gitignore
@@ -160,3 +160,7 @@ test/default/verify1
 test/default/xchacha20
 test/js.done
 testing
+# externpro
+.env
+_bld*/
+docker-compose.override.yml
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule ".devcontainer"]
+	path = .devcontainer
+	url = https://github.com/externpro/externpro
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,10 +1,11 @@
 cmake_minimum_required(VERSION 3.31)
 file(STRINGS configure.ac configure_ac REGEX ^AC_INIT)
 string(REGEX MATCH "([0-9]+)[.][0-9]+[.][0-9]+" VER "${configure_ac}")
-project(sodium VERSION ${VER} LANGUAGES C ASM)
+set(CMAKE_PROJECT_TOP_LEVEL_INCLUDES .devcontainer/cmake/xproinc.cmake)
+project(libsodium VERSION ${VER} LANGUAGES C ASM)
 include(GNUInstallDirs)
-include(configure.cmake)
 include(xpflags)
+include(configure.cmake)
 set_property(GLOBAL PROPERTY USE_FOLDERS ON) # enables Solution Folders
 option(DISABLE_TESTS "Disable tests" OFF)
 option(ENABLE_BLOCKING_RANDOM "Enable only if /dev/urandom is totally broken on the target platform" OFF)
diff --git a/CMakePresets.json b/CMakePresets.json
@@ -0,0 +1,8 @@
+{
+  "version": 8,
+  "include": [
+    ".devcontainer/cmake/presets/xpLinuxNinja.json",
+    ".devcontainer/cmake/presets/xpDarwinNinja.json",
+    ".devcontainer/cmake/presets/xpWindowsVs2022.json"
+  ]
+}
diff --git a/CMakePresetsBase.json b/CMakePresetsBase.json
@@ -0,0 +1,13 @@
+{
+  "version": 8,
+  "configurePresets": [
+    {
+      "name": "config-base",
+      "hidden": true,
+      "binaryDir": "${sourceDir}/_bld-${presetName}",
+      "cacheVariables": {
+        "XP_NAMESPACE": "xpro"
+      }
+    }
+  ]
+}
diff --git a/docker-compose.sh b/docker-compose.sh
@@ -0,0 +1 @@
+.devcontainer/compose.pro.sh
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -0,0 +1 @@
+.devcontainer/compose.bld.yml
diff --git a/src/libsodium/CMakeLists.txt b/src/libsodium/CMakeLists.txt
@@ -682,12 +682,23 @@ target_include_directories(${lib_name} PUBLIC $<INSTALL_INTERFACE:${CMAKE_INSTAL
   PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/include/sodium
   )
 target_link_libraries(${lib_name} PRIVATE Threads::Threads)
+############################################################
+set(targetsFile ${lib_name}-targets)
+string(JOIN "\n" EXT1
+  "set(THREAD_PREFER_PTHREAD_FLAG ON)"
+  "find_package(Threads REQUIRED) # depends on Threads::Threads"
+  ""
+  )
+set(lib ${lib_name})
+if(DEFINED XP_NAMESPACE)
+  string(PREPEND lib "${XP_NAMESPACE}::")
+endif()
+xpPackageDevel(TARGETS_FILE ${targetsFile} LIBRARIES ${lib})
 install(DIRECTORY include/ ${CMAKE_CURRENT_BINARY_DIR}/include/
   DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
   FILES_MATCHING PATTERN "*.h"
   PATTERN "private*" EXCLUDE
   )
-set(targetsFile ${lib_name}-targets)
 install(TARGETS ${lib_name} EXPORT ${targetsFile}
   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+[submodule ".devcontainer"]`
	`2`	`+ path = .devcontainer`
	`3`	`+ url = https://github.com/externpro/externpro`