From f2c6514447013401dc8907aa1b9ab16cc3b9d328 Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Sat, 6 Jun 2020 13:27:27 -0600
Subject: [PATCH] add vsn that is the evaluated application vsn

---
 src/rebar_app_info.erl | 19 ++++++++++++++++++-
 src/rebar_otp_app.erl  | 12 +++++-------
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/src/rebar_app_info.erl b/src/rebar_app_info.erl
index 3380ef83..b344f809 100644
--- a/src/rebar_app_info.erl
+++ b/src/rebar_app_info.erl
@@ -25,6 +25,8 @@
          parent/2,
          original_vsn/1,
          original_vsn/2,
+         vsn/1,
+         vsn/2,
          priv_dir/1,
          applications/1,
          applications/2,
@@ -86,6 +88,7 @@
                      app_file_src_script:: file:filename_all() | undefined,
                      app_file           :: file:filename_all() | undefined,
                      original_vsn       :: binary() | undefined,
+                     vsn                :: binary() | undefined,
                      parent=root        :: binary() | root,
                      app_details=[]     :: list(),
                      applications=[]    :: list(),
@@ -131,6 +134,7 @@ new(AppName) ->
                  {ok, t()}.
 new(AppName, Vsn) ->
     {ok, #app_info_t{name=rebar_utils:to_binary(AppName),
+                     vsn=Vsn,
                      original_vsn=Vsn}}.
 
 %% @doc build a complete version of the app info with all fields set.
@@ -138,6 +142,7 @@ new(AppName, Vsn) ->
                  {ok, t()}.
 new(AppName, Vsn, Dir) ->
     {ok, #app_info_t{name=rebar_utils:to_binary(AppName),
+                     vsn=Vsn,
                      original_vsn=Vsn,
                      fetch_dir=rebar_utils:to_list(Dir),
                      dir=rebar_utils:to_list(Dir),
@@ -149,6 +154,7 @@ new(AppName, Vsn, Dir) ->
                  {ok, t()}.
 new(AppName, Vsn, Dir, Deps) ->
     {ok, #app_info_t{name=rebar_utils:to_binary(AppName),
+                     vsn=Vsn,
                      original_vsn=Vsn,
                      fetch_dir=rebar_utils:to_list(Dir),
                      dir=rebar_utils:to_list(Dir),
@@ -162,6 +168,7 @@ new(AppName, Vsn, Dir, Deps) ->
 new(Parent, AppName, Vsn, Dir, Deps) ->
     {ok, #app_info_t{name=rebar_utils:to_binary(AppName),
                      parent=Parent,
+                     vsn=Vsn,
                      original_vsn=Vsn,
                      fetch_dir=rebar_utils:to_list(Dir),
                      dir=rebar_utils:to_list(Dir),
@@ -170,7 +177,7 @@ new(Parent, AppName, Vsn, Dir, Deps) ->
                      deps=Deps}}.
 
 app_to_map(#app_info_t{name=Name,
-                       original_vsn=Vsn,
+                       vsn=Vsn,
                        applications=Applications,
                        included_applications=IncludedApplications,
                        out_dir=OutDir,
@@ -421,6 +428,16 @@ original_vsn(#app_info_t{original_vsn=Vsn}) ->
 original_vsn(AppInfo=#app_info_t{}, Vsn) ->
     AppInfo#app_info_t{original_vsn=Vsn}.
 
+%% @doc returns the version of the app after evaluation
+-spec vsn(t()) -> binary().
+vsn(#app_info_t{vsn=Vsn}) ->
+    Vsn.
+
+%% @doc sets the evaluated vsn of the app
+-spec vsn(t(), binary() | string()) -> t().
+vsn(AppInfo=#app_info_t{}, Vsn) ->
+    AppInfo#app_info_t{vsn=Vsn}.
+
 %% @doc returns the list of applications the app depends on.
 -spec applications(t()) -> list().
 applications(#app_info_t{applications=Applications}) ->
diff --git a/src/rebar_otp_app.erl b/src/rebar_otp_app.erl
index 952271bb..892b22fe 100644
--- a/src/rebar_otp_app.erl
+++ b/src/rebar_otp_app.erl
@@ -46,12 +46,10 @@ compile(State, App) ->
                        undefined ->
                            App;
                        AppFileSrc ->
-                           File = preprocess(State, App, AppFileSrc),
-                           rebar_app_info:app_file(App, File)
+                           preprocess(State, App, AppFileSrc)
                    end;
                AppFileSrcScript ->
-                   File = preprocess(State, App, AppFileSrcScript),
-                   rebar_app_info:app_file(App, File)
+                   preprocess(State, App, AppFileSrcScript)
            end,
 
     %% Load the app file and validate it.
@@ -92,12 +90,12 @@ validate_app_modules(State, App, AppData) ->
         true ->
             case rebar_app_utils:validate_application_info(App, AppData) of
                 true ->
-                    {ok, rebar_app_info:original_vsn(App, AppVsn)};
+                    {ok, rebar_app_info:original_vsn(rebar_app_info:vsn(App, AppVsn), AppVsn)};
                 Error ->
                     Error
             end;
         false ->
-            {ok, rebar_app_info:original_vsn(App, AppVsn)}
+            {ok, rebar_app_info:original_vsn(rebar_app_info:vsn(App, AppVsn), AppVsn)}
     end.
 
 preprocess(State, AppInfo, AppSrcFile) ->
@@ -130,7 +128,7 @@ preprocess(State, AppInfo, AppSrcFile) ->
             AppFile = rebar_app_utils:app_src_to_app(OutDir, AppSrcFile),
             ok = rebar_file_utils:write_file_if_contents_differ(AppFile, Spec, utf8),
 
-            AppFile;
+            rebar_app_info:app_file(rebar_app_info:vsn(AppInfo, Vsn), AppFile);
         {error, Reason} ->
             throw(?PRV_ERROR({file_read, rebar_app_info:name(AppInfo), ".app.src", Reason}))
     end.