diff --git a/CMakeLists.txt b/CMakeLists.txt index 092c579162c..440b892e811 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -212,7 +212,7 @@ endif() set(PGROUTING_VERSION_MAJOR "2") set(PGROUTING_VERSION_MINOR "4") -set(PGROUTING_VERSION_PATCH "0") +set(PGROUTING_VERSION_PATCH "1") set(PGROUTING_VERSION_DEV "") set(PGROUTING_SHORT_VERSION "${PGROUTING_VERSION_MAJOR}.${PGROUTING_VERSION_MINOR}") diff --git a/COPYING b/LICENSE similarity index 100% rename from COPYING rename to LICENSE diff --git a/NEWS b/NEWS index d8656199cba..dfb67f0deb9 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,11 @@ +Changes for 2.4.1 +------------------------------------------------------------------------------- + +* Bug fixes + * fixed compiling error on macOS + * Condition error on pgr_withPoints + Changes for 2.4.0 ------------------------------------------------------------------------------- diff --git a/VERSION b/VERSION index b058da578f6..5f8a85d6384 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4686-72236aaa7 master +4691-722e04e03 master diff --git a/doc/src/release_notes.rst b/doc/src/release_notes.rst index 6a50b65b6c0..456a2c602c6 100644 --- a/doc/src/release_notes.rst +++ b/doc/src/release_notes.rst @@ -18,6 +18,7 @@ To see the full list of changes check the list of `Git commits build/tmp_sigs.txt -sh tools/release-scripts/get_signatures.sh 2.3.2 ___sig_generate___ sigs > build/tmp_sigs.txt -sh tools/release-scripts/get_signatures.sh 2.3.1 ___sig_generate___ sigs > build/tmp_sigs.txt -sh tools/release-scripts/get_signatures.sh 2.3.0 ___sig_generate___ sigs > build/tmp_sigs.txt -sh tools/release-scripts/get_signatures.sh 2.2.4 ___sig_generate___ sigs > build/tmp_sigs.txt -sh tools/release-scripts/get_signatures.sh 2.2.3 ___sig_generate___ sigs > build/tmp_sigs.txt -sh tools/release-scripts/get_signatures.sh 2.2.2 ___sig_generate___ sigs > build/tmp_sigs.txt -sh tools/release-scripts/get_signatures.sh 2.2.1 ___sig_generate___ sigs > build/tmp_sigs.txt -sh tools/release-scripts/get_signatures.sh 2.2.0 ___sig_generate___ sigs > build/tmp_sigs.txt -sh tools/release-scripts/get_signatures.sh 2.1.0 ___sig_generate___ sigs > build/tmp_sigs.txt +sh tools/release-scripts/get_signatures.sh 2.4.1 ___sig_generate___ curr-sig >> build/tmp_sigs.txt +sh tools/release-scripts/get_signatures.sh 2.4.0 ___sig_generate___ sigs >> build/tmp_sigs.txt +sh tools/release-scripts/get_signatures.sh 2.3.2 ___sig_generate___ sigs >> build/tmp_sigs.txt +sh tools/release-scripts/get_signatures.sh 2.3.1 ___sig_generate___ sigs >> build/tmp_sigs.txt +sh tools/release-scripts/get_signatures.sh 2.3.0 ___sig_generate___ sigs >> build/tmp_sigs.txt +sh tools/release-scripts/get_signatures.sh 2.2.4 ___sig_generate___ sigs >> build/tmp_sigs.txt +sh tools/release-scripts/get_signatures.sh 2.2.3 ___sig_generate___ sigs >> build/tmp_sigs.txt +sh tools/release-scripts/get_signatures.sh 2.2.2 ___sig_generate___ sigs >> build/tmp_sigs.txt +sh tools/release-scripts/get_signatures.sh 2.2.1 ___sig_generate___ sigs >> build/tmp_sigs.txt +sh tools/release-scripts/get_signatures.sh 2.2.0 ___sig_generate___ sigs >> build/tmp_sigs.txt +sh tools/release-scripts/get_signatures.sh 2.1.0 ___sig_generate___ sigs >> build/tmp_sigs.txt #version 2.0.1 can not be upgraded -#sh tools/release-scripts/get_signatures.sh 2.0.1 ___sig_generate___ sigs > build/tmp_sigs.txt -sh tools/release-scripts/get_signatures.sh 2.0.0 ___sig_generate___ sigs > build/tmp_sigs.txt +#sh tools/release-scripts/get_signatures.sh 2.0.1 ___sig_generate___ sigs >> build/tmp_sigs.txt +sh tools/release-scripts/get_signatures.sh 2.0.0 ___sig_generate___ sigs >> build/tmp_sigs.txt echo echo - [x] completed check: OK diff --git a/tools/release-scripts/compile-release.sh b/tools/release-scripts/compile-release.sh index a5d94faf75a..317dc5d7c21 100755 --- a/tools/release-scripts/compile-release.sh +++ b/tools/release-scripts/compile-release.sh @@ -3,6 +3,9 @@ set -e CPPVERSION=$1 +MINOR=$2 +MICRO=$3 +FULL_VER="$MINOR.$MICRO" function test_compile { @@ -14,37 +17,41 @@ echo ------------------------------------ sudo update-alternatives --set gcc /usr/bin/gcc-$1 cd build/ -cmake -DWITH_DOC=ON -DBUILD_DOXY=ON -DCMAKE_BUILD_TYPE=Release .. > tmp_cmake.txt -make > tmp_make.txt 2>tmp_make_err.txt -sudo make install > tmp_make_install.txt -cp lib/pgrouting--2.4.0.sig ../tools/curr-sig/ +touch tmp_make.txt +touch tmp_make_err.txt +cmake -DDOC_USE_BOOTSTRAP=ON -DWITH_DOC=ON -DBUILD_DOXY=ON -DCMAKE_BUILD_TYPE=Release .. >> tmp_make.txt +make >> tmp_make.txt 2>>tmp_make_err.txt + +sudo make install >> tmp_make.txt + +cp lib/pgrouting--$FULL_VER.sig ../tools/curr-sig/ cd .. echo " - [x] Compilation OK" -tools/testers/algorithm-tester.pl > build/tmp_tests.txt +tools/testers/algorithm-tester.pl >> build/tmp_make.txt echo " - [x] Documentation tests OK" dropdb --if-exists ___pgr___test___ createdb ___pgr___test___ -sh ./tools/testers/pg_prove_tests.sh vicky > build/tmp_pgtap.txt +sh ./tools/testers/pg_prove_tests.sh vicky >> build/tmp_make.txt dropdb ___pgr___test___ echo ' - [x] Pgtap tests OK' if [[ "$1" == "4.8" ]]; then cd build - make doc + make doc >> tmp_make.txt echo " - [x] Build Users documentation OK" - make doxy + make doxy >> tmp_make.txty echo " - [x] Build developers documentation OK" cd .. fi } -sudo rm -f /usr/lib/postgresql/9.3/lib/libpgrouting-2.4.so -sudo rm -f /usr/share/postgresql/9.3/extension/pgrouting*2.4.0* +sudo rm -f /usr/lib/postgresql/9.3/lib/libpgrouting-$MINOR.so +sudo rm -f /usr/share/postgresql/9.3/extension/pgrouting*$FULL_VER* rm -rf build/* test_compile $CPPVERSION diff --git a/tools/curr-sig/pgrouting--2.4.0.sig b/tools/sigs/pgrouting--2.4.0.sig similarity index 100% rename from tools/curr-sig/pgrouting--2.4.0.sig rename to tools/sigs/pgrouting--2.4.0.sig diff --git a/tools/testers/update-tester.sh b/tools/testers/update-tester.sh index f42d7a2160b..3fab3574c0b 100755 --- a/tools/testers/update-tester.sh +++ b/tools/testers/update-tester.sh @@ -39,7 +39,7 @@ echo - # bash tools/testers/update-tester.sh # -CURRENT=2.4.0 +CURRENT=2.4.1 function update_test { set -e @@ -75,6 +75,12 @@ dropdb ___test_update ### updates from 2.3.0 #------------------------------------ +update_test 2.4.0 $CURRENT + +#------------------------------------ +### updates from 2.3.0 +#------------------------------------ + update_test 2.3.2 $CURRENT update_test 2.3.1 $CURRENT update_test 2.3.0 $CURRENT