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 /packaging/portableapps | |
| parent | df62a1b1e9cc6154ad81f2237b73b638f835efaf (diff) | |
| download | wireshark-5ae8c92aa0dfc70a1e76b8100702a285bc2638e4.tar.gz | |
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 'packaging/portableapps')
| -rw-r--r-- | packaging/portableapps/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packaging/portableapps/CMakeLists.txt b/packaging/portableapps/CMakeLists.txt index d401224aeb..38c428598d 100644 --- a/packaging/portableapps/CMakeLists.txt +++ b/packaging/portableapps/CMakeLists.txt @@ -57,13 +57,13 @@ macro( ADD_PORTABLEAPPS_PACKAGE_TARGET ) ) set_target_properties(portableapps_app_dir PROPERTIES FOLDER "Packaging") - #Build the PortableApps package. + # Build the PortableApps package. + # nsis_package_prep must be built prior to this. set (_portableapps_package ${CMAKE_BINARY_DIR}/packaging/portableapps/WiresharkPortable_$(VERSION).exe) add_custom_target(portableapps_package DEPENDS portableapps_app_dir ${_portableapps_package} - nsis_uninstaller ) set_target_properties(portableapps_package PROPERTIES FOLDER "Packaging") |