Merge branch 'master' into lieu_api
This commit is contained in:
@@ -3,6 +3,10 @@ version: 1.0.{build}
|
||||
image: Visual Studio 2015
|
||||
platform: x64
|
||||
|
||||
branches:
|
||||
only:
|
||||
- master
|
||||
|
||||
environment:
|
||||
matrix:
|
||||
- COMPILER: msys2
|
||||
|
||||
@@ -32,7 +32,7 @@ install:
|
||||
- if [ "$CC" = "gcc" ]; then export CC="gcc-4.8"; fi
|
||||
script:
|
||||
- ./configure --datadir=$(pwd)/data
|
||||
- make
|
||||
- make -j4
|
||||
- if [[ $DICTIONARIES_CHANGED -ne 0 ]]; then ./src/build_address_dictionary; fi;
|
||||
- if [[ $NUMEX_CHANGED -ne 0 ]]; then ./src/build_numex_table; fi;
|
||||
- if [[ $TRANSLIT_CHANGED -ne 0 ]]; then ./src/build_trans_table; fi;
|
||||
|
||||
@@ -118,7 +118,7 @@ git clone https://github.com/openvenues/libpostal
|
||||
cd libpostal
|
||||
./bootstrap.sh
|
||||
./configure --datadir=[...some dir with a few GB of space...]
|
||||
make
|
||||
make -j4
|
||||
sudo make install
|
||||
|
||||
# On Linux it's probably a good idea to run
|
||||
@@ -163,7 +163,7 @@ cd libpostal
|
||||
cp -rf windows/* ./
|
||||
./bootstrap.sh
|
||||
./configure --datadir=[...some dir with a few GB of space...]
|
||||
make
|
||||
make -j4
|
||||
make install
|
||||
```
|
||||
Notes: When setting the datadir, the `C:` drive would be entered as `/c`. The libpostal build script automatically add `libpostal` on the end of the path, so '/c' would become `C:\libpostal\` on Windows.
|
||||
|
||||
@@ -17,7 +17,7 @@ IF %COMPILER%==msys2 (
|
||||
bash -lc "cd $APPVEYOR_BUILD_FOLDER && cp -rf windows/* ./"
|
||||
bash -lc "cd $APPVEYOR_BUILD_FOLDER && ./bootstrap.sh"
|
||||
bash -lc "cd $APPVEYOR_BUILD_FOLDER && ./configure --datadir=/c"
|
||||
bash -lc "cd $APPVEYOR_BUILD_FOLDER && make"
|
||||
bash -lc "cd $APPVEYOR_BUILD_FOLDER && make -j4"
|
||||
bash -lc "cd $APPVEYOR_BUILD_FOLDER && make install"
|
||||
bash -lc "cd $APPVEYOR_BUILD_FOLDER && cp src/.libs/libpostal-*.dll libpostal.dll"
|
||||
"C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\lib.exe" /def:libpostal.def /out:libpostal.lib /machine:x64
|
||||
|
||||
Reference in New Issue
Block a user