Skip to content

Commit 92855b8

Browse files
cvvergaracvvergara
committed
[build] Improved update script generator 3.0 fns
Update of the script generator * modified: sql/scripts/build-extension-update-files1.pl * modified: sql/sigs/CMakeLists.txt * renamed: sql/sigs/pgrouting--2.6.0.sig -> sql/sigs/pgrouting--2.6.sig * renamed: sql/sigs/pgrouting--3.0.0.sig -> sql/sigs/pgrouting--3.0.sig Updating the actions * modified: .github/workflows/check-files.yml * new file: tools/scripts/test_signatures.sh * modified: tools/release-scripts/get_signatures.sh Control on the updates * modified: CMakeLists.txt * modified: sql/CMakeLists.txt SQL files with marker for version of the signature of when it was created * modified: sql/*/*sql No longer needed files * deleted: sql/sigs/pgrouting--2.6.1.sig * deleted: sql/sigs/pgrouting--2.6.2.sig * deleted: sql/sigs/pgrouting--2.6.3.sig * deleted: sql/sigs/pgrouting--3.0.1.sig * deleted: sql/sigs/pgrouting--3.0.2.sig * deleted: sql/sigs/pgrouting--3.0.3.sig
1 parent 3f55c76 commit 92855b8

152 files changed

Lines changed: 1034 additions & 2109 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/check-files.yml‎

Lines changed: 8 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,40 +2,23 @@ name: Check files
22

33
on:
44
push:
5-
branches-ignore:
6-
- 'translations_*'
7-
tags: []
85
pull_request:
9-
paths-ignore:
10-
- '**.po'
116

127
jobs:
138
signature_check:
14-
runs-on: ${{ matrix.os }}
15-
16-
strategy:
17-
fail-fast: false
18-
matrix:
19-
releases: ["(2.6.0 2.6.1 2.6.2 2.6.3)","(3.0.0 3.0.1 3.0.2 3.0.3)","(3.1.0 3.1.1)"]
20-
os: [ubuntu-latest]
21-
9+
runs-on: ubuntu-latest
2210
steps:
2311
- name: Checkout repository
2412
uses: actions/checkout@v2
25-
26-
- name: Signature files do not change within same minor
13+
- name: Signatures are not removed
2714
run: |
28-
tempvar=$(echo "${{ matrix.releases }}")
29-
RELEASE=(${tempvar//[\(\)]/})
30-
for value in "${RELEASE[@]}"; do
31-
if [ "$value" == "${RELEASE[0]}" ]; then continue; fi
32-
if [ $(diff "sql/sigs/pgrouting--${value}.sig" "sql/sigs/pgrouting--${RELEASE[0]}.sig" | wc -l) != "4" ] ;
33-
then
34-
echo "sql/sigs/pgrouting--${value}.sig sql/sigs/pgrouting--${RELEASE[0]}.sig are different";
35-
exit 1;
36-
fi
37-
done
15+
tools/scripts/test_signatures.sh
3816
17+
News_check:
18+
runs-on: ubuntu-latest
19+
steps:
20+
- name: Checkout
21+
uses: actions/checkout@v2
3922
- name: News file up to date
4023
run: |
4124
tools/release-scripts/notes2news.pl

‎CMakeLists.txt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,12 @@ set(PGROUTING_LIB_NAME "pgrouting-${PGROUTING_LIB_VERSION}")
4545

4646
string(TIMESTAMP COMPILATION_DATE "%Y/%m/%d")
4747

48+
set(MINORS 3.0 2.6)
49+
set(OLD_SIGNATURES
50+
3.0.2 3.0.1 3.0.0
51+
2.6.3 2.6.2 2.6.1 2.6.0
52+
)
53+
4854

4955

5056
#=============================================

‎sql/CMakeLists.txt‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ add_custom_target(PGROUTING_SQL_FILE ALL
7373
#-------------------
7474
# TARGET: update_files
7575
#-------------------
76-
7776
if (PGROUTING_DEBUG)
7877
message(STATUS "OLD_SIGNATURES=")
7978
foreach (s ${OLD_SIGNATURES})
@@ -82,16 +81,18 @@ if (PGROUTING_DEBUG)
8281
endif()
8382

8483
foreach (old_s ${OLD_SIGNATURES})
84+
string(REGEX REPLACE "^([0-9]+\\.[0-9]+).*" "\\1" minor_s ${old_s})
8585
SET (UPDATE_FILES ${UPDATE_FILES} pgrouting--${old_s}--${PGROUTING_VERSION}.sql)
8686
SET (PGROUTING_SQL_FILES_TO_INSTALL ${PGROUTING_SQL_FILES_TO_INSTALL} "${CMAKE_CURRENT_BINARY_DIR}/pgrouting--${old_s}--${PGROUTING_VERSION}.sql")
8787
add_custom_command(
8888
OUTPUT pgrouting--${old_s}--${PGROUTING_VERSION}.sql
89-
COMMAND ${PERL_EXECUTABLE} ./scripts/build-extension-update-files1.pl ${old_s} ${PGROUTING_DEBUG}
89+
90+
COMMAND ${PERL_EXECUTABLE} ./scripts/build-extension-update-files1.pl "${PGROUTING_VERSION}" "${old_s}" "${CMAKE_CURRENT_BINARY_DIR}/sigs" "${CMAKE_CURRENT_BINARY_DIR}" "${PGROUTING_DEBUG}"
9091
DEPENDS
9192
./scripts/build-extension-update-files1.pl
9293
${PGROUTING_CURRENT_SQL_FILE}
9394
PGROUTING_SQL_FILE
94-
./sigs/pgrouting--${old_s}.sig
95+
./sigs/pgrouting--${minor_s}.sig
9596
)
9697
endforeach()
9798

‎sql/allpairs/_floydWarshall.sql‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
3232
-- pgr_floydWarshall
3333
---------------------
3434

35-
CREATE OR REPLACE FUNCTION _pgr_floydWarshall(
35+
--v3.0
36+
CREATE FUNCTION _pgr_floydWarshall(
3637
edges_sql TEXT,
3738
directed BOOLEAN,
3839

‎sql/allpairs/_johnson.sql‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
3232
-- pgr_johnson
3333
------------------
3434

35-
CREATE OR REPLACE FUNCTION _pgr_johnson(
35+
--v3.0
36+
CREATE FUNCTION _pgr_johnson(
3637
edges_sql TEXT,
3738
directed BOOLEAN,
3839

‎sql/allpairs/floydWarshall.sql‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
2828
2929
********************************************************************PGR-GNU*/
3030

