Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .devcontainer
Submodule .devcontainer updated 66 files
+96 −0 .github/actions/cmake-build/action.yml
+10 −16 .github/wf-templates/xpbuild.yml
+1 −2 .github/wf-templates/xprelease.yml
+61 −17 .github/workflows/README.md
+59 −60 .github/workflows/build-linux.yml
+7 −35 .github/workflows/build-macos.yml
+7 −43 .github/workflows/build-windows.yml
+75 −122 .github/workflows/release-from-build.yml
+3 −3 README.md
+0 −40 cmake/Findexdlpro.cmake
+0 −78 cmake/Findwebpro.cmake
+78 −67 cmake/README.md
+0 −17 cmake/cmswxconfig.cmake
+1 −1 cmake/cpack/README.md
+62 −5 cmake/deps.cmake
+9 −9 cmake/deps.dot
+ cmake/deps.png
+0 −0 cmake/legacy/Findscript.cmake.in
+0 −0 cmake/legacy/cmsappendsuffix.cmake
+0 −0 cmake/legacy/cmsconfigurefile.cmake
+0 −0 cmake/legacy/cmscopyfilemd5.cmake
+0 −0 cmake/legacy/cmscopyfiles.cmake
+0 −0 cmake/legacy/cmscopymanuals.cmake
+0 −0 cmake/legacy/cmsdownload.cmake
+0 −0 cmake/legacy/launchWorkflow.cmake
+0 −0 cmake/legacy/macpro.cmake
+1 −2 cmake/legacy/sync.cmake
+0 −0 cmake/legacy/sync.sh.in
+928 −0 cmake/legacy/xpfunmac.cmake
+0 −0 cmake/legacy/xpopts.cmake.in
+0 −0 cmake/legacy/xpsolpkg.cmake
+6 −0 cmake/presets/CMakePresetsBase.json
+0 −67 cmake/presets/xpDarwinMakefilesRelease.json
+23 −0 cmake/presets/xpDarwinNinja.json
+23 −0 cmake/presets/xpLinuxNinja.json
+29 −16 cmake/presets/xpLinuxNinjaTargets.json
+23 −0 cmake/presets/xpWindowsVs2022.json
+428 −348 cmake/pros.cmake
+38 −60 cmake/pros.md
+0 −7 cmake/usexp.cmake.in
+0 −22 cmake/usexpdev.cmake.in
+0 −0 cmake/web/NodePath.cmake
+0 −0 cmake/web/version.js.in
+0 −0 cmake/web/version.ts.in
+0 −0 cmake/web/versionjs.cmake
+82 −139 cmake/web/xpweb.cmake
+0 −30 cmake/xpboost.cmake
+184 −8 cmake/xpcfg.cmake
+336 −1,060 cmake/xpfunmac.cmake
+6 −0 cmake/xproinc.cmake
+1 −2 cmake/xptoplevel.cmake
+6 −5 cmake/xpuse.cmake.in
+0 −1 compose.bld.sh
+0 −1 compose.bld.yml
+0 −1 compose.ci.sh
+1 −1 compose.gpu.sh
+0 −1 compose.gpu.yml
+1 −2 compose.pro.sh
+0 −6 compose.xdl.sh
+7 −90 denv.sh
+66 −32 funcs.sh
+44 −0 git_hooks_pre-commit
+15 −10 graph/graph.dot
+ graph/graph.png
+1 −6 local.dockerfile
+90 −0 tools.sh
24 changes: 12 additions & 12 deletions .github/workflows/xpbuild.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
name: Build
permissions:
contents: read
pull-requests: write
on:
push:
branches: [ "dev" ]
Expand All @@ -7,24 +10,21 @@ on:
workflow_dispatch:
jobs:
linux:
uses: externpro/externpro/.github/workflows/build-linux.yml@25.05.1
with:
cmake-workflow-preset: LinuxRelease
runon: ubuntu-latest
permissions:
contents: read
pull-requests: write
packages: write
uses: externpro/externpro/.github/workflows/build-linux.yml@25.07.1
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
secrets: inherit
macos:
uses: externpro/externpro/.github/workflows/build-macos.yml@25.05.1
uses: externpro/externpro/.github/workflows/build-macos.yml@25.07.1
secrets: inherit
with:
cmake-workflow-preset: DarwinRelease
secrets: inherit
windows:
uses: externpro/externpro/.github/workflows/build-windows.yml@25.05.1
uses: externpro/externpro/.github/workflows/build-windows.yml@25.07.1
secrets: inherit
with:
cmake-workflow-preset: WindowsRelease
secrets: inherit
3 changes: 1 addition & 2 deletions .github/workflows/xprelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.1
with:
workflow_run_url: ${{ github.event.inputs.workflow_run_url }}
artifact_pattern: "*.tar.xz"
permissions:
contents: write
id-token: write
Expand Down
12 changes: 6 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
cmake_minimum_required(VERSION 3.31)
set(CMAKE_PROJECT_TOP_LEVEL_INCLUDES .devcontainer/cmake/xproinc.cmake)
project(nasm VERSION 2.14.02)
include(xpflags)
include(GNUInstallDirs)
set(XP_INSTALL_CMAKEDIR ${CMAKE_INSTALL_DATADIR}/cmake)
include(ExternalProject)
set_property(DIRECTORY PROPERTY "EP_BASE" ${CMAKE_BINARY_DIR}/epbase)
if(WIN32 AND NOT UNIX)
Expand All @@ -19,9 +16,12 @@ if(WIN32 AND NOT UNIX)
<SOURCE_DIR>/LICENSE <INSTALL_DIR>/share/LICENSE
INSTALL_COMMAND ""
)
xpPackageDevel(EXE_PATH bin/nasm)
set(exePath EXE_PATH bin/nasm)
ExternalProject_Get_Property(${PROJECT_NAME} INSTALL_DIR)
install(DIRECTORY ${INSTALL_DIR}/ DESTINATION . USE_SOURCE_PERMISSIONS)
else()
xpPackageDevel()
endif()
xpExternPackage(${exePath} BASE v0 XPDIFF "bin"
WEB "https://www.nasm.us/"
DESC "The Netwide Assembler - an 80x86 and x86-64 assembler (MSW-only)"
LICENSE "[BSD-2-Clause](https://www.nasm.us/ 'BSD 2-Clause Simplified License')"
)
6 changes: 6 additions & 0 deletions CMakePresetsBase.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,11 @@
"hidden": true,
"binaryDir": "${sourceDir}/_bld-${presetName}"
}
],
"buildPresets": [
{
"name": "build-base",
"hidden": true
}
]
}