Skip to content

Commit 6f8c3ed

Browse files
pguyotpguyot
committed
Use atomvm_packbeam instead of built-in C packbeam
Signed-off-by: Paul Guyot <pguyot@kallisys.net>
1 parent e9f3fe2 commit 6f8c3ed

File tree

13 files changed

+124
-690
lines changed

13 files changed

+124
-690
lines changed

‎.github/workflows/run-tests-with-beam.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,10 @@ jobs:
102102
with:
103103
submodules: 'recursive'
104104

105+
- name: "Git config safe.directory"
106+
if: matrix.container
107+
run: git config --global --add safe.directory /__w/AtomVM/AtomVM
108+
105109
- name: "Switch to archive.debian.org"
106110
if: matrix.archive == 'true'
107111
run: |

‎CMakeModules/BuildElixir.cmake‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,15 @@ macro(pack_archive avm_name)
4141
)
4242

4343
if(AVM_RELEASE)
44-
set(INCLUDE_LINES "")
44+
set(INCLUDE_LINES "--remove_lines")
4545
else()
46-
set(INCLUDE_LINES "-i")
46+
set(INCLUDE_LINES "")
4747
endif()
4848

4949
add_custom_command(
5050
OUTPUT ${avm_name}.avm
5151
DEPENDS ${avm_name}_beams PackBEAM
52-
COMMAND ${CMAKE_BINARY_DIR}/tools/packbeam/PackBEAM -a ${INCLUDE_LINES} ${avm_name}.avm ${BEAMS}
52+
COMMAND ${CMAKE_BINARY_DIR}/tools/packbeam/packbeam create ${INCLUDE_LINES} ${avm_name}.avm ${BEAMS}
5353
COMMENT "Packing archive ${avm_name}.avm"
5454
VERBATIM
5555
)
@@ -77,9 +77,9 @@ macro(pack_runnable avm_name main)
7777
)
7878

7979
if(AVM_RELEASE)
80-
set(INCLUDE_LINES "")
80+
set(INCLUDE_LINES "--remove_lines")
8181
else()
82-
set(INCLUDE_LINES "-i")
82+
set(INCLUDE_LINES "")
8383
endif()
8484

8585
foreach(archive_name ${ARGN})
@@ -94,7 +94,7 @@ macro(pack_runnable avm_name main)
9494
add_custom_command(
9595
OUTPUT ${avm_name}.avm
9696
DEPENDS ${avm_name}_main ${ARCHIVE_TARGETS} PackBEAM
97-
COMMAND ${CMAKE_BINARY_DIR}/tools/packbeam/PackBEAM ${INCLUDE_LINES} ${avm_name}.avm Elixir.${main}.beam ${ARCHIVES}
97+
COMMAND ${CMAKE_BINARY_DIR}/tools/packbeam/packbeam create -p -s Elixir.${main} ${INCLUDE_LINES} ${avm_name}.avm Elixir.${main}.beam ${ARCHIVES}
9898
COMMENT "Packing runnable ${avm_name}.avm"
9999
VERBATIM
100100
)
@@ -149,9 +149,9 @@ macro(pack_test avm_name main)
149149
)
150150

151151
if(AVM_RELEASE)
152-
set(INCLUDE_LINES "")
152+
set(INCLUDE_LINES "--remove_lines")
153153
else()
154-
set(INCLUDE_LINES "-i")
154+
set(INCLUDE_LINES "")
155155
endif()
156156

157157
# Set up standard libraries
@@ -171,7 +171,7 @@ macro(pack_test avm_name main)
171171
add_custom_command(
172172
OUTPUT ${avm_name}.avm
173173
DEPENDS ${avm_name}_main ${avm_name}_tests ${ARCHIVE_TARGETS} PackBEAM
174-
COMMAND ${CMAKE_BINARY_DIR}/tools/packbeam/PackBEAM ${INCLUDE_LINES} ${avm_name}.avm Elixir.${main}.beam ${TEST_BEAMS} ${ARCHIVES}
174+
COMMAND ${CMAKE_BINARY_DIR}/tools/packbeam/packbeam create ${INCLUDE_LINES} ${avm_name}.avm Elixir.${main}.beam ${TEST_BEAMS} ${ARCHIVES}
175175
COMMENT "Packing test ${avm_name}.avm"
176176
VERBATIM
177177
)

