diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-06-29 10:00:37 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-06-29 17:07:06 +0000 |
| commit | 5ae8c92aa0dfc70a1e76b8100702a285bc2638e4 (patch) | |
| tree | f472f15a06023000c1c56c2a42cf6f359e8a0ebf /docbook/wsdg_src | |
| parent | df62a1b1e9cc6154ad81f2237b73b638f835efaf (diff) | |
Try to fix NSIS packaging dependencies.
Split the nsis_package target into nsis_package_prep which has
dependencies and nsis_package which has no dependencies and as a result
blindly builds the package. Remove the nsis_uninstaller target since
that's now handled by nsis_package_prep. Nsis_package_prep *should*
also take care of the dependencies for portableapps_package, but that
hasn't been tested.
Update the Developer's Guide.
This requires coordination with the Windows buildbots.
Change-Id: Ib9e3141832c782355135a1637fba5a07c2ca4ba1
Reviewed-on: https://code.wireshark.org/review/9217
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'docbook/wsdg_src')
| -rw-r--r-- | docbook/wsdg_src/WSDG_chapter_sources.asciidoc | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/docbook/wsdg_src/WSDG_chapter_sources.asciidoc b/docbook/wsdg_src/WSDG_chapter_sources.asciidoc index 5f40854ebf..842aba3fb7 100644 --- a/docbook/wsdg_src/WSDG_chapter_sources.asciidoc +++ b/docbook/wsdg_src/WSDG_chapter_sources.asciidoc @@ -1135,11 +1135,19 @@ based systems; instructions how to install it can be found in <<ChToolsNSIS>>. NSIS is script based, you will find the Wireshark installer generation script at: 'packaging/nsis/wireshark.nsi'. -You will probably have to modify the MAKENSIS setting in the -'config.nmake' file to specify where the NSIS binaries -are installed. +When building with CMake you must first build the 'nsis_package_prep' target, +followed by the 'nsis_package' target, e.g. -In the top-level source directory type: +---- +> msbuild nsis_package_prep.vcxproj +> msbuild nsis_package.vcxproj +---- + +Splitting the packaging projects in this way allows for code signing. + +For Nmake you will probably have to modify the MAKENSIS setting in the +'config.nmake' file to specify where the NSIS binaries are installed. In the +top-level source directory type: ---- > nmake -f makefile.nmake packaging @@ -1173,7 +1181,16 @@ will place it in `C:\PortableApps`. Add the following apps: - PortableApps.com Launcher - PortableApps.com AppCompactor -In the top-level source directory type: +When building with CMake you must first build the 'nsis_package_prep' target +(which takes care of general packaging dependencies), followed by the +'portableapps_package' target, e.g. + +---- +> msbuild nsis_package_prep.vcxproj +> msbuild portableapps_package.vcxproj +---- + +For Nmake, type the following in the top-level source directory ---- > nmake -f makefile.nmake packaging_papps |