Side by Side Diff: README.md
Issue 29321227:
Issue 2735 - Use ensure_dependencies.py in adblockplusie (Closed)
Patch Set: Update libadblockplus version. Use the same version of ensure_dependencies.py as in buildtools
Created July 2, 2015, 10:22 a.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« no previous file
|
createsolution.bat » ('j')
|
no next file with comments »
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')
| OLD | NEW |
|---|---|
| 1 Adblock Plus for Internet Explorer | 1 Adblock Plus for Internet Explorer |
| 2 ================================== | 2 ================================== |
| 3 | 3 |
| 4 This combines a Browser Helper Object with a singleton engine process to block | 4 This combines a Browser Helper Object with a singleton engine process to block |
| 5 ads in Internet Explorer. The engine process embeds libadblockplus. | 5 ads in Internet Explorer. The engine process embeds libadblockplus. |
| 6 | 6 |
| 7 Getting/updating the dependencies | |
| 8 --------------------------------- | |
| 9 | |
| 10 adblockplusie has dependencies that aren't part of this repository. They are | |
| 11 retrieved and updated when you're generating the VS solution for the build, but | |
| 12 you can also manually update them by running the following: | |
| 13 | |
| 14 ./ensure_dependencies.py | |
| 15 | |
| 7 Building | 16 Building |
| 8 -------- | 17 -------- |
| 9 | 18 |
| 10 You need Microsoft Visual C++ (Express is sufficient) 2012 and Python 2.7. Make | 19 You need Microsoft Visual C++ (Express is sufficient) 2012 and Python 2.7. Make |
| 11 sure that `python.exe` is on your `PATH`. When building with Express Edition | 20 sure that `python.exe` is on your `PATH`. When building with Express Edition |
| 12 you also need Windows 7.1 Device Kit (*not* version 8) to satisfy the ATL | 21 you also need Windows 7.1 Device Kit (*not* version 8) to satisfy the ATL |
| 13 dependency, set `WINDDKDIR` environment variable to the installation directory | 22 dependency, set `WINDDKDIR` environment variable to the installation directory |
| 14 of the Device Kit. | 23 of the Device Kit. |
| 15 | 24 |
| 16 * Execute `createsolution.bat` to generate project files, this will create | 25 * Execute `createsolution.bat` to retrieve dependencies and generate project |
| 17 `build\ia32\adblockplus.sln` (solution for the 32 bit build) and | 26 files, this will create `build\ia32\adblockplus.sln` (solution for the 32 bit |
| 18 `build\x64\adblockplus.sln` (solution for the 64 bit build). Unfortunately, | 27 build) and `build\x64\adblockplus.sln` (solution for the 64 bit build). |
| 19 V8 (which is used by libadblockplus) doesn't support creating both from the | 28 Unfortunately, V8 (which is used by libadblockplus) doesn't support creating |
| 20 same project files. | 29 both from the same project files. |
| 21 * Open `build\ia32\adblockplus.sln` or `build\x64\adblockplus.sln` in | 30 * Open `build\ia32\adblockplus.sln` or `build\x64\adblockplus.sln` in |
| 22 Visual Studio and build the solution there. Alternatively you can use the | 31 Visual Studio and build the solution there. Alternatively you can use the |
| 23 `msbuild` command line tool, e.g. run `msbuild /m build\ia32\adblockplus.sln` | 32 `msbuild` command line tool, e.g. run `msbuild /m build\ia32\adblockplus.sln` |
| 24 from the Visual Studio Developer Command Prompt to create a 32 bit debug build. | 33 from the Visual Studio Developer Command Prompt to create a 32 bit debug build. |
| 25 | 34 |
| 26 Running | 35 Running |
| 27 ------- | 36 ------- |
| 28 | 37 |
| 29 In order to test the extension, you need to register the Browser | 38 In order to test the extension, you need to register the Browser |
| 30 Helper Object with IE. You can do this by locating _AdblockPlus.dll_ | 39 Helper Object with IE. You can do this by locating _AdblockPlus.dll_ |
| (...skipping 14 matching lines...) Expand all Loading... | |
| 45 files, this will create a bunch of project files in the _installer\build\ia32_ | 54 files, this will create a bunch of project files in the _installer\build\ia32_ |
| 46 and _installer\build\x64_ directories. | 55 and _installer\build\x64_ directories. |
| 47 * Open and build `installer\build\ia32\installer.sln` and | 56 * Open and build `installer\build\ia32\installer.sln` and |
| 48 `installer\build\x64\installer.sln` in Visual Studio. Alternatively you can use | 57 `installer\build\x64\installer.sln` in Visual Studio. Alternatively you can use |
| 49 the `msbuild` command line tool, i.e. run | 58 the `msbuild` command line tool, i.e. run |
| 50 `msibuild /m installer\build\ia32\adblockplus.sln` and | 59 `msibuild /m installer\build\ia32\adblockplus.sln` and |
| 51 `msibuild /m installer\build\x64\adblockplus.sln` from the Visual Studio | 60 `msibuild /m installer\build\x64\adblockplus.sln` from the Visual Studio |
| 52 Developer Command Prompt. | 61 Developer Command Prompt. |
| 53 * Either open and compile `installer\src\innosetup-exe\64BitTwoArch.iss` in | 62 * Either open and compile `installer\src\innosetup-exe\64BitTwoArch.iss` in |
| 54 InnoSetup or run `iscc.exe installer\src\innosetup-exe\64bitTwoArch.iss`. | 63 InnoSetup or run `iscc.exe installer\src\innosetup-exe\64bitTwoArch.iss`. |
| OLD | NEW |
« no previous file with comments
|
« no previous file
|
createsolution.bat » ('j')
|
no next file with comments »