‎CMakeModules/BuildErlang.cmake‎

Lines changed: 26 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,15 @@ macro(pack_archive avm_name)
4141
endforeach()
4242

4343
if(AVM_RELEASE)
44-
set(INCLUDE_LINES "")
44+
set(INCLUDE_LINES "--remove_lines")
4545
else()
46-
set(INCLUDE_LINES "-i")
46+
set(INCLUDE_LINES "")
4747
endif()
4848

4949
add_custom_command(
5050
OUTPUT ${avm_name}.avm
5151
DEPENDS ${pack_archive_${avm_name}_beams} PackBEAM
52-
COMMAND ${CMAKE_BINARY_DIR}/tools/packbeam/PackBEAM -a ${INCLUDE_LINES} ${avm_name}.avm ${pack_archive_${avm_name}_beams}
52+
COMMAND ${CMAKE_BINARY_DIR}/tools/packbeam/packbeam create --lib ${INCLUDE_LINES} ${avm_name}.avm ${pack_archive_${avm_name}_beams}
5353
COMMENT "Packing archive ${avm_name}.avm"
5454
VERBATIM
5555
)
@@ -102,15 +102,15 @@ macro(pack_precompiled_archive avm_name)
102102
endforeach()
103103

104104
if(AVM_RELEASE)
105-
set(INCLUDE_LINES "")
105+
set(INCLUDE_LINES "--remove_lines")
106106
else()
107-
set(INCLUDE_LINES "-i")
107+
set(INCLUDE_LINES "")
108108
endif()
109109

110110
add_custom_command(
111111
OUTPUT ${avm_name}-${jit_target_arch_variant}.avm
112112
DEPENDS ${pack_precompile_archive_${avm_name}_beams} PackBEAM
113-
COMMAND ${CMAKE_BINARY_DIR}/tools/packbeam/PackBEAM -a ${INCLUDE_LINES} ${avm_name}-${jit_target_arch_variant}.avm ${pack_precompile_archive_${avm_name}_beams}
113+
COMMAND ${CMAKE_BINARY_DIR}/tools/packbeam/packbeam create --lib ${INCLUDE_LINES} ${avm_name}-${jit_target_arch_variant}.avm ${pack_precompile_archive_${avm_name}_beams}
114114
COMMENT "Packing archive ${avm_name}-${jit_target_arch_variant}.avm"
115115
VERBATIM
116116
)
@@ -146,15 +146,15 @@ macro(pack_lib avm_name)
146146
endforeach()
147147

148148
if(AVM_RELEASE)
149-
set(INCLUDE_LINES "")
149+
set(INCLUDE_LINES "--remove_lines")
150150
else()
151-
set(INCLUDE_LINES "-i")
151+
set(INCLUDE_LINES "")
152152
endif()
153153

154154
add_custom_command(
155155
OUTPUT ${avm_name}.avm
156156
DEPENDS ${pack_lib_${avm_name}_archive_targets} ${pack_lib_${avm_name}_emu_archives} ${pack_lib_${avm_name}_archives} PackBEAM
157-
COMMAND ${CMAKE_BINARY_DIR}/tools/packbeam/PackBEAM -a ${INCLUDE_LINES} ${avm_name}.avm ${pack_lib_${avm_name}_emu_archives} ${pack_lib_${avm_name}_archives}
157+
COMMAND ${CMAKE_BINARY_DIR}/tools/packbeam/packbeam create --lib ${INCLUDE_LINES} ${avm_name}.avm ${pack_lib_${avm_name}_emu_archives} ${pack_lib_${avm_name}_archives}
158158
COMMENT "Packing lib ${avm_name}.avm"
159159
VERBATIM
160160
)
@@ -173,7 +173,7 @@ macro(pack_lib avm_name)
173173
add_custom_command(
174174
OUTPUT ${avm_name}-${jit_target_arch_variant}.avm
175175
DEPENDS ${pack_lib_${avm_name}_archive_targets} ${pack_lib_${avm_name}_jit_archives_${jit_target_arch_variant}} PackBEAM
176-
COMMAND ${CMAKE_BINARY_DIR}/tools/packbeam/PackBEAM -a ${INCLUDE_LINES} ${avm_name}-${jit_target_arch_variant}.avm ${pack_lib_${avm_name}_jit_archives_${jit_target_arch_variant}} ${pack_lib_${avm_name}_archives}
176+
COMMAND ${CMAKE_BINARY_DIR}/tools/packbeam/packbeam create --lib ${INCLUDE_LINES} ${avm_name}-${jit_target_arch_variant}.avm ${pack_lib_${avm_name}_jit_archives_${jit_target_arch_variant}} ${pack_lib_${avm_name}_archives}
177177
COMMENT "Packing lib ${avm_name}-${jit_target_arch_variant}.avm"
178178
VERBATIM
179179
)
@@ -281,15 +281,15 @@ macro(pack_runnable avm_name main)
281281
endif()
282282

