aboutsummaryrefslogtreecommitdiffstats
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2022-06-08 09:42:42 -0700
committerA Wireshark GitLab Utility <gerald+gitlab-utility@wireshark.org>2022-06-08 18:12:46 +0000
commitbbe6ab6316f30089860df84cf2ec2b9830f4d3fd (patch)
tree8aee39776b19136114e4985e1a1343693636ce07 /.gitlab-ci.yml
parentde1a4c377412c3977837aeb308bffc3b3259e722 (diff)
CMake: Update WiX and PortableApps target names.
Rename the wix_package target to wireshark_wix and the portableapps_package target to wireshark_portableapps.
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml6
1 files changed, 3 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c6c6345874..2f00e53f09 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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