| Age | Commit message (Collapse) | Author | Files | Lines |
|---|
|
Merge the uninstall sections into logray.nsi, similar to wireshark.nsi.
Make a bunch of sections hidden + mandatory. Fix some miscellaneous
issues.
|
|
Update our minimum Windows version in various places, including the NSIS
and WiX installers.
Fixes #19569
|
|
|
|
Update some variables to match 800831cab2 and 652b6b186f.
|
|
|
|
This is a copy of MR #9330 all code and credit to Omer Shapira.
|
|
Instead of having a global init.lua in datafile_dir that may
contain library code, load the init.lua script from the plugins
directories, similar to other Lua scripts, but guaranteed to
be the first one loaded.
This is consistent with our practice and avoids overwriting the
customizable share/wireshark/init.lua with each instalation or
upgrade.
It also should allow using package.path correctly (which does
not include the configuration directory).
The init.lua in the configuration directory is still loaded for
backward compatibility. It generates a warning in the console.
|
|
Remove Lua script in preparation of moving this to the Qt UI.
|
|
Add Lua 5.1 support for the new IO Console Dialog. Remove the
obsolete console.lua file.
|
|
Remove bundled dtd_gen.lua script. It has never been enabled.
Remove it as part of a policy to remove dead code.
Currently it breaks with a runtime error. I did not investigate
the root cause.
|
|
Add a script that launches Chrome or Firefox with SSLKEYLOG set.
|
|
Use "x64" to refer to "Windows running on 64-bit Intel processors". Get
rid of WIRESHARK_TARGET_PROCESSOR_ARCHITECTURE in favor of
WIRESHARK_TARGET_PLATFORM because the latter is shorter.
|
|
Introduce a MINGW_SYSROOT cache variable and --sysroot Python
script option so the installer can be built in other
distributions that do not use Fedora's layout.
Add a few other DLLs and use some shell globs, tested on an
Arch Linux host.
The dependency list should be generated dynamically but we're not
there yet.
|
|
|
|
Try to autodetect ENABLE_SIGNED_NSIS and enable it if
sign-wireshark.bat is detected on the path.
Instead of skipping the whole Qt deployment, including things like
translations, just skip the DLLs in the manifest. This is useful
if the target machine has Qt installed and the static DLL list
for cross-compiling is not adequate.
|
|
We remove the workaround for signing an installer that requires
creating an installer that just exists to write an uninstaller
and use WriteUninstaller instead to generate the installer.
This is done at install time. This method allows the uninstaller
to be created portably, namely using Linux.
To add back the signing aspect, including for Windows, we need
to use !uninstfinalize. This changes the compiler to generate
the installer at compile time and is also a portable method of
signing code. The code signing script will have to be platform
specific. This is called by the NSIS compiler using system()
and must be a batch file on Windows. The code assumes a script
named 'sign-wireshark.bat' exists on the path to sign the
executables.
An example of a sign.bat script would be:
signtool sign /f c:\path\to\MySPC.pfx /t http://[insert timestamp URL] /fd sha256 %1
This is also a nice simplification of the build procedure for NSIS.
The !uninstfinalize stanza requires NSIS 3.08.
|
|
|
|
Deploy Qt DLLs when cross compiling using MinGW and Fedora Linux.
Currently the DLLs are read from a text file because windeployqt
in not available when cross-compiling from Linux.
The windeployqt-to-nsis.py script is modified to accept a text file
static mapping instead of invoking windeployqt.
We need to manually copy the Qt translation files, a task that
is also usually performed by windeployqt.
Fix some missing MinGW DLL dependencies (opus, winpthread).
|
|
Move wireshark-qt-manifest.nsh back to WIRESHARK_NSIS_GENERATED_FILES,
which ensures that a rule for it gets created.
|
|
Allow building an NSIS installer without Lua.
Restore the use of STAGING_DIR instead of TOP_SRC_DIR, to
keep to the pre-existing logic.
Remove a duplicate line.
|
|
Use a static list to copy required system DLLs to the binary
installer. We may want to make this list dynamic, by running
peldd for example.
Ping #19108
|
|
Qt deployment does not work because windeployqt cannot be run
when cross compiling (unless Wine is used). Skip this step until
other solutions are investigated and this is fixed. This means
that the target system must have the Qt Windows SDK installed with
MinGW binaries.
Also skip crreating an installer. Has somewhat complicated requirements
for signing that currently don't work when cross-compiling.
This allows building a usable NSIS Windows installer from Fedora,
with the limitations mentioned above.
Ping #19108
|
|
Use -option instead of /option. This will also work on Windows.
The reverse is not true for Linux.
Ping #19108
|
|
Now that 6.5.1 is released, remove the work-around but keep the
warning.
|
|
Use FindPython3.cmake instead of the deprecated FindPythonInterp.cmake,
to make sure we actually find Python3.
Don't use the module with MSYS2 because it is buggy and exhibits broken
behaviour.
Run it earlier in the configuration, just as a precaution, so other
indirect calls to find python don't happen earlier.
|
|
These binaries are required to build an NSIS installer. Download
them using CMake instead. This avoids a dependency on win-setup.ps1,
that gets in the way using MSYS2.
|
|
This reverts commit d6380e7ae40ec53cbd9119e9527546656f82d660.
Turns out we were unwittingly still using FindPythonInterp
instead of FindPython3.cmake, via LocatePythonModule.cmake,
nd this commit actually enabled FindPython3.cmake. Also turns
out FindPython3.cmake is far too clever and very buggy with MSYS2.
It will usually not find the correct python binary and fail in many
suprising ways, depending on which combination of Python Windows
installations is present.
|
|
|
|
Switch to Wireshark-<version>-{x64,arm64}.{exe,msi}.
|
|
This changes the existing code for the MSVC installer as little
as possible to allow building the Wireshark .exe Windows installer
using the MinGW-w64 toolchain.
Currently the DLL dependency list is static, this may change in
the future. Ideally we would use CPack and install() logic
to copy the DLLs.
The msys2checkdeps.py script is copied from the Inkscape project[1].
It doesn't have a specific license identifier. The Inkscape project
is licensed under the GPL version 2 or later.
TODO: Download Npcap and USBPcap using CMake instead of requiring
manual action.
[1]https://gitlab.com/inkscape/inkscape
Ping #17771.
|
|
|
|
|
|
This reverts commit 8b55d7c662b4f8cdda3aec3ece2c739e2ab7d557.
Let's revert due to https://github.com/nmap/npcap/issues/668
|
|
|
|
Remove bundled code and use vcpkg binary library instead.
|
|
|
|
|
|
|
|
Switch to the name "Logray" for the log analyzer. Rays are biological
cousins of sharks and more people like the name "Logray" in a completely
unscientific survey here. Apologies for any inconvenience this might
cause.
|
|
|
|
Create Logwolf-specific copies of the various Wireshark NSIS config files
and modify them to install and uninstall Logwolf. There are still a bunch
of rough edges, but the installer works for a test capture I have here.
|
|
Rename the following build targets, similar to the recent macOS target
name changes:
nsis_package_prep to wireshark_nsis_prep
nsis_package to wireshark_nsis
Rename some NSIS files to reflect that they're specific to Wireshark.
Update the documentation and CI configurations.
|
|
Make sure the file we attempt to execute is the one we include with
our installer. Fixes #17893.
|
|
Update the NSIS and WiX CMakeLists for Visual Studio 2022.
|
|
For various commands, make sure we show warnings and errors, but not
other extraneous information such as filenames.
|
|
|
|
|
|
|
|
|
|
Switch from HTML Help to plain HTML files. In the NSIS and WiX installers,
place the help assets in a directory with a friendly name.
|
