From fa874bab0a7c61d630c8582360f65a2598874962 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Mon, 12 Sep 2022 13:35:59 +0300 Subject: Rename version file to version.txt --- makefile | 4 ++-- odb/pgsql/makefile | 2 +- version | 1 - version.txt | 1 + 4 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 version create mode 100644 version.txt diff --git a/makefile b/makefile index f597bdd..4031289 100644 --- a/makefile +++ b/makefile @@ -12,12 +12,12 @@ clean := $(out_base)/.clean $(default): $(addprefix $(out_base)/,$(addsuffix /,$(dirs))) $(dist): export dirs := $(dirs) -$(dist): export docs := GPLv2 LICENSE README NEWS version +$(dist): export docs := GPLv2 LICENSE README NEWS version.txt $(dist): data_dist := INSTALL libodb-pgsql-vc8.sln libodb-pgsql-vc9.sln \ libodb-pgsql-vc10.sln libodb-pgsql-vc11.sln libodb-pgsql-vc12.sln $(dist): exec_dist := bootstrap $(dist): export extra_dist := $(data_dist) $(exec_dist) -$(dist): export version = $(shell cat $(src_root)/version) +$(dist): export version = $(shell cat $(src_root)/version.txt) $(dist): $(addprefix $(out_base)/,$(addsuffix /.dist,$(dirs))) $(call dist-data,$(docs) $(data_dist) libodb-pgsql.pc.in) diff --git a/odb/pgsql/makefile b/odb/pgsql/makefile index d53eff6..acd23f6 100644 --- a/odb/pgsql/makefile +++ b/odb/pgsql/makefile @@ -109,7 +109,7 @@ libodb-pgsql-vc10.vcxproj libodb-pgsql-vc10.vcxproj.filters \ libodb-pgsql-vc11.vcxproj libodb-pgsql-vc11.vcxproj.filters \ libodb-pgsql-vc12.vcxproj libodb-pgsql-vc12.vcxproj.filters $(dist): export interface_version = $(shell sed -e \ -'s/^\([0-9]*\.[0-9]*\).*/\1/' $(src_root)/version) +'s/^\([0-9]*\.[0-9]*\).*/\1/' $(src_root)/version.txt) $(dist): $(gen) $(call dist-data,$(sources_dist) $(headers_dist) $(data_dist)) diff --git a/version b/version deleted file mode 100644 index cd2d927..0000000 --- a/version +++ /dev/null @@ -1 +0,0 @@ -2.5.0-b.24 diff --git a/version.txt b/version.txt new file mode 100644 index 0000000..cd2d927 --- /dev/null +++ b/version.txt @@ -0,0 +1 @@ +2.5.0-b.24 -- cgit v1.1