tommy/libpostal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into lieu_api

Browse Source
This commit is contained in:
Al
2017-11-30 23:10:17 -05:00
parent e27f5f1d70 8b2f91477e
commit 252d5a0f37
4 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.appveyor.yml
View File

@@ -3,6 +3,10 @@ version: 1.0.{build}
image: Visual Studio 2015 image: Visual Studio 2015
platform: x64 platform: x64
branches:
only:
- master
environment: environment:
matrix: matrix:
- COMPILER: msys2 - COMPILER: msys2

2
.travis.yml
View File

@@ -32,7 +32,7 @@ install:
- if [ "$CC" = "gcc" ]; then export CC="gcc-4.8"; fi - if [ "$CC" = "gcc" ]; then export CC="gcc-4.8"; fi
script: script:
- ./configure --datadir=$(pwd)/data - ./configure --datadir=$(pwd)/data
- make - make -j4
- if [[ $DICTIONARIES_CHANGED -ne 0 ]]; then ./src/build_address_dictionary; fi; - if [[ $DICTIONARIES_CHANGED -ne 0 ]]; then ./src/build_address_dictionary; fi;
- if [[ $NUMEX_CHANGED -ne 0 ]]; then ./src/build_numex_table; fi; - if [[ $NUMEX_CHANGED -ne 0 ]]; then ./src/build_numex_table; fi;
- if [[ $TRANSLIT_CHANGED -ne 0 ]]; then ./src/build_trans_table; fi; - if [[ $TRANSLIT_CHANGED -ne 0 ]]; then ./src/build_trans_table; fi;

4
README.md
View File

@@ -118,7 +118,7 @@ git clone https://github.com/openvenues/libpostal
cd libpostal cd libpostal
./bootstrap.sh ./bootstrap.sh
./configure --datadir=[...some dir with a few GB of space...] ./configure --datadir=[...some dir with a few GB of space...]
make make -j4
sudo make install sudo make install
# On Linux it's probably a good idea to run # On Linux it's probably a good idea to run
@@ -163,7 +163,7 @@ cd libpostal
cp -rf windows/* ./ cp -rf windows/* ./
./bootstrap.sh ./bootstrap.sh
./configure --datadir=[...some dir with a few GB of space...] ./configure --datadir=[...some dir with a few GB of space...]
make make -j4
make install 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. 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.

2
win_build.bat
View File

@@ -17,7 +17,7 @@ IF %COMPILER%==msys2 (
bash -lc "cd $APPVEYOR_BUILD_FOLDER && cp -rf windows/* ./" bash -lc "cd $APPVEYOR_BUILD_FOLDER && cp -rf windows/* ./"
bash -lc "cd $APPVEYOR_BUILD_FOLDER && ./bootstrap.sh" bash -lc "cd $APPVEYOR_BUILD_FOLDER && ./bootstrap.sh"
bash -lc "cd $APPVEYOR_BUILD_FOLDER && ./configure --datadir=/c" 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 && make install"
bash -lc "cd $APPVEYOR_BUILD_FOLDER && cp src/.libs/libpostal-*.dll libpostal.dll" 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 "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\lib.exe" /def:libpostal.def /out:libpostal.lib /machine:x64