Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: README.md

Issue 29324576: Issue 2599, 2940 - Fix the presence of correct ATL version (Closed)
Patch Set: Created Aug. 25, 2015, 1:11 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | adblockplus.gyp » ('j') | adblockplus.gyp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 7 Getting/updating the dependencies
8 --------------------------------- 8 ---------------------------------
9 9
10 adblockplusie has dependencies that aren't part of this repository. They are 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 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: 12 you can also manually update them by running the following:
13 13
14 ./ensure_dependencies.py 14 ./ensure_dependencies.py
15 15
16 Building 16 Building
17 -------- 17 --------
18 18
19 You need Microsoft Visual C++ 2012 and Python 2.7. Make sure that `python.exe` 19 You need Microsoft Visual C++ 2012 and Python 2.7. Make sure that `python.exe`
20 is on your `PATH`. Unfortunately until we move to Visual Studio 2013 you'll 20 is on your `PATH`. When building with Express edition you also need some
21 need to use Visual Studio 2012 version that comes with ATL (Proffessional etc). 21 Visual Studio which comes with ATL. For example, if you use Visual Studio 2013
22 Community Edition then set `VCInstallDir_120` environment variable to the
23 directory of Visual C++ (for example,
24 `C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC`).
Eric 2015/08/26 18:25:35 This comment does not explain things adequately.
sergei 2015/08/26 21:47:54 Do you mean that user does not know about absence
22 25
23 * Execute `createsolution.bat` to retrieve dependencies and generate project 26 * Execute `createsolution.bat` to retrieve dependencies and generate project
24 files, this will create `build\ia32\adblockplus.sln` (solution for the 32 bit 27 files, this will create `build\ia32\adblockplus.sln` (solution for the 32 bit
25 build) and `build\x64\adblockplus.sln` (solution for the 64 bit build). 28 build) and `build\x64\adblockplus.sln` (solution for the 64 bit build).
26 Unfortunately, V8 (which is used by libadblockplus) doesn't support creating 29 Unfortunately, V8 (which is used by libadblockplus) doesn't support creating
27 both from the same project files. 30 both from the same project files.
28 * Open `build\ia32\adblockplus.sln` or `build\x64\adblockplus.sln` in 31 * Open `build\ia32\adblockplus.sln` or `build\x64\adblockplus.sln` in
29 Visual Studio and build the solution there. Alternatively you can use the 32 Visual Studio and build the solution there. Alternatively you can use the
30 `msbuild` command line tool, e.g. run `msbuild /m build\ia32\adblockplus.sln` 33 `msbuild` command line tool, e.g. run `msbuild /m build\ia32\adblockplus.sln`
31 from the Visual Studio Developer Command Prompt to create a 32 bit debug build. 34 from the Visual Studio Developer Command Prompt to create a 32 bit debug build.
(...skipping 20 matching lines...) Expand all
52 files, this will create a bunch of project files in the _installer\build\ia32_ 55 files, this will create a bunch of project files in the _installer\build\ia32_
53 and _installer\build\x64_ directories. 56 and _installer\build\x64_ directories.
54 * Open and build `installer\build\ia32\installer.sln` and 57 * Open and build `installer\build\ia32\installer.sln` and
55 `installer\build\x64\installer.sln` in Visual Studio. Alternatively you can use 58 `installer\build\x64\installer.sln` in Visual Studio. Alternatively you can use
56 the `msbuild` command line tool, i.e. run 59 the `msbuild` command line tool, i.e. run
57 `msibuild /m installer\build\ia32\adblockplus.sln` and 60 `msibuild /m installer\build\ia32\adblockplus.sln` and
58 `msibuild /m installer\build\x64\adblockplus.sln` from the Visual Studio 61 `msibuild /m installer\build\x64\adblockplus.sln` from the Visual Studio
59 Developer Command Prompt. 62 Developer Command Prompt.
60 * Either open and compile `installer\src\innosetup-exe\64BitTwoArch.iss` in 63 * Either open and compile `installer\src\innosetup-exe\64BitTwoArch.iss` in
61 InnoSetup or run `iscc.exe installer\src\innosetup-exe\64bitTwoArch.iss`. 64 InnoSetup or run `iscc.exe installer\src\innosetup-exe\64bitTwoArch.iss`.
OLDNEW
« no previous file with comments | « no previous file | adblockplus.gyp » ('j') | adblockplus.gyp » ('J')

Powered by Google App Engine
This is Rietveld