adapt README and vagrant scripts to cmake

This commit is contained in:
Sarah Hoffmann 2016-02-29 22:26:22 +01:00
parent 314a9e52e9
commit 6450126933
3 changed files with 13 additions and 14 deletions

8
README
View File

@ -29,13 +29,11 @@ is cloned as well by running `git submodule update --init`.
Installation steps: Installation steps:
0. If checking out from git run:
./autogen.sh
1. Compile Nominatim: 1. Compile Nominatim:
./configure mkdir build
cd build
cmake ..
make make
2. Get OSM data and import: 2. Get OSM data and import:

View File

@ -15,7 +15,7 @@ yum update -y
yum install -y epel-release yum install -y epel-release
yum install -y postgresql-server postgresql-contrib postgresql-devel postgis postgis-utils \ yum install -y postgresql-server postgresql-contrib postgresql-devel postgis postgis-utils \
make automake gcc gcc-c++ libtool policycoreutils-python \ make cmake gcc gcc-c++ libtool policycoreutils-python \
php-pgsql php php-pear php-pear-DB libpqxx-devel proj-epsg \ php-pgsql php php-pear php-pear-DB libpqxx-devel proj-epsg \
bzip2-devel proj-devel geos-devel libxml2-devel boost-devel \ bzip2-devel proj-devel geos-devel libxml2-devel boost-devel \
expat-devel zlib-devel expat-devel zlib-devel
@ -70,13 +70,14 @@ cd /home/$USERNAME
# If the Nominatim source is not being shared with the host, check out source. # If the Nominatim source is not being shared with the host, check out source.
if [ ! -d "Nominatim" ]; then if [ ! -d "Nominatim" ]; then
yum install -y git yum install -y git
sudo -u $USERNAME git clone --recursive https://github.com/twain47/Nominatim.git sudo -H -u $USERNAME git clone --recursive https://github.com/twain47/Nominatim.git
fi fi
# Configure and compile the source. # Configure and compile the source.
cd Nominatim cd Nominatim
sudo -u $USERNAME ./autogen.sh sudu -u $USERNAME mkdir build-vagrant
sudo -u $USERNAME ./configure cd build-vagrant
sudo -u $USERNAME cmake ..
sudo -u $USERNAME make sudo -u $USERNAME make
# Make sure that postgres has access to the nominatim library. # Make sure that postgres has access to the nominatim library.

View File

@ -36,7 +36,7 @@ USERNAME=vagrant
sudo apt-get update -qq sudo apt-get update -qq
sudo apt-get upgrade -y sudo apt-get upgrade -y
sudo apt-get install -y build-essential libgeos-dev libpq-dev libbz2-dev \ sudo apt-get install -y build-essential libgeos-dev libpq-dev libbz2-dev \
libtool automake libproj-dev libboost-dev libboost-system-dev \ libtool cmake libproj-dev libboost-dev libboost-system-dev \
libboost-filesystem-dev libboost-thread-dev libexpat-dev libboost-filesystem-dev libboost-thread-dev libexpat-dev
sudo apt-get autoremove -y sudo apt-get autoremove -y
@ -89,13 +89,13 @@ cd /home/$USERNAME
# If the Nominatim source is not being shared with the host, check out source. # If the Nominatim source is not being shared with the host, check out source.
if [ ! -d "Nominatim" ]; then if [ ! -d "Nominatim" ]; then
sudo apt-get install -y git sudo apt-get install -y git
sudo -u $USERNAME git clone --recursive https://github.com/twain47/Nominatim.git sudo -H -u $USERNAME git clone --recursive https://github.com/twain47/Nominatim.git
fi fi
cd Nominatim cd Nominatim
sudo -u $USERNAME mkdir build-vagrant
sudo -u $USERNAME ./autogen.sh cd build-vagrant
sudo -u $USERNAME ./configure sudo -u $USERNAME cmake ..
sudo -u $USERNAME make sudo -u $USERNAME make
chmod +x ./ chmod +x ./
chmod +x ./module chmod +x ./module