From d259f01d625c22cccf7704fc34f02d72487ddd87 Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Fri, 5 Aug 2022 15:24:29 +0200 Subject: [PATCH] adapt to 4.1.0 release --- docs/mkdocs.yml | 2 +- vagrant/Install-on-Ubuntu-18.sh | 15 ++++----------- vagrant/Install-on-Ubuntu-20.sh | 8 ++++---- vagrant/Install-on-Ubuntu-22.sh | 8 ++++---- 4 files changed, 13 insertions(+), 20 deletions(-) diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml index e89c32d5..475a06f9 100644 --- a/docs/mkdocs.yml +++ b/docs/mkdocs.yml @@ -1,4 +1,4 @@ -site_name: Nominatim Documentation +site_name: Nominatim 4.1.0 theme: readthedocs docs_dir: ${CMAKE_CURRENT_BINARY_DIR} site_url: https://nominatim.org diff --git a/vagrant/Install-on-Ubuntu-18.sh b/vagrant/Install-on-Ubuntu-18.sh index e36086e1..0d655695 100755 --- a/vagrant/Install-on-Ubuntu-18.sh +++ b/vagrant/Install-on-Ubuntu-18.sh @@ -28,7 +28,7 @@ export DEBIAN_FRONTEND=noninteractive #DOCS: postgresql-10-postgis-2.4 \ postgresql-contrib-10 postgresql-10-postgis-scripts \ php-cli php-pgsql php-intl libicu-dev python3-pip \ - python3-psutil python3-jinja2 python3-yaml python3-icu git + python3-psutil python3-jinja2 python3-yaml python3-icu # Some of the Python packages that come with Ubuntu 18.04 are too old, so # install the latest version from pip: @@ -105,25 +105,18 @@ fi #DOCS: # if [ "x$1" == "xyes" ]; then #DOCS: :::sh cd $USERHOME - git clone --recursive https://github.com/openstreetmap/Nominatim.git - cd Nominatim + wget https://nominatim.org/release/Nominatim-4.1.0.tar.bz2 + tar xf Nominatim-4.1.0.tar.bz2 else #DOCS: cd $USERHOME/Nominatim #DOCS: fi #DOCS: -# When installing the latest source from github, you also need to -# download the country grid: - -if [ ! -f data/country_osm_grid.sql.gz ]; then #DOCS: :::sh - wget -O data/country_osm_grid.sql.gz https://www.nominatim.org/data/country_grid.sql.gz -fi #DOCS: - # The code must be built in a separate directory. Create this directory, # then configure and build Nominatim in there: mkdir $USERHOME/build cd $USERHOME/build - cmake $USERHOME/Nominatim + cmake $USERHOME/Nominatim-4.1.0 make sudo make install diff --git a/vagrant/Install-on-Ubuntu-20.sh b/vagrant/Install-on-Ubuntu-20.sh index d364cccd..b3c8d06c 100755 --- a/vagrant/Install-on-Ubuntu-20.sh +++ b/vagrant/Install-on-Ubuntu-20.sh @@ -28,7 +28,7 @@ export DEBIAN_FRONTEND=noninteractive #DOCS: postgresql-contrib-12 postgresql-12-postgis-3-scripts \ php-cli php-pgsql php-intl libicu-dev python3-dotenv \ python3-psycopg2 python3-psutil python3-jinja2 \ - python3-icu python3-datrie python3-yaml git + python3-icu python3-datrie python3-yaml # # System Configuration @@ -99,8 +99,8 @@ fi #DOCS: # if [ "x$1" == "xyes" ]; then #DOCS: :::sh cd $USERHOME - git clone --recursive https://github.com/openstreetmap/Nominatim.git - cd Nominatim + https://nominatim.org/release/Nominatim-4.1.0.tar.bz2 + tar xf Nominatim-4.1.0.tar.bz2 else #DOCS: cd $USERHOME/Nominatim #DOCS: fi #DOCS: @@ -117,7 +117,7 @@ fi #DOCS: mkdir $USERHOME/build cd $USERHOME/build - cmake $USERHOME/Nominatim + cmake $USERHOME/Nominatim-4.1.0 make sudo make install diff --git a/vagrant/Install-on-Ubuntu-22.sh b/vagrant/Install-on-Ubuntu-22.sh index 419a7313..f10185fd 100755 --- a/vagrant/Install-on-Ubuntu-22.sh +++ b/vagrant/Install-on-Ubuntu-22.sh @@ -28,7 +28,7 @@ export DEBIAN_FRONTEND=noninteractive #DOCS: postgresql-contrib-14 postgresql-14-postgis-3-scripts \ php-cli php-pgsql php-intl libicu-dev python3-dotenv \ python3-psycopg2 python3-psutil python3-jinja2 \ - python3-icu python3-datrie git + python3-icu python3-datrie # # System Configuration @@ -99,8 +99,8 @@ fi #DOCS: # if [ "x$1" == "xyes" ]; then #DOCS: :::sh cd $USERHOME - git clone --recursive https://github.com/openstreetmap/Nominatim.git - cd Nominatim + https://nominatim.org/release/Nominatim-4.1.0.tar.bz2 + tar xf Nominatim-4.1.0.tar.bz2 else #DOCS: cd $USERHOME/Nominatim #DOCS: fi #DOCS: @@ -117,7 +117,7 @@ fi #DOCS: mkdir $USERHOME/build cd $USERHOME/build - cmake $USERHOME/Nominatim + cmake $USERHOME/Nominatim-4.1.0 make sudo make install