Skip to content

Commit f8964bb

Browse files
cvvergaracvvergara
committed
[version] adding code for issue #716 
1 parent 86b3529 commit f8964bb

11 files changed

Lines changed: 364 additions & 4 deletions

File tree

‎CMakeLists.txt‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ endif()
2727

2828
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
2929
include(pgr/BuildType)
30+
add_definitions(-DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}")
3031

3132

3233
#---------------------------------------------
@@ -38,8 +39,14 @@ project(PGROUTING VERSION 3.0.0
3839
set(PGROUTING_VERSION_DEV "-dev")
3940

4041
include(pgr/GitInfo)
42+
add_definitions(-DPGROUTING_HASH="${PGROUTING_GIT_HASH}")
43+
4144
include(pgr/Version)
45+
add_definitions(-DPGROUTING_VERSION="${PGROUTING_VERSION}${PGROUTING_VERSION_DEV}")
46+
add_definitions(-DPGROUTING_LIB_NAME="pgrouting-${PGROUTING_LIB_VERSION}")
4247

48+
string(TIMESTAMP COMPILATION_DATE "%Y/%m/%d")
49+
add_definitions(-DCOMPILATION_DATE="${COMPILATION_DATE}")
4350

4451

4552

@@ -114,6 +121,7 @@ elseif(COMPILER_SUPPORTS_CXX0X)
114121
else()
115122
message(STATUS "The compiler ${CMAKE_CXX_COMPILER} has no C++0x or C++11 flags support.")
116123
endif()
124+
add_definitions(-DCOMPILER_VERSION="${CMAKE_CXX_COMPILER_ID}-${CMAKE_CXX_COMPILER_VERSION}")
117125

118126

119127

@@ -205,9 +213,8 @@ if(WIN32)
205213
endif(MSVC)
206214
endif(WIN32)
207215

208-
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DPGSQL_VERSION=${PGSQL_VERSION}")
209-
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DPGSQL_VERSION=${PGSQL_VERSION}")
210-
set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DPGSQL_VERSION=${PGSQL_VERSION}")
216+
add_definitions(-DPGSQL_VERSION=${PGSQL_VERSION})
217+
add_definitions(-DPOSTGRES_VERSION="${POSTGRESQL_VERSION_STRING}")
211218
message(STATUS "PGSQL_VERSION=${PGSQL_VERSION}")
212219

213220

@@ -223,6 +230,7 @@ if(Boost_FOUND)
223230
else()
224231
message(FATAL_ERROR " Please check your Boost installation ")
225232
endif()
233+
add_definitions(-DBOOST_VERSION="${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}")
226234

227235

228236
# Boost for Chinese postman needs 1.55 at least

‎configuration.conf‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ dagShortestPath | Y | Y | Y
3636
chinese | Y | Y | Y
3737
spanningTree | Y | Y | Y
3838
mincut | Y | Y | Y
39+
version | Y | Y | N
3940
#----------------------
4041
# SQL only directories
4142
#----------------------

‎sql/common/CMakeLists.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11

22
SET(LOCAL_FILES
33
pgRouting-header.sql
4-
pgrouting_version.sql
54
_point_toId.sql
65
_startPoint.sql
76
_endPoint.sql

‎sql/sigs/pgrouting--3.0.0.sig‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,16 +50,20 @@ pgr_bellmanford(text,text,bigint,anyarray,boolean)
5050
pgr_bellmanford(text,text,bigint,bigint,boolean)
5151
_pgr_biconnectedcomponents(text)
5252
pgr_biconnectedcomponents(text)
53+
_pgr_boost_version()
5354
pgr_boykovkolmogorov(text,anyarray,anyarray)
5455
pgr_boykovkolmogorov(text,anyarray,bigint)
5556
pgr_boykovkolmogorov(text,bigint,anyarray)
5657
pgr_boykovkolmogorov(text,bigint,bigint)
5758
_pgr_bridges(text)
5859
pgr_bridges(text)
60+
_pgr_build_type()
5961
_pgr_checkverttab(text,text[],integer,text)
6062
pgr_chinesepostmancost(text)
6163
pgr_chinesepostman(text)
6264
_pgr_chinesepostman(text,boolean)
65+
_pgr_compilation_date()
66+
_pgr_compiler_version()
6367
_pgr_connectedcomponents(text)
6468
pgr_connectedcomponents(text)
6569
_pgr_contraction(text,bigint[],integer,bigint[],boolean)
@@ -104,12 +108,14 @@ _pgr_endpoint(geometry)
104108
pgr_extractvertices(text,boolean)
105109
_pgr_floydwarshall(text,boolean)
106110
pgr_floydwarshall(text,boolean)
111+
pgr_full_version()
107112
_pgr_getcolumnname(text,text,integer,text)
108113
_pgr_getcolumnname(text,text,text,integer,text)
109114
_pgr_getcolumntype(text,text,integer,text)
110115
_pgr_getcolumntype(text,text,text,integer,text)
111116
_pgr_get_statement(text)
112117
_pgr_gettablename(text,integer,text)
118+
_pgr_git_hash()
113119
_pgr_iscolumnindexed(text,text,integer,text)
114120
_pgr_iscolumnindexed(text,text,text,integer,text)
115121
_pgr_iscolumnintable(text,text)
@@ -127,6 +133,7 @@ pgr_kruskal(text)
127133
_pgr_kruskal(text,anyarray,text,bigint,double precision)
128134
_pgr_ksp(text,bigint,bigint,integer,boolean,boolean)
129135
pgr_ksp(text,bigint,bigint,integer,boolean,boolean)
136+
_pgr_lib_version()
130137
_pgr_linegraphfull(text)
131138
pgr_linegraphfull(text)
132139
_pgr_linegraph(text,boolean)
@@ -151,6 +158,7 @@ _pgr_msg(integer,text,text)
151158
pgr_nodenetwork(text,double precision,text,text,text,text,boolean)
152159
_pgr_onerror(boolean,integer,text,text,text,text)
153160
_pgr_parameter_check(text,text,boolean)
161+
_pgr_pgsql_version()
154162
_pgr_pickdelivereuclidean(text,text,double precision,integer,integer)
155163
pgr_pickdelivereuclidean(text,text,double precision,integer,integer)
156164
_pgr_pickdeliver(text,text,text,double precision,integer,integer)

‎sql/version/CMakeLists.txt‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
2+
SET(LOCAL_FILES
3+
_version.sql
4+
version.sql
5+
full_version.sql
6+
)
7+
8+
foreach (f ${LOCAL_FILES})
9+
configure_file(${f} ${f})
10+
list(APPEND PACKAGE_SQL_FILES ${CMAKE_CURRENT_BINARY_DIR}/${f})
11+
endforeach()
12+
13+
set(PGROUTING_SQL_FILES ${PGROUTING_SQL_FILES} ${PACKAGE_SQL_FILES} PARENT_SCOPE)

‎sql/version/_version.sql‎

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
/*PGR-GNU*****************************************************************
2+
3+
Copyright (c) 2019 pgRouting developers
4+
Mail: project@pgrouting.org
5+
6+
Developer:
7+
Copyright (c) 2019 Celia Virginia Vergara Castillo
8+
9+
------
10+
11+
This program is free software; you can redistribute it and/or modify
12+
it under the terms of the GNU General Public License as published by
13+
the Free Software Foundation; either version 2 of the License, or
14+
(at your option) any later version.
15+
16+
This program is distributed in the hope that it will be useful,
17+
but WITHOUT ANY WARRANTY; without even the implied warranty of
18+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19+
GNU General Public License for more details.
20+
21+
You should have received a copy of the GNU General Public License
22+
along with this program; if not, write to the Free Software
23+
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
24+
25+
********************************************************************PGR-GNU*/
26+
27+
CREATE OR REPLACE FUNCTION _pgr_boost_version()
28+
RETURNS TEXT AS
29+
'MODULE_PATHNAME'
30+
LANGUAGE C VOLATILE STRICT;
31+
32+
COMMENT ON FUNCTION _pgr_boost_version() IS
33+
'pgRouting internal function';
34+
35+
---
36+
37+
CREATE OR REPLACE FUNCTION _pgr_build_type()
38+
RETURNS TEXT AS
39+
'MODULE_PATHNAME'
40+
LANGUAGE C VOLATILE STRICT;
41+
42+
COMMENT ON FUNCTION _pgr_build_type() IS
43+
'pgRouting internal function';
44+
45+
---
46+
47+
CREATE OR REPLACE FUNCTION _pgr_compilation_date()
48+
RETURNS TEXT AS
49+
'MODULE_PATHNAME'
50+
LANGUAGE C VOLATILE STRICT;
51+
52+
COMMENT ON FUNCTION _pgr_compilation_date() IS
53+
'pgRouting internal function';
54+
55+
---
56+
57+
CREATE OR REPLACE FUNCTION _pgr_compiler_version()
58+
RETURNS TEXT AS
59+
'MODULE_PATHNAME'
60+
LANGUAGE C VOLATILE STRICT;
61+
62+
COMMENT ON FUNCTION _pgr_compiler_version() IS
63+
'pgRouting internal function';
64+
65+
---
66+
67+
CREATE OR REPLACE FUNCTION _pgr_git_hash()
68+
RETURNS TEXT AS
69+
'MODULE_PATHNAME'
70+
LANGUAGE C VOLATILE STRICT;
71+
72+
COMMENT ON FUNCTION _pgr_compilation_date() IS
73+
'pgRouting internal function';
74+
75+
---
76+
77+
CREATE OR REPLACE FUNCTION _pgr_lib_version()
78+
RETURNS TEXT AS
79+
'MODULE_PATHNAME'
80+
LANGUAGE C VOLATILE STRICT;
81+
82+
COMMENT ON FUNCTION _pgr_lib_version() IS
83+
'pgRouting internal function';
84+
85+
---
86+
87+
CREATE OR REPLACE FUNCTION _pgr_pgsql_version()
88+
RETURNS TEXT AS
89+
'MODULE_PATHNAME'
90+
LANGUAGE C VOLATILE STRICT;
91+
92+
COMMENT ON FUNCTION _pgr_pgsql_version() IS
93+
'pgRouting internal function';
94+

‎sql/version/full_version.sql‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
/*PGR-GNU*****************************************************************
2+
3+
Copyright (c) 2019 pgRouting developers
4+
Mail: project@pgrouting.org
5+
6+
Developer:
7+
Copyright (c) 2019 Celia Virginia Vergara Castillo
8+
9+
------
10+
11+
This program is free software; you can redistribute it and/or modify
12+
it under the terms of the GNU General Public License as published by
13+
the Free Software Foundation; either version 2 of the License, or
14+
(at your option) any later version.
15+
16+
This program is distributed in the hope that it will be useful,
17+
but WITHOUT ANY WARRANTY; without even the implied warranty of
18+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19+
GNU General Public License for more details.
20+
21+
You should have received a copy of the GNU General Public License
22+
along with this program; if not, write to the Free Software
23+
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
24+
25+
********************************************************************PGR-GNU*/
26+
27+
28+
29+
CREATE OR REPLACE FUNCTION pgr_full_version(
30+
OUT version TEXT,
31+
OUT build_type TEXT,
32+
OUT library TEXT,
33+
OUT PostgreSQL TEXT,
34+
OUT compiler TEXT,
35+
OUT boost TEXT,
36+
OUT hash TEXT
37+
)
38+
RETURNS Record AS
39+
$BODY$
40+
SELECT pgr_version(),
41+
_pgr_build_type(),
42+
_pgr_lib_version(),
43+
_pgr_pgsql_version(),
44+
_pgr_compiler_version(),
45+
_pgr_boost_version(),
46+
_pgr_git_hash()
47+
$BODY$
48+
LANGUAGE sql IMMUTABLE;
49+
50+
COMMENT ON FUNCTION pgr_full_version() IS
51+
'pgr_full_version
52+
- Documentation
53+
- ${PGROUTING_DOC_LINK}/pgr_full_version.html
54+
';

‎sql/version/version.sql‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
/*PGR-GNU*****************************************************************
2+
3+
Copyright (c) 2019 pgRouting developers
4+
Mail: project@pgrouting.org
5+
6+
Developer:
7+
Copyright (c) 2019 Celia Virginia Vergara Castillo
8+
9+
------
10+
11+
This program is free software; you can redistribute it and/or modify
12+
it under the terms of the GNU General Public License as published by
13+
the Free Software Foundation; either version 2 of the License, or
14+
(at your option) any later version.
15+
16+
This program is distributed in the hope that it will be useful,
17+
but WITHOUT ANY WARRANTY; without even the implied warranty of
18+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19+
GNU General Public License for more details.
20+
21+
You should have received a copy of the GNU General Public License
22+
along with this program; if not, write to the Free Software
23+
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
24+
25+
********************************************************************PGR-GNU*/
26+
27+
CREATE OR REPLACE FUNCTION pgr_version()
28+
RETURNS TEXT AS
29+
'MODULE_PATHNAME'
30+
LANGUAGE C VOLATILE STRICT;
31+
32+
COMMENT ON FUNCTION pgr_version() IS
33+
'pgr_version
34+
- Documentation
35+
- ${PGROUTING_DOC_LINK}/pgr_version.html
36+
';

‎src/version/CMakeLists.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
ADD_LIBRARY(version OBJECT
2+
version.c
3+
_version.c
4+
)

0 commit comments

Comments
 (0)