Issue 2599, 2940 - Fix the presence of correct ATL version

README.md

 Adblock Plus for Internet Explorer
 ==================================
 
 This combines a Browser Helper Object with a singleton engine process to block
 ads in Internet Explorer. The engine process embeds libadblockplus.
 
 Requirements to work with the repository and the code
 -----------------------------------------------------
 
 ### Python
-You need to have installed python 2+ (tested with python 2.7). It should be
-the version available by default from Visual Studio as well as in your
-command line environment. Simply put, make sure that path to `python.exe` is in
-your `PATH` environment variable.
+You need to have installed python 2.7. It should be the version available by
+default from Visual Studio as well as in your command line environment.
+Simply put, make sure that path to `python.exe` is in your `PATH` environment
+variable.
 

[Eric, 2015/11/14 18:39:01]

This section is good. It's adequately descriptive.

 ### Visual C++ toolset
 There should be available v110 and v110_xp toolsets. For instance, they are
 contained in freely available Visual Studio 2012 Express for Windows Desktop
 and in any paid edition of Visual Studio 2012. Take into account that you might
 need to get the recent updates of mentioned editions, more details about
 v110_xp https://msdn.microsoft.com/en-us/library/jj851139.aspx.
 
 ### ATL versions
 It works with ATL shipped with any paid edition of Visual Studio 2012 as well
 as with ATL shipped with Visual Studio 2013 Community edition.
 If you use Visual Studio 2013 Community Edition as the source of ATL then set
-`ATLDir` environment variable to the directory of the corresponding ATL (e.g,

[Eric, 2015/11/14 18:39:01]

Nit: As a convention, environment variables are all uppercase.

-`C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\atlmfc`)
+`ADBLOCKPLUS_ATL` environment variable to the directory of the corresponding
+ATL (e.g, `C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\atlmfc`)
 Attention:
 - ATL is not shipped with Express edition of any Visual Studio.
 - ATL from Visual Studio 2015 is not supported.
 More information about libraies and headers in Visual Studios:
 2015 - https://msdn.microsoft.com/en-us/library/hs24szh9(v=vs.140).aspx
 2013 - https://msdn.microsoft.com/en-us/library/hs24szh9(v=vs.120).aspx
 2012 - https://msdn.microsoft.com/en-us/library/hs24szh9(v=vs.110).aspx
 
 ### Visual Studio as an IDE
-Currently the project configured to work with Visual Studio 2012 as an IDE.
-Any other higher version of Visual Studio can be used but require additional
-efforts.

[Eric, 2015/11/14 18:39:01]

Actually, there's zero extra work to use, say, VS 2015 Community. Of the any
things I've had trouble with, this is not one of them. The project file
generated by gyp identifies the toolset, and Visual Studio uses it seamlessly.

There is, however, one caveat. VS 2013 and later will offer the option to
"upgrade" the compiler, which will cause the build to fail if selected. In VS
2015, it's in a context menu named "Upgrade VC++ Compilers and Libraries". So
don't do that.

-
+Currently the project configured to work with MS Visual Studio 2012 as an IDE
+because the main development and release builds are in Visual Studio 2012.
+However one can also use any higher version of Visual Studio as and IDE, the
+caveat is to disable "Upgrade C++ Compilers and Libraries".
 
 Getting/updating the dependencies
 ---------------------------------
 
 adblockplusie has dependencies that aren't part of this repository. They are
 retrieved and updated when you're generating the VS solution for the build, but
 you can also manually update them by running the following:
 
     ./ensure_dependencies.py
 
 Building
 --------
 
 Building is tested on the following configurations
 - [free for everybody] "Microsoft Visual Studio Express 2012 for Windows
-Desktop" with "Microsoft Visual Studio Community 2013" as the source of ATL.

[Eric, 2015/11/14 18:39:00]

This item is still a bit confusing. I'd explicitly state that "2012 Express" is
where the toolset come from. I would also state explicitly that several
different versions of VS-as-IDE work. The way it reads right now seems to
contradict the clearer exposition above.

-- "Microsoft Visual Studio Express 2012 for Windows Desktop" with "Microsoft
-Visual Studio Professional 2012" as the source of ATL.

[Eric, 2015/11/14 18:39:00]

Is there anybody who would use Express if Professional were installed?

In other words, I think we can omit this configuration.

+Desktop" as the source of toolset with "Microsoft Visual Studio Community 2013"
+as the source of ATL. Pay attention to the configuring of the environment
+described in "ATL versions" section.
 - "Microsoft Visual Studio Professional 2012"
 - "Microsoft Visual Studio Ultimate 2012"
 
 * Execute `createsolution.bat` to retrieve dependencies and generate project
 files, this will create `build\ia32\adblockplus.sln` (solution for the 32 bit
 build) and `build\x64\adblockplus.sln` (solution for the 64 bit build). 
 Unfortunately, V8 (which is used by libadblockplus) doesn't support creating 
 both from the same project files.
 * Open `build\ia32\adblockplus.sln` or `build\x64\adblockplus.sln` in
 Visual Studio and build the solution there. Alternatively you can use the
@@ skipping 22 matching lines @@
 files, this will create a bunch of project files in the _installer\build\ia32_
 and _installer\build\x64_ directories.
 * Open and build `installer\build\ia32\installer.sln` and
 `installer\build\x64\installer.sln` in Visual Studio. Alternatively you can use
 the `msbuild` command line tool, i.e. run
 `msibuild /m installer\build\ia32\adblockplus.sln` and
 `msibuild /m installer\build\x64\adblockplus.sln` from the Visual Studio
 Developer Command Prompt.
 * Either open and compile `installer\src\innosetup-exe\64BitTwoArch.iss` in
 InnoSetup or run `iscc.exe installer\src\innosetup-exe\64bitTwoArch.iss`.