From a5c8c78e8671af863fc61b2ad8b24f92f827f7b2 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Thu, 15 Dec 2011 10:21:13 +0100 Subject: [PATCH 1/1] mk_version.tcl: read version from IDMETA --- util/mk_version.tcl | 4 ++-- win/makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/util/mk_version.tcl b/util/mk_version.tcl index 4bee1a4..9aee3c0 100644 --- a/util/mk_version.tcl +++ b/util/mk_version.tcl @@ -1,7 +1,7 @@ #!/usr/bin/tclsh proc usage {} { - puts {mk_version.tcl [-v] configure.ac infile ..} + puts {mk_version.tcl [-v] IDMETA infile ..} exit 1 } @@ -35,7 +35,7 @@ while {1} { if {$cnt < 0} { break } - regexp {AC_INIT\([^,]+,\[([0-9.]+)\]} $line s version + regexp {VERSION=([0-9.]+)} $line s version } close $f diff --git a/win/makefile b/win/makefile index f81549b..84906e6 100644 --- a/win/makefile +++ b/win/makefile @@ -344,9 +344,9 @@ LINK_PROGRAM= $(LINK) \ # Generated sources generate: $(INCLDIR)\idzebra\version.h -$(INCLDIR)\idzebra\version.h: +$(INCLDIR)\idzebra\version.h: $(ROOTDIR)/IDMETA @cd $(ROOTDIR)\util - $(TCL) mk_version.tcl $(ROOTDIR)/configure.ac $(INCLDIR)\idzebra\version.h + $(TCL) mk_version.tcl $(ROOTDIR)/IDMETA $(INCLDIR)\idzebra\version.h # Source and object modules # Note: Ordinary source files are not specified here at -- 1.7.10.4