Small adjustments to escriptize provider and test (#1)

This makes a few small adjustments to the escriptize provider as well as the tests, most of these
are necessary changes. A few additional changes have heen made, such as adding the users
$HOME/.local, to the default AtomVV install search paths, and supporting matching on the AtomVM elf
executable, as well as the shell launcher script.

Signed-off-by: Winford <winford@object.stream>

Author: UncleGrumpy

.github/workflows/build-and-test.yaml

@@ -10,32 +10,26 @@ on: [push, pull_request]
 
 jobs:
   build-and-test:
-    runs-on: "ubuntu-22.04"
+    runs-on: "ubuntu-24.04"
     strategy:
       matrix:
         otp: ["25", "26", "27", "28"]
 
         include:
           - otp: "25"
             make_jobs: "compile etest"
+            rebar3_version: "3.24.0 "
           - otp: "26"
             make_jobs: "all"
+            rebar3_version: "3.25.1"
           - otp: "27"
             make_jobs: "all"
+            rebar3_version: "3.25.1"
           - otp: "28"
             make_jobs: "all"
+            rebar3_version: "3.25.1"
 
     steps:
-    # Setup
-    - name: "Checkout repo"
-      uses: actions/checkout@v2
-      with:
-        submodules: 'recursive'
-
-    - uses: erlef/setup-beam@v1
-      with:
-        otp-version: ${{ matrix.otp }}
-
     # Builder info
     - name: "System info"
       run: |
@@ -44,17 +38,43 @@ jobs:
         echo "**OTP version:**"
         cat $(dirname $(which erlc))/../releases/RELEASES || true
 
+    # Setup OTP
+    - name: "Setup OTP"
+      uses: erlef/setup-beam@v1
+      with:
+        otp-version: ${{ matrix.otp }}
+        rebar3-version: ${{ matrix.rebar3_version }}
+
+    # Checkout AtomVM
+    - name: "Checkout AtomVM"
+      uses: actions/checkout@v5
+      with:
+        repository: 'atomvm/AtomVM'
+        path: 'atomvm'
+        submodules: 'recursive'
+
     - name: "Install deps"
       run: |
-        sudo apt install -y make git
+        sudo apt install -y make git gcc-14 g++-14 cmake gperf zlib1g-dev libmbedtls-dev ninja-build
 
-    - name: "Build rebar3"
+    - name: "Install AtomVM"
+      working-directory: 'atomvm'
       run: |
-        cd /tmp
-        git clone https://github.com/erlang/rebar3.git
-        cd rebar3
-        ./bootstrap
+        mkdir build
+        cd build
+        cmake -DAVM_BUILD_RUNTIME_ONLY=ON -G Ninja ..
+        ninja
+        sudo ninja install
+        atomvm -v
+
+    # Setup
+    - name: "Checkout repo"
+      uses: actions/checkout@v5
+      with:
+        path: 'atomvm_packbeam'
+        submodules: 'recursive'
 
     # Build
     - name: "Make"
+      working-directory: 'atomvm_packbeam'
       run: PATH="/tmp/rebar3:${PATH}" make ${{ matrix.make_jobs }}

src/atomvm_escriptize_provider.erl

@@ -29,8 +29,8 @@
 -define(PROVIDER, escriptize).
 -define(DEPS, [packbeam]).
 -define(OPTS, [
-    {atomvm_binary, $b, "atomvm_binary", string, "Path to AtomVM binary (default: which AtomVM)"},
-    {atomvmlib, $l, "atomvmlib", string, "Path to atomvmlib.avm"},
+    {atomvm_binary, $b, "atomvm_binary", string, "Path to AtomVM binary (default: which atomvm)"},
+    {atomvmlib, $l, "atomvmlib", string, "Path to atomvmlib.avm (default: auto discovered)"},
     {output, $o, "output", string, "Output executable name (default: app name)"},
     {objcopy, $c, "objcopy", string, "Path to objcopy tool (auto-detected if not specified)"},
     {start, $s, "start", atom, "Start module (default: app name)"}
@@ -115,10 +115,11 @@ do(State) ->
     catch
         C:E:S ->
             rebar_api:error(
-                "An error occurred in the ~p task.  Class=~p Error=~p Stacktrace=~p~n", [
-                    ?PROVIDER, C, E, S
+                "An error occurred in the ~p task.  Class=~p Error=~p~n", [
+                    ?PROVIDER, C, E
                 ]
             ),
+            rebar_api:debug("===== Stacktrace ==~n~p~n", [S]),
             {error, E}
     end.
 
@@ -156,7 +157,7 @@ get_atomvmlib_path(Opts) ->
 %% @private
 find_atomvmlib() ->
     % First try to infer from AtomVM wrapper script
-    case os:find_executable("AtomVM") of
+    case os:find_executable("atomvm") of
         false ->
             find_atomvmlib_fallback();
         WrapperPath ->
@@ -173,6 +174,7 @@ find_atomvmlib_fallback() ->
         "/opt/local/lib/atomvm/atomvmlib.avm",
         "/usr/local/lib/atomvm/atomvmlib.avm",
         "/usr/lib/atomvm/atomvmlib.avm",
+        filename:join([os:getenv("HOME", "/.local"), "lib", "atomvm", "atomvmlib.avm"]),
         filename:join([os:getenv("HOME", "/tmp"), ".atomvm", "lib", "atomvmlib.avm"])
     ],
     case lists:filter(fun filelib:is_file/1, PossiblePaths) of
@@ -210,9 +212,18 @@ get_atomvm_binary(Opts) ->
 
 %% @private
 find_atomvm_binary() ->
-    case os:find_executable("AtomVM") of
+    case os:find_executable("atomvm") of
         false ->
-            {error, "AtomVM binary not found in PATH. Please specify with --atomvm_binary option"};
+            case os:find_executable("AtomVM") of
+                Path ->
+                    case resolve_atomvm_binary(Path) of
+                        {ok, BinaryPath} ->
+                            {ok, BinaryPath};
+                        _ ->
+                            {error,
+                                "AtomVM binary not found in PATH. Please specify with --atomvm_binary option"}
+                    end
+            end;
         Path ->
             % Check if it's a shell script wrapper and find the actual binary
             case resolve_atomvm_binary(Path) of
@@ -227,10 +238,10 @@ resolve_atomvm_binary(Path) ->
     % Try to read the file to see if it's a shell script
     case file:read_file(Path) of
         {ok, Content} ->
-            case binary:match(Content, <<"#!/bin/sh">>) of
-                {0, _} ->
+            case binary:part(Content, 0, 9) of
+                <<"#!/bin/sh">> ->
                     % It's a shell script, parse it to find the actual binary
-                    % The standard wrapper is at /prefix/bin/AtomVM
+                    % The standard wrapper is at /prefix/bin/atomvm
                     % The actual binary is at /prefix/lib/atomvm/AtomVM
                     Dir = filename:dirname(Path),
                     Prefix = filename:dirname(Dir),
@@ -239,6 +250,12 @@ resolve_atomvm_binary(Path) ->
                         true -> {ok, ActualBinary};
                         false -> {error, not_found}
                     end;
+                <<_:8, $e, $l, $f, _:40>> ->
+                    % It's the actual binary
+                    case filelib:is_file(Path) of
+                        true -> {ok, Path};
+                        false -> {error, not_found}
+                    end;
                 _ ->
                     {error, not_a_script}
             end;

src/atomvm_packbeam_provider.erl

@@ -137,7 +137,8 @@ get_start_module(State, Opts) ->
                 EscriptName ->
                     EscriptName
             end;
-        StartModule -> StartModule
+        StartModule ->
+            StartModule
     end.
 
 -spec format_error(any()) -> iolist().

test/driver/src/escriptize_tests.erl

@@ -35,7 +35,7 @@ test_defaults(Opts) ->
     test:debug(Output, Opts),
 
     ok = test:expect_contains("Created packed AVM:", Output),
-    ok = test:expect_contains("_build/default/lib/myscript_packed.avm", Output),
+    ok = test:expect_contains("_build/default/lib/myscript.avm", Output),
     ok = test:expect_contains("with start module myscript", Output),
 
     ok = test:expect_contains("Created standalone executable:", Output),
@@ -44,7 +44,7 @@ test_defaults(Opts) ->
     ExecPath = test:make_path([AppDir, "_build/default/bin/myscript"]),
     ok = test:file_exists(ExecPath),
 
-    [] = test:execute_cmd(ExecPath),
+    [] = test:execute_cmd(ExecPath, Opts),
 
     test:tick().
 

test/driver/src/test.erl

@@ -128,10 +128,10 @@ make_opts(Opts) ->
     ).
 
 execute_cmd(Cmd) ->
-    execute_cmd(Cmd, false).
+    execute_cmd(Cmd, #{}).
 
 execute_cmd(Cmd, Opts) ->
-    case maps:get(verbose, Opts) orelse maps:get(debug, Opts) of
+    case maps:get(verbose, Opts, false) orelse maps:get(debug, Opts, false) of
         true ->
             io:format("#executing> ~s~n", [Cmd]);
         _ ->
@@ -141,7 +141,7 @@ execute_cmd(Cmd, Opts) ->
     os:cmd(Cmd).
 
 debug(Msg, Opts) ->
-    case maps:get(debug, Opts) of
+    case maps:get(debug, Opts, false) of
         true ->
             io:format("~s~n", [Msg]);
         _ ->