Delta Between Two Patch Sets: README.md
Issue 29537638:
Issue 6226 - Use mesonbuild as a build system (Closed)
Base URL: https://hg.adblockplus.org/libadblockplus/
Left Patch Set: Missing wrap_make. Added Win32 support (untested)
Created March 23, 2018, 11:04 p.m.
Right Patch Set: Support NDK r16b
Created April 25, 2018, 10:01 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with change/comment
|
« .travis.yml ('k')
|
cross-bootstrap.sh » ('j')
|
no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| LEFT | RIGHT |
|---|---|
| 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 |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 88 V8 doesn't support creating both from the same project files. | 88 V8 doesn't support creating both from the same project files. |
| 89 * Open `build\ia32\libadblockplus.sln` or `build\x64\libadblockplus.sln` in | 89 * Open `build\ia32\libadblockplus.sln` or `build\x64\libadblockplus.sln` in |
| 90 Visual Studio and build the solution there. Alternatively you can use the | 90 Visual Studio and build the solution there. Alternatively you can use the |
| 91 `msbuild` command line tool, e.g. run `msbuild /m build\ia32\libadblockplus.sln` | 91 `msbuild` command line tool, e.g. run `msbuild /m build\ia32\libadblockplus.sln` |
| 92 from the Visual Studio Developer Command Prompt to create a 32 bit debug build. | 92 from the Visual Studio Developer Command Prompt to create a 32 bit debug build. |
| 93 | 93 |
| 94 Tested on Microsoft Visual Studio 2015 Community Edition. | 94 Tested on Microsoft Visual Studio 2015 Community Edition. |
| 95 | 95 |
| 96 ### Building for Android | 96 ### Building for Android |
| 97 | 97 |
| 98 #### Using Meson | |
| 99 | |
| 100 First set `ANDROID_NDK_ROOT` environment variable to your Android NDK directory. | |
| 101 If you don't have one yet, do not worry. | |
| 102 | |
| 103 You need to initially run | |
| 104 | |
| 105 ./cross-bootstrap.sh | |
| 106 | |
| 107 This will configure the cross files to the location of the NDK. | |
| 108 If `ANDROID_NDK_ROOT` is not defined, then it will download it into | |
| 109 `third_party` first. | |
| 110 | |
| 111 To configure a build | |
| 112 | |
| 113 meson android-arm-build --cross-file cross/android-arm | |
| 114 | |
| 115 Then to build | |
| 116 | |
| 117 ninja -C android-arm-build | |
| 118 | |
| 119 There are cross-files for android-x86 and android-arm64. You can use these | |
| 120 to configure other targets. | |
| 121 | |
| 122 #### Using Make | |
| 123 | |
| 98 First set ANDROID_NDK_ROOT environment variable to your Android NDK directory. | 124 First set ANDROID_NDK_ROOT environment variable to your Android NDK directory. |
| 99 | 125 |
| 100 To build for *x86* arch run: | 126 To build for *x86* arch run: |
| 101 | 127 |
| 102 make android_x86 | 128 make android_x86 |
| 103 | 129 |
| 104 To build for *arm* or *arm64* arch run: | 130 To build for *arm* or *arm64* arch run: |
| 105 | 131 |
| 106 make android_arm | 132 make android_arm |
| 107 | 133 |
| (...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 290 Linting | 316 Linting |
| 291 ------- | 317 ------- |
| 292 | 318 |
| 293 You can lint the code using [ESLint](http://eslint.org). | 319 You can lint the code using [ESLint](http://eslint.org). |
| 294 | 320 |
| 295 npm run eslint | 321 npm run eslint |
| 296 | 322 |
| 297 In order to set up ESLint and | 323 In order to set up ESLint and |
| 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. | 324 [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. |
| 299 | 325 |
| LEFT | RIGHT |
« .travis.yml ('k')
|
cross-bootstrap.sh » ('j')
|
Toggle Intra-line Diffs ('i')
|
Expand Comments ('e')
|
Collapse Comments ('c')
|
Toggle Comments ('s')