31-
CREATE OR REPLACE FUNCTION pgr_floydWarshall(
31+
--v2.6
32+
CREATE FUNCTION pgr_floydWarshall(
3233
TEXT, -- edges_sql (required)
3334
directed BOOLEAN DEFAULT true,
3435

‎sql/allpairs/johnson.sql‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
2828
2929
********************************************************************PGR-GNU*/
3030

31-
CREATE OR REPLACE FUNCTION pgr_johnson(
31+
--v2.6
32+
CREATE FUNCTION pgr_johnson(
3233
TEXT, -- edges_sql (required)
3334
directed BOOLEAN DEFAULT true,
3435

‎sql/alpha_shape/_alphaShape.sql‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
2626
--------------
2727
--------------
2828

29-
CREATE OR REPLACE FUNCTION _pgr_alphaShape(
29+
--v3.0
30+
CREATE FUNCTION _pgr_alphaShape(
3031
TEXT, -- edges sql
3132
alpha FLOAT DEFAULT 0,
3233

‎sql/alpha_shape/alphaShape.sql‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
2727
--------------
2828

2929

30-
CREATE OR REPLACE FUNCTION pgr_alphaShape(
30+
--v3.0
31+
CREATE FUNCTION pgr_alphaShape(
3132
geometry, -- geometry
3233
alpha FLOAT DEFAULT 0
3334
)

‎sql/astar/_astar.sql‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
3939
-----------------
4040

4141

42-
CREATE OR REPLACE FUNCTION _pgr_astar(
42+
--v2.6
43+
CREATE FUNCTION _pgr_astar(
4344
edges_sql TEXT, -- XY edges sql
4445
start_vids ANYARRAY,
4546
end_vids ANYARRAY,

0 commit comments

Comments
 (0)