summaryrefslogtreecommitdiffstats
path: root/defaults
diff options
context:
space:
mode:
authorTor Egge <Tor.Egge@broadpark.no>2018-05-23 20:40:28 +0200
committerTor Egge <Tor.Egge@broadpark.no>2018-05-23 20:46:33 +0200
commit7a8b1ec4fbe9107b4c6f7d07f4cd77f09bc1ed22 (patch)
tree8bbcc59221329364ff01ec3a77f956238143f386 /defaults
parentd3417a2cc400c0d64b71e1cc91fcc032bb8fb3a9 (diff)
Extend vespa-print-default to print vespa version if requested to do so.
Diffstat (limited to 'defaults')
-rw-r--r--defaults/src/apps/printdefault/CMakeLists.txt1
-rw-r--r--defaults/src/apps/printdefault/printdefault.cpp7
2 files changed, 6 insertions, 2 deletions
diff --git a/defaults/src/apps/printdefault/CMakeLists.txt b/defaults/src/apps/printdefault/CMakeLists.txt
index 03fe38bcef4..2823b90d251 100644
--- a/defaults/src/apps/printdefault/CMakeLists.txt
+++ b/defaults/src/apps/printdefault/CMakeLists.txt
@@ -7,3 +7,4 @@ vespa_add_executable(defaults_vespa-print-default_app
DEPENDS
vespadefaults
)
+set_source_files_properties(printdefault.cpp PROPERTIES COMPILE_FLAGS "${VTAG_DEFINES}")
diff --git a/defaults/src/apps/printdefault/printdefault.cpp b/defaults/src/apps/printdefault/printdefault.cpp
index 73e199fb441..33c47dbcb20 100644
--- a/defaults/src/apps/printdefault/printdefault.cpp
+++ b/defaults/src/apps/printdefault/printdefault.cpp
@@ -8,8 +8,9 @@ int main(int argc, char **argv) {
if (argc != 2) {
fprintf(stderr, "usage: %s <variable>\n", argv[0]);
fprintf(stderr, " variable names are: home, user, hostname, portbase, configservers,\n");
- fprintf(stderr, " configserver_rpc_port, configservers_rpc\n");
- fprintf(stderr, " configservers_http, configsources, configproxy_rpc\n");
+ fprintf(stderr, " configserver_rpc_port, configservers_rpc,\n");
+ fprintf(stderr, " configservers_http, configsources, configproxy_rpc,\n");
+ fprintf(stderr, " version\n");
return 1;
}
if (strcmp(argv[1], "home") == 0) {
@@ -47,6 +48,8 @@ int main(int argc, char **argv) {
} else if (strcmp(argv[1], "configproxy_rpc") == 0) {
std::string v = vespa::Defaults::vespaConfigProxyRpcAddr();
printf("%s\n", v.c_str());
+ } else if (strcmp(argv[1], "version") == 0) {
+ printf("%s\n", V_TAG_COMPONENT);
} else {
fprintf(stderr, "Unknown variable '%s'\n", argv[1]);
return 1;