Delta Between Two Patch Sets: README.md
Issue 6234732039766016:
Improve installer build instructions (Closed)
Left Patch Set:
Created July 24, 2014, 8:42 a.m.
Right Patch Set: Add a remark about WiX in %PATH%, make things more consistent
Created July 24, 2014, 9:27 a.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with change/comment
|
« no previous file
|
no next file »
|
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 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 Building | 7 Building |
| 8 -------- | 8 -------- |
| 9 | 9 |
| 10 You need Microsoft Visual C++ (Express is sufficient) 2012 and Python 2.6. Make | 10 You need Microsoft Visual C++ (Express is sufficient) 2012 and Python 2.6. Make |
| 11 sure that `python.exe` is on your `PATH`. When building with Express Edition | 11 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 | 12 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 | 13 dependency, set `WINDDKDIR` environment variable to the installation directory |
| 14 of the Device Kit. | 14 of the Device Kit. |
| 15 | 15 |
| 16 * Execute `createsolution.bat` to generate project files, this will create | 16 * Execute `createsolution.bat` to generate project files, this will create |
| 17 `build\ia32\adblockplus.sln` (solution for the 32 bit build) and | 17 `build\ia32\adblockplus.sln` (solution for the 32 bit build) and |
| 18 `build\x64\adblockplus.sln` (solution for the 64 bit build). Unfortunately, | 18 `build\x64\adblockplus.sln` (solution for the 64 bit build). Unfortunately, |
| 19 V8 (which is used by libadblockplus) doesn't support creating both from the | 19 V8 (which is used by libadblockplus) doesn't support creating both from the |
| 20 same project files. | 20 same project files. |
| 21 * Open `build\ia32\adblockplus.sln` or `build\x64\adblockplus.sln` in | 21 * Open `build\ia32\adblockplus.sln` or `build\x64\adblockplus.sln` in |
| 22 Visual Studio and build the solution there. Alternatively you can use the | 22 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` | 23 `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. | 24 from the Visual Studio Developer Command Prompt to create a 32 bit debug build. |
| 25 | 25 |
| 26 Building the installer | 26 Building the installer |
| 27 ---------------------- | 27 ---------------------- |
| 28 | 28 |
| 29 You need [WiX 3.8](http://wixtoolset.org) and | 29 You need [WiX 3.8](http://wixtoolset.org) (make sure `%WIX%\bin` is in `%PATH%`) |
| 30 [InnoSetup 5.5](http://www.jrsoftware.org/isinfo.php). | 30 and [InnoSetup 5.5](http://www.jrsoftware.org/isinfo.php). |
|
Oleksandr
2014/07/24 09:21:09
Also you'll have to add |WiX Toolset v3.8\bin| fol
Felix Dahlke
2014/07/24 09:29:48
Done.
| |
| 31 | 31 |
| 32 * Execture Installer\createsolutions.bat to generate installer project files, | 32 * Execute `installer\createsolutions.bat` to generate the installer project |
| 33 this will create a bunch of project files in installer\build\ia32 and | 33 files, this will create a bunch of project files in the _installer\build\ia32_ |
| 34 installer\build\x64 folders. | 34 and _installer\build\x64_ directories. |
| 35 * Open 'installer\build\ia32\installer.sln' and then 'installer\build\x64\instal ler.sln' | 35 * Open and build `installer\build\ia32\installer.sln` and |
| 36 in Visual Studio and build both solutions. Alternatively you can use the 'msbuil d' | 36 `installer\build\x64\installer.sln` in Visual Studio. Alternatively you can use |
| 37 command line tool, e.g. run 'msibuild /m installer\build\ia32\adblockplus.sln' a nd | 37 the `msbuild` command line tool, i.e. run |
| 38 'msibuild /m installer\build\x64\adblockplus.sln' | 38 `msibuild /m installer\build\ia32\adblockplus.sln` and |
| 39 * Either open and compile 'installer\src\innosetup-exe\64BitTwoArch.iss' in | 39 `msibuild /m installer\build\x64\adblockplus.sln` from the Visual Studio |
| 40 InnoSetup or run 'iscc.exe installer\src\innosetup-exe\64bitTwoArch.iss' | 40 Developer Command Prompt. |
|
Oleksandr
2014/07/24 09:48:36
or you can use a makefile and run nmake from Visua
| |
| 41 * Either open and compile `installer\src\innosetup-exe\64BitTwoArch.iss` in | |
| 42 InnoSetup or run `iscc.exe installer\src\innosetup-exe\64bitTwoArch.iss`. | |
| 41 | 43 |
| 42 Development environment | 44 Development environment |
| 43 ----------------------- | 45 ----------------------- |
| 44 | 46 |
| 45 TODO: Describe how to test your build | 47 TODO: Describe how to test your build |
| LEFT | RIGHT |
« no previous file
|
no next file »
|
Toggle Intra-line Diffs ('i')
|
Expand Comments ('e')
|
Collapse Comments ('c')
|
Toggle Comments ('s')
