diff options
| author | Drew DeVault <sir@cmpwn.com> | 2017-04-26 10:18:03 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-26 10:18:03 -0400 |
| commit | 3c1fc00f12e2777f6349a5d671b8d66c5997eb2b (patch) | |
| tree | 5bcca08aad4e65d288abf218b50172a3137d2d71 /sway/main.c | |
| parent | 586eca0e4cd9481cabdd1cedef53145a0d07bc72 (diff) | |
| parent | 173b3385675b24fb7a55f2d212e2958970f6e6d3 (diff) | |
Merge pull request #1194 from snoack/version
Add -DVERSION flag for release version numbers
Diffstat (limited to 'sway/main.c')
| -rw-r--r-- | sway/main.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/sway/main.c b/sway/main.c index 39bf225e..b9549b12 100644 --- a/sway/main.c +++ b/sway/main.c @@ -267,11 +267,7 @@ int main(int argc, char **argv) { debug = 1; break; case 'v': // 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 + fprintf(stdout, "sway version " SWAY_VERSION "\n"); exit(EXIT_SUCCESS); break; case 'V': // verbose @@ -378,9 +374,7 @@ int main(int argc, char **argv) { // prevent ipc from crashing sway signal(SIGPIPE, SIG_IGN); -#if defined SWAY_GIT_VERSION && defined SWAY_GIT_BRANCH && defined SWAY_VERSION_DATE - sway_log(L_INFO, "Starting sway version %s (%s, branch \"%s\")\n", SWAY_GIT_VERSION, SWAY_VERSION_DATE, SWAY_GIT_BRANCH); -#endif + sway_log(L_INFO, "Starting sway version " SWAY_VERSION "\n"); init_layout(); |