Skip to content

Commit

Permalink
added nasm, fasm and meson
Browse files Browse the repository at this point in the history
  • Loading branch information
jakoch committed Dec 25, 2024
1 parent ae49d36 commit 0c42cea
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 2 deletions.
4 changes: 4 additions & 0 deletions .devcontainer/debian/bookworm/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,10 @@ RUN echo "Packages" && \
gcovr lcov \
# tracing
strace ltrace \
# asm
nasm fasm \
# build tools
meson \
# required by Visual Studio
g++ gdb make ninja-build rsync zip sudo \
# required by VCPKG + optional downloader
Expand Down
4 changes: 4 additions & 0 deletions .devcontainer/debian/trixie/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,10 @@ RUN echo "Packages" && \
gcovr lcov \
# tracing
strace ltrace \
# asm
nasm fasm \
# build tools
meson \
# required by Visual Studio
g++ gdb make ninja-build rsync zip sudo \
# required by VCPKG
Expand Down
3 changes: 3 additions & 0 deletions .devcontainer/scripts/show-tool-locations.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ show_tool_locations() {
get_command_paths clang++-18
get_command_paths clang++-19
get_command_paths cmake
get_command_paths meson
get_command_paths ninja
get_command_paths ccache
get_command_paths mold
Expand All @@ -52,6 +53,8 @@ show_tool_locations() {
get_command_paths lcov
get_command_paths gcov
get_command_paths gcovr
get_command_paths nasm
get_command_paths fasm
get_command_paths doxygen
get_command_paths sphinx-build
get_command_paths git
Expand Down
3 changes: 3 additions & 0 deletions .devcontainer/scripts/show-tool-versions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ show_tool_versions() {
# Assign versions to variables
clang_version=$(clang --version | head -n1 | awk '{print $4}')
cmake_version=$(cmake --version | head -n1 | awk '{print $3}')
meson_version=$(meson --version)
ninja_version=$(ninja --version)
ccache_version=$(ccache --version | head -n1 | awk '{print $3}')
mold_version=$(mold --version | awk '{print $2}')
Expand All @@ -77,6 +78,8 @@ show_tool_versions() {
lcov=$(lcov --version | head -n1 | awk '{print $4}')
gcov=$(gcov --version | head -n1 | awk '{print $3}' | cut -d'-' -f1)
gcovr=$(gcovr --version | head -n1 | awk '{print $2}')
nasm_version=$(nasm --version | head -n1 | awk '{print $3}')
fasm_version=$(fasm --version | head -n1 | awk '{print $4}')
doxygen_version=$(doxygen -v | awk '{print $1}')
sphinx_version=$(sphinx-build --version | awk '{print $2}')
git_version=$(git --version | cut -c 13-)
Expand Down
3 changes: 1 addition & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [1.0.6] - 2024-12-xx

**Added**
- added ikos static analyzer
- added linux-perf, strace, ltrace
- added linux-perf, strace, ltrace, meson, nasm, fasm, ikos (static analyzer)
- added spellchecker (streetsidesoftware.vscode-spellchecker as vscode extension)
- added spellchecker configuration. the main config is '/cspell.json', which
points to '/build-tools/cspell/cspell.config.json'.
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ On top of the base image the following tools are installed:
- lcov, gcov, gcovr
- strace, ltrace
- perf, gprof
- nasm, fasm
- meson
- CMake (latest version)
- ccache (latest version)
- vcpkg (latest version)
Expand Down

0 comments on commit 0c42cea

Please sign in to comment.