diff options
| author | Drew DeVault <sir@cmpwn.com> | 2015-08-26 22:17:48 -0400 |
|---|---|---|
| committer | Drew DeVault <sir@cmpwn.com> | 2015-08-26 22:17:48 -0400 |
| commit | ef31ee5cf6aabfdf4730ac64c8b004be238df1a8 (patch) | |
| tree | 6c157899622ccac2c26a56582c72f657e82fbdd3 /sway | |
| parent | 4df64127e951cb6f13d65fc667c10ffc0f4a4dbd (diff) | |
| parent | 54b51cbe6ab191618c33c4e928d79ea97d31a267 (diff) | |
| download | sway-ef31ee5cf6aabfdf4730ac64c8b004be238df1a8.tar.xz | |
Merge pull request #139 from Luminarys/master
Added in better versioning info
Diffstat (limited to 'sway')
| -rw-r--r-- | sway/ipc.c | 18 | ||||
| -rw-r--r-- | sway/main.c | 4 |
2 files changed, 19 insertions, 3 deletions
@@ -225,14 +225,30 @@ void ipc_client_handle_command(struct ipc_client *client) { } case IPC_GET_VERSION: { +#if defined SWAY_GIT_VERSION && defined SWAY_GIT_BRANCH && defined SWAY_VERSION_DATE + char *full_version = calloc(strlen(SWAY_GIT_VERSION) + strlen(SWAY_GIT_BRANCH) + strlen(SWAY_VERSION_DATE) + 20, 1); + strcat(full_version, SWAY_GIT_VERSION); + strcat(full_version, " ("); + strcat(full_version, SWAY_VERSION_DATE); + strcat(full_version, ", branch \""); + strcat(full_version, SWAY_GIT_BRANCH); + strcat(full_version, "\")"); json_object *json = json_object_new_object(); - json_object_object_add(json, "human_readable", json_object_new_string(SWAY_GIT_VERSION)); + json_object_object_add(json, "human_readable", json_object_new_string(full_version)); + // Todo once we actually release a version json_object_object_add(json, "major", json_object_new_int(0)); json_object_object_add(json, "minor", json_object_new_int(0)); json_object_object_add(json, "patch", json_object_new_int(1)); +#else + json_object_object_add(json, "human_readable", json_object_new_string("version not found")); + json_object_object_add(json, "major", json_object_new_int(0)); + json_object_object_add(json, "minor", json_object_new_int(0)); + json_object_object_add(json, "patch", json_object_new_int(0)); +#endif const char *json_string = json_object_to_json_string(json); ipc_send_reply(client, json_string, (uint32_t) strlen(json_string)); json_object_put(json); // free + free(full_version); break; } default: diff --git a/sway/main.c b/sway/main.c index 3591e7ff..01c19074 100644 --- a/sway/main.c +++ b/sway/main.c @@ -78,8 +78,8 @@ int main(int argc, char **argv) { debug = 1; break; case 'v': // version -#ifdef SWAY_GIT_VERSION - fprintf(stdout, "sway build %s\n", SWAY_GIT_VERSION); +#if defined SWAY_GIT_VERSION && defined SWAY_GIT_BRANCH && defined SWAY_VERSION_DATE + fprintf(stdout, "sway version %s (%s, branch \"%s\")\n", SWAY_GIT_VERSION, SWAY_VERSION_DATE, SWAY_GIT_BRANCH); #else fprintf(stdout, "version not detected\n"); #endif |