diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/configure.erl | 2 | ||||
| -rw-r--r-- | src/ejabberd.app | 2 | ||||
| -rw-r--r-- | src/ejabberd.hrl | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/src/configure.erl b/src/configure.erl index f39305b31..b9447c28d 100644 --- a/src/configure.erl +++ b/src/configure.erl @@ -60,6 +60,8 @@ start() -> EVersion = "ERLANG_VERSION = " ++ erlang:system_info(version) ++ "\n", EIDirS = "EI_DIR = " ++ code:lib_dir("erl_interface") ++ "\n", RootDirS = "ERLANG_DIR = " ++ code:root_dir() ++ "\n", + %% Load the ejabberd application description so that ?VERSION can read the vsn key + application:load(ejabberd), Version = "EJABBERD_VERSION = " ++ ?VERSION ++ "\n", ExpatDir = "EXPAT_DIR = c:\\sdk\\Expat-2.0.0\n", OpenSSLDir = "OPENSSL_DIR = c:\\sdk\\OpenSSL\n", diff --git a/src/ejabberd.app b/src/ejabberd.app index ce527086c..1ff41ec46 100644 --- a/src/ejabberd.app +++ b/src/ejabberd.app @@ -2,7 +2,7 @@ {application, ejabberd, [{description, "ejabberd"}, - {vsn, "2.0.0"}, + {vsn, "2.1.0-alpha"}, {modules, [acl, adhoc, configure, diff --git a/src/ejabberd.hrl b/src/ejabberd.hrl index 1c199b6fc..d7b16f1e2 100644 --- a/src/ejabberd.hrl +++ b/src/ejabberd.hrl @@ -19,7 +19,9 @@ %%% %%%---------------------------------------------------------------------- --define(VERSION, "2.1.0-alpha"). +%% This macro returns a string of the ejabberd version running, e.g. "2.3.4" +%% If the ejabberd application description isn't loaded, returns atom: undefined +-define(VERSION, element(2, application:get_key(ejabberd,vsn))). -define(MYHOSTS, ejabberd_config:get_global_option(hosts)). -define(MYNAME, hd(ejabberd_config:get_global_option(hosts))). |