| Left: | ||
| Right: |
| 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 * Microsoft Visual Studio 2010, 2012 | 23 * Microsoft Visual Studio 2015 |
|
Eric
2017/05/30 17:31:40
We need to say here that VS 2017 will not work. Or
sergei
2017/05/31 12:47:10
Should we say in addition that VS 2020 and 2030 wi
| |
| 24 | 24 |
| 25 Linux: | 25 Linux: |
| 26 * g++ 5.2 | 26 * g++ 5.2 |
| 27 | 27 |
| 28 Mac: | 28 Mac: |
| 29 * clang 3.6 for OS X | 29 * clang 3.6 for OS X |
| 30 | 30 |
| 31 Android: | 31 Android: |
| 32 * The host system should be Linux or OS X | 32 * The host system should be Linux or OS X |
| 33 * android-ndk-r9, android-ndk-r10c. You can download the latter for [OS X](http: //dl.google.com/android/ndk/android-ndk-r10c-darwin-x86_64.bin), [Linux 32](http ://dl.google.com/android/ndk/android-ndk-r10c-linux-x86.bin), [Linux 64](http:// dl.google.com/android/ndk/android-ndk-r10c-linux-x86_64.bin). | 33 * 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), | |
| 35 [Linux 64](https://dl.google.com/android/repository/android-ndk-r12b-linux-x86 _64.zip). | |
| 34 * g++ multilib | 36 * g++ multilib |
| 35 | 37 |
| 36 If you have a compilation issue with another compiler please [create an issue](h ttps://issues.adblockplus.org/). | 38 If you have a compilation issue with another compiler please [create an issue](h ttps://issues.adblockplus.org/). |
| 37 | 39 |
| 38 ### Unix | 40 ### Unix |
| 39 | 41 |
| 40 All you need is Python 2.7 and Make: | 42 All you need is Python 2.7 and Make: |
| 41 | 43 |
| 42 make | 44 make |
| 43 | 45 |
| 44 The default target architecture is x64. On a 32 bit system, run: | 46 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: |
| 45 | 47 |
| 46 make ARCH=ia32 | 48 make ARCH=ia32 |
| 47 | 49 |
| 50 supported values are `ia32` and `x64`. | |
| 51 | |
| 52 | |
| 48 To build and run the tests: | 53 To build and run the tests: |
| 49 | 54 |
| 50 make test | 55 make test |
| 51 | 56 |
| 52 Likewise, use the following on a 32 bit system: | 57 Likewise, use the following with `ARCH`: |
| 53 | 58 |
| 54 make test ARCH=ia32 | 59 make test ARCH=ia32 |
| 55 | 60 |
| 56 To run specific tests, you can specify a filter: | 61 To run specific tests, you can specify a filter: |
| 57 | 62 |
| 58 make test FILTER=*.Matches | 63 make test FILTER=*.Matches |
| 59 | 64 |
| 60 ### Windows | 65 ### Windows |
| 61 | 66 |
| 62 You need Microsoft Visual C++ (Express is sufficient) 2012 | 67 You need Microsoft Visual C++ 2015 (Community Edition is sufficient) |
|
Eric
2017/05/30 17:31:40
Again, this should say that the C++ version in VS
sergei
2017/05/31 12:47:10
I'm not sure about it, as far as I know it's possi
| |
| 63 and Python 2.7. Make sure that `python.exe` is on your `PATH`. | 68 and Python 2.7. Make sure that `python.exe` is on your `PATH`. |
| 64 | 69 |
| 65 * Execute `createsolution.bat` to generate project files, this will create | 70 * Execute `createsolution.bat` to generate project files, this will create |
| 66 `build\ia32\libadblockplus.sln` (solution for the 32 bit build) and | 71 `build\ia32\libadblockplus.sln` (solution for the 32 bit build) and |
| 67 `build\x64\libadblockplus.sln` (solution for the 64 bit build). Unfortunately, | 72 `build\x64\libadblockplus.sln` (solution for the 64 bit build). Unfortunately, |
| 68 V8 doesn't support creating both from the same project files. | 73 V8 doesn't support creating both from the same project files. |
| 69 * Open `build\ia32\libadblockplus.sln` or `build\x64\libadblockplus.sln` in | 74 * Open `build\ia32\libadblockplus.sln` or `build\x64\libadblockplus.sln` in |
| 70 Visual Studio and build the solution there. Alternatively you can use the | 75 Visual Studio and build the solution there. Alternatively you can use the |
| 71 `msbuild` command line tool, e.g. run `msbuild /m build\ia32\libadblockplus.sln` | 76 `msbuild` command line tool, e.g. run `msbuild /m build\ia32\libadblockplus.sln` |
| 72 from the Visual Studio Developer Command Prompt to create a 32 bit debug build. | 77 from the Visual Studio Developer Command Prompt to create a 32 bit debug build. |
| (...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 236 | 241 |
| 237 ### Unix | 242 ### Unix |
| 238 | 243 |
| 239 The shell is automatically built by `make`, you can run it as follows: | 244 The shell is automatically built by `make`, you can run it as follows: |
| 240 | 245 |
| 241 build/out/abpshell | 246 build/out/abpshell |
| 242 | 247 |
| 243 ### Windows | 248 ### Windows |
| 244 | 249 |
| 245 Just run the project *abpshell*. | 250 Just run the project *abpshell*. |
| OLD | NEW |