Commit Graph

13 Commits

Author SHA1 Message Date
João Valverde b52d9173f8 Remove version component from plugin path
Remove the major.minor version from the plugin path, i.e:
    lib/plugins/X.Y/{epan,wiretap,codecs}
and use an unversioned path:
    lib/plugins/{epan,wiretap,codecs}

Introduce a new naming policy for plugins that requires
name.so.ABI_VERSION.

This is a simplified filesystem layoutfor plugins some
important benefits such as:

 * improves compatibility between Wireshark versions, because
a plugin that wasn't recompiled will be automatically picked
up, but only if it has a compatible ABI version in the file name.
 * does not clash with Apple guidelines
 * simpler for users to understand and apply
 * just overall simpler and easier to maintain, removes a lot
of complexity from CMake code

It does impose more requirements on the plugin naming scheme
but this should be handled completely transparently
by the build system.

It would also be possible to add support for unversioned *.so file
extensions at the same time, although in ths case it is not possible
to support multiple Wireshark ABI versions with only *.so, of course.
This wasn't done here but it may or may not be a useful enhancement
in the future.

Follow-up to 90b16b4092.
2023-12-14 14:28:30 +00:00
Gerald Combs 18b5564537 Docs: Move the FAQ to the doc directory 2023-10-21 15:05:07 -07:00
Gerald Combs 049a89b2ce CMake+Windows: Use "x64" instead of "win64"
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.
2023-06-10 21:41:27 +00:00
João Valverde 3f348f5cac CMake: Update some options
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.
2023-06-06 11:23:34 +00:00
João Valverde 6aa0490fdc CMake+NSIS: Allow building an unsigned installer 2023-06-05 10:59:11 +01:00
João Valverde 42d7a9fa40 CMake: Remove duplicate npcap/usbpcap version vars 2023-05-31 08:03:37 +00:00
João Valverde 9237d3777d NSIS: Make Lua optional
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.
2023-05-29 11:39:22 +01:00
João Valverde 4d39bdb942 NSIS: Make some components optional
Make components that depend on optional external dependencies
optional to build NSIS.

Ping #19108
2023-05-29 01:12:04 +00:00
João Valverde 07825e634e NSIS: Make command line portable across platforms
Use -option instead of /option. This will also work on Windows.
The reverse is not true for Linux.

Ping #19108
2023-05-29 01:12:04 +00:00
Gerald Combs fb1b022922 Packaging: Change our Windows installer filename format
Switch to Wireshark-<version>-{x64,arm64}.{exe,msi}.
2023-05-23 20:05:39 +00:00
Gerald Combs 5d61db3ad5 CMake+NSIS: More variable cleanup. 2022-06-07 18:24:59 -07:00
Gerald Combs c5e265f852 CMake: Deduplicate some version variables.
Use PROJECT_VERSION instead of VERSION. Prepend "PROJECT_" or
"LOG_PROJECT_" as needed to other variables. Remove the leftover unused
variables.
2022-06-07 16:04:17 -07:00
Gerald Combs 8c7e3f0d30 Packaging: Add a Logwolf NSIS config.
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.
2022-06-03 21:24:21 +00:00