tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Renamed src/VERSION to src/RECOLL-VERSION.txt to avoid conflict with c++ <version>

Browse Source
This commit is contained in:
Jean-Francois Dockes 2021-10-07 17:12:08 +02:00
parent b5013b41e1
commit dc0e3ef04a
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
src/VERSION → src/RECOLL-VERSION.txt
View File

2
src/configure.ac
View File

@ -1,4 +1,4 @@
AC_INIT([Recoll], m4_esyscmd_s(cat VERSION)) AC_INIT([Recoll], m4_esyscmd_s(cat RECOLL-VERSION.txt))
AC_CONFIG_HEADERS([common/autoconfig.h]) AC_CONFIG_HEADERS([common/autoconfig.h])
AH_BOTTOM([#include "conf_post.h"]) AH_BOTTOM([#include "conf_post.h"])
AC_PREREQ(2.53) AC_PREREQ(2.53)

2
src/python/recoll/setup-win.py
View File

@ -15,7 +15,7 @@ pytop = srcdir
localtop = top localtop = top
extra_compile_args = '' extra_compile_args = ''
VERSION = open(os.path.join(top, "VERSION")).read().strip() VERSION = open(os.path.join(top, "RECOLL-VERSION.txt")).read().strip()
include_dirs = [ include_dirs = [
os.path.join(top, 'common'), os.path.join(top, 'common'),

7
src/python/recoll/setup.py.in
View File

@ -20,14 +20,15 @@ else:
extra_compile_args = ['-std=c++11'] extra_compile_args = ['-std=c++11']
VERSION = open(os.path.join(top, "RECOLL-VERSION.txt")).read().strip()
if 'libdir' in os.environ and os.environ['libdir'] != "": if 'libdir' in os.environ and os.environ['libdir'] != "":
runtime_library_dirs = [os.path.join(os.environ['libdir'], 'recoll')] runtime_library_dirs = [os.path.join(os.environ['libdir'], 'recoll')]
else: else:
runtime_library_dirs = [os.path.join('@prefix@', 'lib', 'recoll')] runtime_library_dirs = [os.path.join('@prefix@', 'lib', 'recoll')]
module1 = Extension('_recoll', module1 = Extension('_recoll',
define_macros = [('MAJOR_VERSION', '1'), define_macros = [
('MINOR_VERSION', '0'),
('RECOLL_DATADIR', '"@RECOLL_DATADIR@"') ('RECOLL_DATADIR', '"@RECOLL_DATADIR@"')
], ],
include_dirs = ['/usr/local/include', include_dirs = ['/usr/local/include',
@ -50,7 +51,7 @@ module1 = Extension('_recoll',
]) ])
setup (name = 'Recoll', setup (name = 'Recoll',
version = '1.0', version = VERSION,
description = 'Query/Augment a Recoll full text index', description = 'Query/Augment a Recoll full text index',
author = 'J.F. Dockes', author = 'J.F. Dockes',
author_email = 'jfd@recoll.org', author_email = 'jfd@recoll.org',

4
src/windows/mkinstdir.sh
View File

@ -338,11 +338,11 @@ copypyrecoll()
# First check that the config is ok # First check that the config is ok
diff -q $RCL/common/autoconfig.h $RCL/common/autoconfig-win.h || \ diff -q $RCL/common/autoconfig.h $RCL/common/autoconfig-win.h || \
fatal autoconfig.h and autoconfig-win.h differ fatal autoconfig.h and autoconfig-win.h differ
VERSION=`cat $RCL/VERSION` VERSION=`cat $RCL/RECOLL-VERSION.txt`
CFVERS=`grep PACKAGE_VERSION $RCL/common/autoconfig.h | \ CFVERS=`grep PACKAGE_VERSION $RCL/common/autoconfig.h | \
cut -d ' ' -f 3 | sed -e 's/"//g'` cut -d ' ' -f 3 | sed -e 's/"//g'`
test "$VERSION" = "$CFVERS" || test "$VERSION" = "$CFVERS" ||
fatal Versions in VERSION and autoconfig.h differ fatal Versions in RECOLL-VERSION.txt and autoconfig.h differ
echo Packaging version $CFVERS echo Packaging version $CFVERS