forked from osmocom/wireshark
CMake: Update WiX and PortableApps target names.
Rename the wix_package target to wireshark_wix and the portableapps_package target to wireshark_portableapps.
This commit is contained in:
parent
de1a4c3774
commit
bbe6ab6316
|
@ -335,13 +335,13 @@ Win64 Package:
|
|||
- msbuild /verbosity:minimal "/consoleloggerparameters:PerformanceSummary;NoSummary" /maxcpucount Wireshark.sln
|
||||
- msbuild /verbosity:minimal /maxcpucount test-programs.vcxproj
|
||||
- msbuild /verbosity:minimal /maxcpucount wireshark_nsis_prep.vcxproj
|
||||
- msbuild /verbosity:minimal /maxcpucount wix_package_prep.vcxproj
|
||||
- msbuild /verbosity:minimal /maxcpucount wireshark_wix_prep.vcxproj
|
||||
- C:\gitlab-builds\bin\sign-files.ps1 -Recurse -Path run\RelWithDebInfo
|
||||
- msbuild /verbosity:minimal wireshark_nsis.vcxproj
|
||||
- C:\gitlab-builds\bin\sign-files.ps1 -Path packaging\nsis
|
||||
- msbuild /verbosity:minimal wix_package.vcxproj
|
||||
- msbuild /verbosity:minimal wireshark_wix.vcxproj
|
||||
- C:\gitlab-builds\bin\sign-files.ps1 -Path packaging\wix
|
||||
- msbuild /verbosity:minimal portableapps_package.vcxproj
|
||||
- msbuild /verbosity:minimal wireshark_portableapps.vcxproj
|
||||
- C:\gitlab-builds\bin\sign-files.ps1 -Path packaging\portableapps
|
||||
- $plugins = Get-ChildItem run\RelWithDebInfo\plugins\*\*.dll ; signtool verify /q /pa /all run\RelWithDebInfo\*.exe run\RelWithDebInfo\extcap\*.exe $plugins run\RelWithDebInfo\libwireshark.dll run\RelWithDebInfo\libwiretap.dll run\RelWithDebInfo\libwsutil.dll packaging\nsis\Wireshark-win??-*.exe packaging\wix\Wireshark-win??-*.msi packaging\portableapps\WiresharkPortable??_*.paf.exe
|
||||
- msbuild /verbosity:minimal pdb_zip_package.vcxproj
|
||||
|
|
|
@ -15,9 +15,7 @@
|
|||
# packages. We don't do that because a) we're large and b) we build
|
||||
# our 32-bit and 64-bit packages independently in separate pipelines.
|
||||
|
||||
if(WIRESHARK_TARGET_PLATFORM STREQUAL "win32")
|
||||
set(PORTABLEAPPS_BITS 32)
|
||||
elseif(WIRESHARK_TARGET_PLATFORM STREQUAL "win64")
|
||||
if(WIRESHARK_TARGET_PLATFORM STREQUAL "win64")
|
||||
set(PORTABLEAPPS_BITS 64)
|
||||
else()
|
||||
message(FATAL_ERROR "Your mysterious moon-man architecture \"${WIRESHARK_TARGET_PLATFORM}\" frightens and confuses us.")
|
||||
|
@ -43,51 +41,51 @@ set(PORTABLEAPPS_DIRS
|
|||
|
||||
macro( ADD_PORTABLEAPPS_PACKAGE_TARGET )
|
||||
# Copy our binaries, libraries, and data files to the PortableApps build directory.
|
||||
set(_portableapps_app_dir "${PORTABLEAPPS_LAUNCHER_STAGING_DIR}/App/${CMAKE_PROJECT_NAME}")
|
||||
file(TO_NATIVE_PATH "${_portableapps_app_dir}" _portableapps_app_dir_native)
|
||||
set(_wireshark_portableapps_app_dir "${PORTABLEAPPS_LAUNCHER_STAGING_DIR}/App/${CMAKE_PROJECT_NAME}")
|
||||
file(TO_NATIVE_PATH "${_wireshark_portableapps_app_dir}" _wireshark_portableapps_app_dir_native)
|
||||
file(TO_NATIVE_PATH "${DATAFILE_DIR}" _datafile_dir_native)
|
||||
file(TO_NATIVE_PATH "${CMAKE_SOURCE_DIR}/packaging/portableapps/xcopy-deploy-exclude.txt" _xcopy_deploy_exclude)
|
||||
|
||||
add_custom_target(portableapps_app_dir
|
||||
add_custom_target(wireshark_portableapps_app_dir
|
||||
# We "Deploy using XCopy," which is described at
|
||||
# https://docs.microsoft.com/en-us/previous-versions/visualstudio/visual-studio-2008/ms235291(v=vs.90)
|
||||
# We also assume that the project has been built at this point.
|
||||
COMMAND ${CMAKE_COMMAND} -E remove_directory ${_portableapps_app_dir}
|
||||
COMMAND ${CMAKE_COMMAND} -E make_directory ${_portableapps_app_dir}
|
||||
COMMAND xcopy ${_datafile_dir_native} ${_portableapps_app_dir_native} /D /I /E /Y /exclude:${_xcopy_deploy_exclude}
|
||||
COMMAND ${CMAKE_COMMAND} -E remove_directory ${_wireshark_portableapps_app_dir}
|
||||
COMMAND ${CMAKE_COMMAND} -E make_directory ${_wireshark_portableapps_app_dir}
|
||||
COMMAND xcopy ${_datafile_dir_native} ${_wireshark_portableapps_app_dir_native} /D /I /E /Y /exclude:${_xcopy_deploy_exclude}
|
||||
)
|
||||
|
||||
set_target_properties(portableapps_app_dir PROPERTIES
|
||||
set_target_properties(wireshark_portableapps_app_dir PROPERTIES
|
||||
FOLDER "Packaging"
|
||||
EXCLUDE_FROM_DEFAULT_BUILD True
|
||||
)
|
||||
|
||||
if(MSVCR_DLL)
|
||||
add_custom_target(portableapps_runtime
|
||||
COMMAND xcopy "${MSVCR_DLL}" ${_portableapps_app_dir_native} /D /I /Y
|
||||
add_custom_target(wireshark_portableapps_runtime
|
||||
COMMAND xcopy "${MSVCR_DLL}" ${_wireshark_portableapps_app_dir_native} /D /I /Y
|
||||
)
|
||||
else(MSVCR_DLL)
|
||||
add_custom_target(portableapps_runtime
|
||||
add_custom_target(wireshark_portableapps_runtime
|
||||
COMMAND ${CMAKE_COMMAND} -E echo "C Runtime MUST be installed on target system."
|
||||
)
|
||||
endif(MSVCR_DLL)
|
||||
|
||||
set_target_properties(portableapps_runtime PROPERTIES
|
||||
set_target_properties(wireshark_portableapps_runtime PROPERTIES
|
||||
FOLDER "Packaging"
|
||||
EXCLUDE_FROM_DEFAULT_BUILD True
|
||||
)
|
||||
add_dependencies(portableapps_runtime portableapps_app_dir)
|
||||
add_dependencies(wireshark_portableapps_runtime wireshark_portableapps_app_dir)
|
||||
|
||||
# Build the PortableApps package.
|
||||
# wireshark_nsis_prep must be built prior to this.
|
||||
# XXX Rename this to wireshark_portableapps
|
||||
set (_portableapps_package ${CMAKE_BINARY_DIR}/packaging/portableapps/${PORTABLEAPPS_NAME}_${VERSION}.paf.exe)
|
||||
add_custom_target(portableapps_package
|
||||
add_custom_target(wireshark_portableapps
|
||||
DEPENDS
|
||||
portableapps_runtime
|
||||
wireshark_portableapps_runtime
|
||||
${_portableapps_package}
|
||||
)
|
||||
set_target_properties(portableapps_package PROPERTIES
|
||||
set_target_properties(wireshark_portableapps PROPERTIES
|
||||
FOLDER "Packaging"
|
||||
EXCLUDE_FROM_DEFAULT_BUILD True
|
||||
)
|
||||
|
|
|
@ -315,17 +315,17 @@ macro( ADD_WIX_PACKAGE_TARGET )
|
|||
)
|
||||
|
||||
# Build WiX package dependencies. We build the package in
|
||||
# two stages so that wix_package below doesn't trigger any
|
||||
# two stages so that wireshark_wix below doesn't trigger any
|
||||
# dependencies that might clobber any signed executables.
|
||||
# XXX Rename this to wireshark_wix_prep
|
||||
add_custom_target(wix_package_prep
|
||||
add_custom_target(wireshark_wix_prep
|
||||
DEPENDS
|
||||
${WIX_FILES}
|
||||
copy_data_files
|
||||
user_guide_html
|
||||
faq_html
|
||||
)
|
||||
set_target_properties(wix_package_prep PROPERTIES
|
||||
set_target_properties(wireshark_wix_prep PROPERTIES
|
||||
FOLDER "Packaging"
|
||||
EXCLUDE_FROM_DEFAULT_BUILD True
|
||||
)
|
||||
|
@ -334,7 +334,7 @@ macro( ADD_WIX_PACKAGE_TARGET )
|
|||
# ${CMAKE_CURRENT_SOURCE_DIR}/packaging/wix
|
||||
# Note that executables and DLLs *must* be built separately
|
||||
# XXX Rename this to wireshark_wix
|
||||
add_custom_target(wix_package
|
||||
add_custom_target(wireshark_wix
|
||||
COMMAND ${WIX_CANDLE_EXECUTABLE} ${WIX_CANDLE_DEFINES}
|
||||
$<$<CONFIG:Debug>:-dBUNDLE_DEBUG_DLLS>
|
||||
${WIX_SOURCE_FILES}
|
||||
|
@ -343,7 +343,7 @@ macro( ADD_WIX_PACKAGE_TARGET )
|
|||
COMMAND ${WIX_LIGHT_EXECUTABLE} ${WIX_LIGHT_DEFINES} ${WIX_OUT_FILES}
|
||||
WORKING_DIRECTORY ${_wix_binary_dir}
|
||||
)
|
||||
set_target_properties(wix_package PROPERTIES
|
||||
set_target_properties(wireshark_wix PROPERTIES
|
||||
FOLDER "Packaging"
|
||||
EXCLUDE_FROM_DEFAULT_BUILD True
|
||||
)
|
||||
|
|
|
@ -17,8 +17,8 @@ modifying a file (custom_mibs.txt, etc) for inclusion
|
|||
|
||||
. To build the WiX installer run:
|
||||
----
|
||||
> msbuild /m /p:Configuration=RelWithDebInfo wix_package_prep.vcxproj
|
||||
> msbuild /m /p:Configuration=RelWithDebInfo wix_package.vcxproj
|
||||
> msbuild /m /p:Configuration=RelWithDebInfo wireshark_wix_prep.vcxproj
|
||||
> msbuild /m /p:Configuration=RelWithDebInfo wireshark_wix.vcxproj
|
||||
----
|
||||
|
||||
== Known Issues
|
||||
|
|
Loading…
Reference in New Issue