Maarrk/tio
1
0
Fork 0
mirror of https://github.com/tio/tio.git synced 2026-05-01 14:57:59 +02:00
Code Issues Projects Releases 1 Packages Wiki Activity Actions

Rename git version to simply version

Browse source
This commit is contained in:
Martin Lund 2024-11-30 11:37:12 +01:00
parent c49faa7337
commit b8135ea639
6 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/git-version.h.in
View file

@ -1,3 +0,0 @@
#pragma once
#define GIT_VERSION "@GIT_VERSION@"

4
src/main.c
View file

@ -22,7 +22,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include "git-version.h" #include "version.h"
#include "config.h" #include "config.h"
#include "options.h" #include "options.h"
#include "configfile.h" #include "configfile.h"
@ -102,7 +102,7 @@ int main(int argc, char *argv[])
error_enter_session_mode(); error_enter_session_mode();
/* Print launch hints */ /* Print launch hints */
tio_printf("tio %s", GIT_VERSION); tio_printf("tio %s", VERSION);
if (interactive_mode) if (interactive_mode)
{ {
tio_printf("Press ctrl-%c q to quit", option.prefix_key); tio_printf("Press ctrl-%c q to quit", option.prefix_key);

12
src/meson.build
View file

@ -1,8 +1,8 @@
# Generate git version header # Generate version header
git_version_h = vcs_tag(command : ['git', 'describe', '--tags', '--always', '--dirty'], version_h = vcs_tag(command : ['git', 'describe', '--tags', '--always', '--dirty'],
input : 'git-version.h.in', input : 'version.h.in',
output :'git-version.h', output :'version.h',
replace_string:'@GIT_VERSION@') replace_string:'@VERSION@')
config_h = configuration_data() config_h = configuration_data()
config_h.set('BAUDRATE_CASES', baudrate_cases) config_h.set('BAUDRATE_CASES', baudrate_cases)
@ -27,7 +27,7 @@ tio_sources = [
'script.c', 'script.c',
'fs.c', 'fs.c',
'readline.c', 'readline.c',
git_version_h version_h
] ]

4
src/options.c
View file

@ -25,7 +25,7 @@
#include <regex.h> #include <regex.h>
#include <getopt.h> #include <getopt.h>
#include <errno.h> #include <errno.h>
#include "git-version.h" #include "version.h"
#include "config.h" #include "config.h"
#include "misc.h" #include "misc.h"
#include "print.h" #include "print.h"
@ -1088,7 +1088,7 @@ void options_parse(int argc, char *argv[])
break; break;
case 'v': case 'v':
printf("tio %s\n", GIT_VERSION); printf("tio %s\n", VERSION);
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
break; break;

4
src/tty.c
View file

@ -22,7 +22,7 @@
#if defined(__linux__) #if defined(__linux__)
#include <linux/serial.h> #include <linux/serial.h>
#endif #endif
#include "git-version.h" #include "version.h"
#include "config.h" #include "config.h"
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h> #include <stdio.h>
@ -1091,7 +1091,7 @@ void handle_command_sequence(char input_char, char *output_char, bool *forward)
break; break;
case KEY_V: case KEY_V:
tio_printf("tio %s", GIT_VERSION); tio_printf("tio %s", VERSION);
break; break;
case KEY_X: case KEY_X:

3
src/version.h.in Normal file
View file

@ -0,0 +1,3 @@
#pragma once
#define VERSION "@VERSION@"