283283
if(AVM_RELEASE)
284-
set(INCLUDE_LINES "")
284+
set(INCLUDE_LINES "--remove_lines")
285285
else()
286-
set(INCLUDE_LINES "-i")
286+
set(INCLUDE_LINES "")
287287
endif()
288288

289289
add_custom_command(
290290
OUTPUT ${avm_name}.avm
291291
DEPENDS ${avm_name}_main ${main}.beam ${pack_runnable_${avm_name}_archives} ${pack_runnable_${avm_name}_archive_targets} PackBEAM
292-
COMMAND ${CMAKE_BINARY_DIR}/tools/packbeam/PackBEAM ${INCLUDE_LINES} ${avm_name}.avm ${main}.beam ${pack_runnable_${avm_name}_archives}
292+
COMMAND ${CMAKE_BINARY_DIR}/tools/packbeam/packbeam create -p -s ${main} ${INCLUDE_LINES} ${avm_name}.avm ${main}.beam ${pack_runnable_${avm_name}_archives}
293293
COMMENT "Packing runnable ${avm_name}.avm"
294294
VERBATIM
295295
)
@@ -322,9 +322,9 @@ macro(pack_test test_avm_name)
322322
endforeach()
323323

324324
if(AVM_RELEASE)
325-
set(INCLUDE_LINES "")
325+
set(INCLUDE_LINES "--remove_lines")
326326
else()
327-
set(INCLUDE_LINES "-i")
327+
set(INCLUDE_LINES "")
328328
endif()
329329

