diff options
author | Siri Hansen <[email protected]> | 2012-09-19 14:45:55 +0200 |
---|---|---|
committer | Siri Hansen <[email protected]> | 2012-09-21 08:46:28 +0200 |
commit | 4a6edd6f6ffe820db595dfa1f2c43311f6581ca7 (patch) | |
tree | 3e78993483b5d77176e7a7bce2abf853dd2efd1c /lib/reltool/test/reltool_server_SUITE_data/non_standard_vsn_id/b-first | |
parent | 04c6b9a40f782099ece28dbde39c35f25dd2e37b (diff) | |
download | otp-4a6edd6f6ffe820db595dfa1f2c43311f6581ca7.tar.gz otp-4a6edd6f6ffe820db595dfa1f2c43311f6581ca7.tar.bz2 otp-4a6edd6f6ffe820db595dfa1f2c43311f6581ca7.zip |
[reltool] Use application name from .app file instead of directory name
In the first traversal of library directories, reltool used only the
directory names in order to figure out application names. This would
succeed if the directory name was AppName only or AppName-AppVsn and
AppVsn consisted of integers separated by dots only. If the AppVsn has
any other format, then reltool would not find the correct application
name.
With this commit, reltool will first look for a .app file and use the
.app file name as the application name. This will allow different
formats of the version identifier in the directory name. Note that
reltool can still not sort (and select the latest) amongst version
identifiers of other format than integers separated by dots.
Diffstat (limited to 'lib/reltool/test/reltool_server_SUITE_data/non_standard_vsn_id/b-first')
-rw-r--r-- | lib/reltool/test/reltool_server_SUITE_data/non_standard_vsn_id/b-first/ebin/b.app | 6 | ||||
-rw-r--r-- | lib/reltool/test/reltool_server_SUITE_data/non_standard_vsn_id/b-first/src/b.erl | 4 |
2 files changed, 10 insertions, 0 deletions
diff --git a/lib/reltool/test/reltool_server_SUITE_data/non_standard_vsn_id/b-first/ebin/b.app b/lib/reltool/test/reltool_server_SUITE_data/non_standard_vsn_id/b-first/ebin/b.app new file mode 100644 index 0000000000..55550a8190 --- /dev/null +++ b/lib/reltool/test/reltool_server_SUITE_data/non_standard_vsn_id/b-first/ebin/b.app @@ -0,0 +1,6 @@ +%% -*- erlang -*- +{application, b, + [{description, "Reltool test app for using selected version of app"}, + {vsn, "first"}, + {modules, [b]}, + {applications, [kernel, stdlib]}]}. diff --git a/lib/reltool/test/reltool_server_SUITE_data/non_standard_vsn_id/b-first/src/b.erl b/lib/reltool/test/reltool_server_SUITE_data/non_standard_vsn_id/b-first/src/b.erl new file mode 100644 index 0000000000..a6b4ff1c05 --- /dev/null +++ b/lib/reltool/test/reltool_server_SUITE_data/non_standard_vsn_id/b-first/src/b.erl @@ -0,0 +1,4 @@ +-module(b). +-compile(export_all). + +foo() -> ok. |