From f207a4680d64ce2dc3ff8945438d9a136249317e Mon Sep 17 00:00:00 2001 From: Al Date: Thu, 30 Nov 2017 14:09:13 -0500 Subject: [PATCH 1/3] [docs/build] adding make -j4 as the default for make, including in the Travis/Appveyor builds, should make build times faster --- .travis.yml | 2 +- README.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 99882187..ac880b3c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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; diff --git a/README.md b/README.md index 1ce427b8..439443d1 100644 --- a/README.md +++ b/README.md @@ -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. From 02d049b8d999ccfdd5b09074f08933a4c4330c21 Mon Sep 17 00:00:00 2001 From: Al Date: Thu, 30 Nov 2017 17:18:04 -0500 Subject: [PATCH 2/3] [build] also trying make -j4 to the Windows build. Set an option on the Appveyor side that will hopefully not build twice on pull requests --- win_build.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win_build.bat b/win_build.bat index 8b0db748..f7779bbe 100644 --- a/win_build.bat +++ b/win_build.bat @@ -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 From cf56da98f7df0a1cf955c91056bb4ccbd84a046c Mon Sep 17 00:00:00 2001 From: Al Date: Thu, 30 Nov 2017 17:39:24 -0500 Subject: [PATCH 3/3] [build] only build master on Appveyor so PRs don't trigger multiple builds --- .appveyor.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.appveyor.yml b/.appveyor.yml index eac7a36c..b14fe0a8 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -3,6 +3,10 @@ version: 1.0.{build} image: Visual Studio 2015 platform: x64 +branches: + only: + - master + environment: matrix: - COMPILER: msys2