| OLD | NEW |
| 1 libadblockplus | 1 libadblockplus |
| 2 ============== | 2 ============== |
| 3 | 3 |
| 4 A C++ library offering the core functionality of Adblock Plus. | 4 A C++ library offering the core functionality of Adblock Plus. |
| 5 | 5 |
| 6 Getting/updating the dependencies | 6 Getting/updating the dependencies |
| 7 --------------------------------- | 7 --------------------------------- |
| 8 | 8 |
| 9 libadblockplus has dependencies that aren't part of this repository. They are | 9 libadblockplus has dependencies that aren't part of this repository. They are |
| 10 retrieved and updated during the build process, but you can also manually update | 10 retrieved and updated during the build process, but you can also manually update |
| 11 them by running the following: | 11 them by running the following: |
| 12 | 12 |
| 13 ./ensure_dependencies.py | 13 ./ensure_dependencies.py |
| 14 | 14 |
| 15 Building | 15 Building |
| 16 -------- | 16 -------- |
| 17 | 17 |
| 18 ### Supported target platforms and prerequisites | 18 ### Supported target platforms and prerequisites |
| 19 | 19 |
| 20 You need a C++11 compatible compiler to build libadblockplus. | 20 You need a C++11 compatible compiler to build libadblockplus. |
| 21 | 21 |
| 22 Win32: | 22 Win32: |
| 23 * At least v140 Visual C++ toolset (available in Microsoft Visual Studio 2015). | 23 * At least v140 Visual C++ toolset (available in Microsoft Visual Studio 2015). |
| 24 | 24 |
| 25 Linux: | 25 Linux: |
| 26 * g++ 5.2 | 26 * g++ 5.2 |
| 27 If building using meson: |
| 28 * meson 0.40.0 |
| 27 | 29 |
| 28 Mac: | 30 Mac: |
| 29 * clang 3.6 for OS X/macOS (Xcode should be installed and its developer tools sh
ould be "selected"). | 31 * clang 3.6 for OS X/macOS (Xcode should be installed and its developer tools sh
ould be "selected"). |
| 30 | 32 |
| 31 Android: | 33 Android: |
| 32 * The host system should be Linux or OS X | 34 * The host system should be Linux or OS X |
| 33 * android-ndk-r12b Here are the links for downloading | 35 * android-ndk-r12b Here are the links for downloading |
| 34 [OS X](https://dl.google.com/android/repository/android-ndk-r12b-darwin-x86_64
.zip), | 36 [OS X](https://dl.google.com/android/repository/android-ndk-r12b-darwin-x86_64
.zip), |
| 35 [Linux 64](https://dl.google.com/android/repository/android-ndk-r12b-linux-x86
_64.zip). | 37 [Linux 64](https://dl.google.com/android/repository/android-ndk-r12b-linux-x86
_64.zip). |
| 36 * g++ multilib | 38 * g++ multilib |
| 37 | 39 |
| 38 If you have a compilation issue with another compiler please [create an issue](h
ttps://issues.adblockplus.org/). | 40 If you have a compilation issue with another compiler please [create an issue](h
ttps://issues.adblockplus.org/). |
| 39 | 41 |
| 40 You also need Python 2.7 and ensure that `python.exe` is in your `PATH`. | 42 You also need Python 2.7 and ensure that `python.exe` is in your `PATH`. |
| 41 | 43 |
| 42 ### Unix | 44 ### Unix |
| 43 | 45 |
| 44 Using Make: | 46 You can use either `meson` or `make`. |
| 47 |
| 48 #### Using Meson: |
| 49 |
| 50 meson build |
| 51 |
| 52 Then |
| 53 |
| 54 ninja -C build |
| 55 |
| 56 To build and run the tests |
| 57 |
| 58 ninja -C build test |
| 59 |
| 60 #### Using Make: |
| 45 | 61 |
| 46 make | 62 make |
| 47 | 63 |
| 48 The default target architecture is the architecture of a host. In order to build
for a different architecture pass `ARCH` to `make`, e.g. run: | 64 The default target architecture is the architecture of a host. In order to build
for a different architecture pass `ARCH` to `make`, e.g. run: |
| 49 | 65 |
| 50 make ARCH=ia32 | 66 make ARCH=ia32 |
| 51 | 67 |
| 52 supported values are `ia32` and `x64`. | 68 supported values are `ia32` and `x64`. |
| 53 | 69 |
| 54 | 70 |
| 55 To build and run the tests: | 71 To build and run the tests: |
| 56 | 72 |
| 57 make test | 73 make test |
| 58 | 74 |
| 59 Likewise, use the following with `ARCH`: | 75 Likewise, use the following with `ARCH`: |
| 60 | 76 |
| 61 make test ARCH=ia32 | 77 make test ARCH=ia32 |
| 62 | 78 |
| 63 To run specific tests, you can specify a filter: | 79 To run specific tests, you can specify a filter: |
| (...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 274 Linting | 290 Linting |
| 275 ------- | 291 ------- |
| 276 | 292 |
| 277 You can lint the code using [ESLint](http://eslint.org). | 293 You can lint the code using [ESLint](http://eslint.org). |
| 278 | 294 |
| 279 npm run eslint | 295 npm run eslint |
| 280 | 296 |
| 281 In order to set up ESLint and | 297 In order to set up ESLint and |
| 282 [configuration eslint-config-eyeo](https://hg.adblockplus.org/codingtools/file/t
ip/eslint-config-eyeo) you need [Node.js 7 or higher](https://nodejs.org/) and o
nce it is installed please run `npm install` in the repository directory. | 298 [configuration eslint-config-eyeo](https://hg.adblockplus.org/codingtools/file/t
ip/eslint-config-eyeo) you need [Node.js 7 or higher](https://nodejs.org/) and o
nce it is installed please run `npm install` in the repository directory. |
| 283 | 299 |
| OLD | NEW |