330330
add_custom_command(
@@ -337,7 +337,7 @@ macro(pack_test test_avm_name)
337337
add_custom_command(
338338
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${test_avm_name}.avm
339339
DEPENDS ${pack_test_${test_avm_name}_archive_targets} PackBEAM tests.beam
340-
COMMAND ${CMAKE_BINARY_DIR}/tools/packbeam/PackBEAM ${INCLUDE_LINES} ${CMAKE_CURRENT_BINARY_DIR}/${test_avm_name}.avm ${CMAKE_CURRENT_BINARY_DIR}/tests.beam ${pack_test_${test_avm_name}_archives}
340+
COMMAND ${CMAKE_BINARY_DIR}/tools/packbeam/packbeam create ${INCLUDE_LINES} ${CMAKE_CURRENT_BINARY_DIR}/${test_avm_name}.avm ${CMAKE_CURRENT_BINARY_DIR}/tests.beam ${pack_test_${test_avm_name}_archives}
341341
COMMENT "Packing runnable ${test_avm_name}.avm"
342342
VERBATIM
343343
)
@@ -369,15 +369,15 @@ macro(pack_eunit test_avm_name)
369369
endforeach()
370370

371371
if(AVM_RELEASE)
372-
set(INCLUDE_LINES "")
372+
set(INCLUDE_LINES "--remove_lines")
373373
else()
374-
set(INCLUDE_LINES "-i")
374+
set(INCLUDE_LINES "")
375375
endif()
376376

377377
add_custom_command(
378378
OUTPUT ${test_avm_name}.avm
379379
DEPENDS ${pack_eunit_${test_avm_name}_archive_targets} PackBEAM ${CMAKE_BINARY_DIR}/libs/etest/src/beams/eunit.beam
380-
COMMAND ${CMAKE_BINARY_DIR}/tools/packbeam/PackBEAM ${INCLUDE_LINES} ${CMAKE_CURRENT_BINARY_DIR}/${test_avm_name}.avm ${CMAKE_BINARY_DIR}/libs/etest/src/beams/eunit.beam ${pack_eunit_${test_avm_name}_archives}
380+
COMMAND ${CMAKE_BINARY_DIR}/tools/packbeam/packbeam create ${INCLUDE_LINES} ${CMAKE_CURRENT_BINARY_DIR}/${test_avm_name}.avm ${CMAKE_BINARY_DIR}/libs/etest/src/beams/eunit.beam ${pack_eunit_${test_avm_name}_archives}
381381
COMMENT "Packing runnable ${test_avm_name}.avm"
382382
VERBATIM
383383
)
@@ -412,10 +412,16 @@ macro(pack_uf2 avm_name main)
412412
set(pack_uf2_${avm_name}_archive_targets ${pack_uf2_${avm_name}_archive_targets} ${archive_name})
413413
endforeach()
414414

415+
if(AVM_RELEASE)
416+
set(INCLUDE_LINES "--remove_lines")
417+
else()
418+
set(INCLUDE_LINES "")
419+
endif()
420+
415421
add_custom_command(
416422
OUTPUT ${avm_name}.avm
417423
DEPENDS ${avm_name}_main ${main}.beam ${pack_uf2_${avm_name}_archives} ${pack_uf2_${avm_name}_archive_targets} PackBEAM
418-
COMMAND ${CMAKE_BINARY_DIR}/tools/packbeam/PackBEAM ${avm_name}.avm ${main}.beam ${pack_uf2_${avm_name}_archives}
424+
COMMAND ${CMAKE_BINARY_DIR}/tools/packbeam/packbeam create ${INCLUDE_LINES} -p -s ${main} ${avm_name}.avm ${main}.beam ${pack_uf2_${avm_name}_archives}
419425
COMMENT "Packing runnable ${avm_name}.avm"
420426
VERBATIM
421427
)

‎CMakeModules/BuildGleam.cmake‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ macro(pack_gleam_archive avm_name)
2828
endforeach()
2929

3030
if(AVM_RELEASE)
31-
set(INCLUDE_LINES "")
31+
set(INCLUDE_LINES "--remove_lines")
3232
else()
33-
set(INCLUDE_LINES "-i")
33+
set(INCLUDE_LINES "")
3434
endif()
3535

3636
add_custom_command(
@@ -39,7 +39,7 @@ macro(pack_gleam_archive avm_name)
3939
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/gleam.toml ${CMAKE_CURRENT_SOURCE_DIR}/manifest.toml ${CMAKE_CURRENT_BINARY_DIR}/
4040
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}/src
4141
COMMAND gleam export erlang-shipment
42-
COMMAND ${CMAKE_BINARY_DIR}/tools/packbeam/PackBEAM -a ${INCLUDE_LINES} ${avm_name}.avm ${BEAMS}
42+
COMMAND ${CMAKE_BINARY_DIR}/tools/packbeam/packbeam create --lib ${INCLUDE_LINES} ${avm_name}.avm ${BEAMS}
4343
COMMENT "Packing gleam archive ${avm_name}.avm"
4444
VERBATIM
4545
)
@@ -55,9 +55,9 @@ macro(pack_gleam_runnable avm_name main)
5555
list(APPEND BEAMS ${CMAKE_CURRENT_BINARY_DIR}/build/prod/erlang/*/ebin/*.beam)
5656

5757
if(AVM_RELEASE)
58-
set(INCLUDE_LINES "")
58+
set(INCLUDE_LINES "--remove_lines")
5959
else()
60-
set(INCLUDE_LINES "-i")
60+
set(INCLUDE_LINES "")
6161
endif()
6262

6363
foreach(archive_name ${ARGN})
@@ -75,7 +75,7 @@ macro(pack_gleam_runnable avm_name main)
7575
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/gleam.toml ${CMAKE_CURRENT_SOURCE_DIR}/manifest.toml ${CMAKE_CURRENT_BINARY_DIR}/
7676
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}/src
7777
COMMAND gleam export erlang-shipment
78-
COMMAND ${CMAKE_BINARY_DIR}/tools/packbeam/PackBEAM ${INCLUDE_LINES} ${avm_name}.avm ${BEAMS} ${ARCHIVES}
78+
COMMAND ${CMAKE_BINARY_DIR}/tools/packbeam/packbeam create -p -s ${main} ${INCLUDE_LINES} ${avm_name}.avm ${BEAMS} ${ARCHIVES}
7979
COMMENT "Packing gleam runnable ${avm_name}.avm"
8080
)
8181

‎doc/src/build-instructions.md‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ Source code is organized as follows:
6464

6565
* `src` Contains the core AtomVM virtual machine source code;
6666
* `lib` Contains the Erlang and Elixir core library source code;
67-
* `tools` Contains AtomVM tooling, including the `PackBEAM` executable, as well as build support tooling;
67+
* `tools` Contains build support tooling;
6868
* `examples` Contains sample programs for demonstration purposes;
6969
* `tests` Contains test code run as part of test qualification;
7070
* `doc` Contains documentation source code and content.
@@ -73,11 +73,17 @@ The `src` directory is broken up into the core platform-independent AtomVM libra
7373

7474
## External dependencies
7575

76+
### `packbeam`
77+
78+
AtomVM depends on `packbeam`. It is used to pack beams as well as assets into AtomVM pack format, `.avm`. `packbeam` source code is downloaded automatically by `rebar3` from `hex` mirrors, and it is then escriptized.
79+
80+
It is possible to use a local copy of `packbeam` source code by setting `PACKBEAM_PATH` variable to a path to a source checkout of [`atomvm_packbeam`](https://github.com/atomvm/atomvm_packbeam) when invoking CMake.
81+
7682
### `uf2tool`
7783

78-
AtomVM depends on `uf2tool`. It is used to pack both native and Erlang/Elixir/Gleam code for RP2. uf2tool is downloaded automatically by `rebar3` from `hex` mirrors.
84+
AtomVM depends on `uf2tool`. It is used to pack both native and Erlang/Elixir/Gleam code for RP2. `uf2tool` source code is downloaded automatically by `rebar3` from `hex` mirrors.
7985

80-
It is possible to use a local copy of uf2tool by setting `UF2TOOL_PATH` variable to a path to a source checkout of [`uf2tool`](https://github.com/pguyot/uf2tool) when invoking CMake.
86+
It is possible to use a local copy of `uf2tool` source code by setting `UF2TOOL_PATH` variable to a path to a source checkout of [`uf2tool`](https://github.com/pguyot/uf2tool) when invoking CMake.
8187

8288
## Platform Specific Build Instructions
8389

‎libs/CMakeLists.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,25 +59,25 @@ if (Dialyzer_FOUND)
5959
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/estdlib_beams.txt
6060
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/estdlib/src/estdlib.avm PackBEAM
6161
COMMAND
62-
${CMAKE_BINARY_DIR}/tools/packbeam/PackBEAM -l ${CMAKE_CURRENT_BINARY_DIR}/estdlib/src/estdlib.avm | sed -e 's|^|${CMAKE_CURRENT_BINARY_DIR}/estdlib/src/beams/|g' > ${CMAKE_CURRENT_BINARY_DIR}/estdlib_beams.txt
62+
${CMAKE_BINARY_DIR}/tools/packbeam/packbeam list -f bare ${CMAKE_CURRENT_BINARY_DIR}/estdlib/src/estdlib.avm | sed -e 's|^|${CMAKE_CURRENT_BINARY_DIR}/estdlib/src/beams/|g' > ${CMAKE_CURRENT_BINARY_DIR}/estdlib_beams.txt
6363
)
6464
add_custom_command(
6565
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/eavmlib_beams.txt
6666
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/eavmlib/src/eavmlib.avm PackBEAM
6767
COMMAND
68-
${CMAKE_BINARY_DIR}/tools/packbeam/PackBEAM -l ${CMAKE_CURRENT_BINARY_DIR}/eavmlib/src/eavmlib.avm | sed -e 's|^|${CMAKE_CURRENT_BINARY_DIR}/eavmlib/src/beams/|g' > ${CMAKE_CURRENT_BINARY_DIR}/eavmlib_beams.txt
68+
${CMAKE_BINARY_DIR}/tools/packbeam/packbeam list -f bare ${CMAKE_CURRENT_BINARY_DIR}/eavmlib/src/eavmlib.avm | sed -e 's|^|${CMAKE_CURRENT_BINARY_DIR}/eavmlib/src/beams/|g' > ${CMAKE_CURRENT_BINARY_DIR}/eavmlib_beams.txt
6969
)
7070
add_custom_command(
7171
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/alisp_beams.txt
7272
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/alisp/src/alisp.avm PackBEAM
7373
COMMAND
74-
${CMAKE_BINARY_DIR}/tools/packbeam/PackBEAM -l ${CMAKE_CURRENT_BINARY_DIR}/alisp/src/alisp.avm | sed -e 's|^|${CMAKE_CURRENT_BINARY_DIR}/alisp/src/beams/|g' > ${CMAKE_CURRENT_BINARY_DIR}/alisp_beams.txt
74+
${CMAKE_BINARY_DIR}/tools/packbeam/packbeam list -f bare ${CMAKE_CURRENT_BINARY_DIR}/alisp/src/alisp.avm | sed -e 's|^|${CMAKE_CURRENT_BINARY_DIR}/alisp/src/beams/|g' > ${CMAKE_CURRENT_BINARY_DIR}/alisp_beams.txt
7575
)
7676
add_custom_command(
7777
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/jit_beams.txt
7878
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/jit/src/jit.avm PackBEAM
7979
COMMAND
80-
${CMAKE_BINARY_DIR}/tools/packbeam/PackBEAM -l ${CMAKE_CURRENT_BINARY_DIR}/jit/src/jit.avm | sed -e 's|^|${CMAKE_CURRENT_BINARY_DIR}/jit/src/beams/|g' | grep -v jit_precompile > ${CMAKE_CURRENT_BINARY_DIR}/jit_beams.txt
80+
${CMAKE_BINARY_DIR}/tools/packbeam/packbeam list -f bare ${CMAKE_CURRENT_BINARY_DIR}/jit/src/jit.avm | sed -e 's|^|${CMAKE_CURRENT_BINARY_DIR}/jit/src/beams/|g' | grep -v jit_precompile > ${CMAKE_CURRENT_BINARY_DIR}/jit_beams.txt
8181
)
8282
set(dialyzer_lists
8383
${CMAKE_CURRENT_BINARY_DIR}/estdlib_beams.txt

‎src/platforms/esp32/test/main/test_erl_sources/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ endif()
112112

113113
add_custom_command(
114114
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/esp32_test_modules.avm"
115-
COMMAND HostAtomVM-prefix/src/HostAtomVM-build/tools/packbeam/PackBEAM -i esp32_test_modules.avm
115+
COMMAND HostAtomVM-prefix/src/HostAtomVM-build/tools/packbeam/packbeam create esp32_test_modules.avm
116116
HostAtomVM-prefix/src/HostAtomVM-build/libs/atomvmlib.avm
117117
${erlang_test_beams_to_package}
118118
DEPENDS

‎src/platforms/rp2/tests/test_erl_sources/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ endif()
7575

7676
add_custom_command(
7777
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/rp2_test_modules.avm"
78-
COMMAND HostAtomVM-prefix/src/HostAtomVM-build/tools/packbeam/PackBEAM -i rp2_test_modules.avm
78+
COMMAND HostAtomVM-prefix/src/HostAtomVM-build/tools/packbeam/packbeam create rp2_test_modules.avm
7979
HostAtomVM-prefix/src/HostAtomVM-build/libs/${atomvlib_name}
8080
${erlang_test_beams}
8181
DEPENDS

0 commit comments

Comments
 (0)