diff --git a/.devcontainer b/.devcontainer index 6c07d01..1328fde 160000 --- a/.devcontainer +++ b/.devcontainer @@ -1 +1 @@ -Subproject commit 6c07d011aaa0e1f95b958fbd4ada86172634bb7b +Subproject commit 1328fde2e4625f15bfa43d3d2ec7586372299bb1 diff --git a/.github/workflows/xpbuild.yml b/.github/workflows/xpbuild.yml index fb55758..625b2f9 100644 --- a/.github/workflows/xpbuild.yml +++ b/.github/workflows/xpbuild.yml @@ -1,4 +1,7 @@ name: Build +permissions: + contents: read + pull-requests: write on: push: branches: [ "dev" ] @@ -7,24 +10,15 @@ on: workflow_dispatch: jobs: linux: - uses: externpro/externpro/.github/workflows/build-linux.yml@25.05.1 - with: - cmake-workflow-preset: LinuxRelease - runon: ubuntu-latest - secrets: inherit - linux-arm64: - uses: externpro/externpro/.github/workflows/build-linux.yml@25.05.1 - with: - cmake-workflow-preset: LinuxRelease - runon: ubuntu-24.04-arm + permissions: + contents: read + pull-requests: write + packages: write + uses: externpro/externpro/.github/workflows/build-linux.yml@25.07.2 secrets: inherit macos: - uses: externpro/externpro/.github/workflows/build-macos.yml@25.05.1 - with: - cmake-workflow-preset: DarwinRelease + uses: externpro/externpro/.github/workflows/build-macos.yml@25.07.2 secrets: inherit windows: - uses: externpro/externpro/.github/workflows/build-windows.yml@25.05.1 - with: - cmake-workflow-preset: WindowsRelease + uses: externpro/externpro/.github/workflows/build-windows.yml@25.07.2 secrets: inherit diff --git a/.github/workflows/xprelease.yml b/.github/workflows/xprelease.yml index f868a82..fe4c52c 100644 --- a/.github/workflows/xprelease.yml +++ b/.github/workflows/xprelease.yml @@ -9,10 +9,9 @@ on: jobs: # Upload build artifacts as release assets release-from-build: - uses: externpro/externpro/.github/workflows/release-from-build.yml@25.05.1 + uses: externpro/externpro/.github/workflows/release-from-build.yml@25.07.2 with: workflow_run_url: ${{ github.event.inputs.workflow_run_url }} - artifact_pattern: "*.tar.xz" permissions: contents: write id-token: write diff --git a/CMakeLists.txt b/CMakeLists.txt index aebd62e..5f863a6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,22 +1,22 @@ cmake_minimum_required(VERSION 3.31) set(CMAKE_PROJECT_TOP_LEVEL_INCLUDES .devcontainer/cmake/xproinc.cmake) project(wxInclude) -include(GNUInstallDirs) -include(xpflags) xpFindPkg(PKGS boost) add_executable(${CMAKE_PROJECT_NAME} wxInclude.cpp) target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE Boost::filesystem Boost::program_options Boost::timer) -set(exe ${CMAKE_PROJECT_NAME}) +set(targetsFile ${PROJECT_NAME}-targets) if(DEFINED XP_NAMESPACE) + xpExternPackage(NAMESPACE ${XP_NAMESPACE} + TARGETS_FILE ${targetsFile} EXE ${CMAKE_PROJECT_NAME} + BASE v1.0 XPDIFF "intro" PVT_DEPS boost + WEB "http://wiki.wxwidgets.org/Embedding_PNG_Images" + DESC "embed resources into cross-platform code" + LICENSE "[wxWindows](http://wiki.wxwidgets.org/Embedding_PNG_Images 'assumed wxWindows license, since source can be downloaded from wxWiki')" + ) set(nameSpace NAMESPACE ${XP_NAMESPACE}::) - string(PREPEND exe "${XP_NAMESPACE}::") -endif() -if(NOT DEFINED XP_INSTALL_CMAKEDIR) +elseif(NOT DEFINED XP_INSTALL_CMAKEDIR) set(XP_INSTALL_CMAKEDIR ${CMAKE_INSTALL_DATADIR}/cmake) endif() -string(TOLOWER ${PROJECT_NAME} prj) -set(targetsFile ${prj}-targets) -xpPackageDevel(TARGETS_FILE ${targetsFile} EXE ${exe}) install(TARGETS ${CMAKE_PROJECT_NAME} EXPORT ${targetsFile} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} diff --git a/CMakePresetsBase.json b/CMakePresetsBase.json index 565061f..4489d79 100644 --- a/CMakePresetsBase.json +++ b/CMakePresetsBase.json @@ -9,5 +9,11 @@ "XP_NAMESPACE": "xpro" } } + ], + "buildPresets": [ + { + "name": "build-base", + "hidden": true + } ] }