diff options
| author | Alon Levy <alon@pobox.com> | 2015-04-06 16:39:31 +0300 |
|---|---|---|
| committer | Alon Levy <alon@pobox.com> | 2015-04-06 16:40:05 +0300 |
| commit | 002e8ac29f7f75cbddbf758b2982cff1e2d0d555 (patch) | |
| tree | 80d7ae1e3156f80b8a9b63510363d2cb203a754e | |
| parent | 08a628d247ef109acb7c60e20f81473ec630eed7 (diff) | |
build.ant: add version-tag, visible from user as RZ_VERSION (global)
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | build.ant | 9 | ||||
| -rw-r--r-- | res/templates/fragment/.notempty | 0 | ||||
| -rw-r--r-- | res/templates/index.html | 2 |
4 files changed, 11 insertions, 1 deletions
@@ -11,3 +11,4 @@ rhizi-server.log res/etc/rhizi-server.conf src/client/main-built.js src/client/main-built.js.map +res/templates/fragment/version.txt @@ -62,8 +62,15 @@ </delete> </target> + <target name="version-tag"> + <exec dir="${basedir}" executable="/usr/bin/git" output="res/templates/fragment/version.txt"> + <arg line="describe" /> + </exec> + + </target> + <target name="deploy-local" - depends="deploy-local.clean" + depends="deploy-local.clean,version-tag" description="locally deploy webapp"> <!-- [!] trailing '/' on rsync src targets critical --> diff --git a/res/templates/fragment/.notempty b/res/templates/fragment/.notempty new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/res/templates/fragment/.notempty diff --git a/res/templates/index.html b/res/templates/index.html index 6c1ea80b..1e80cf39 100644 --- a/res/templates/index.html +++ b/res/templates/index.html @@ -18,6 +18,8 @@ var rz_config = { // set as a global variable 'rz_server_port': '{{ rz_config__port }}', 'separator_string': ' ', }; + +var RZ_VERSION = '{% include "fragment/version.txt" %}'; </script> <script data-main='/static/app.js' src="/static/lib/require.js"></script> <script src="/static/local_config.js"></script> |