diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2016-06-21 15:31:39 +0200 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-06-22 23:57:01 +0000 |
| commit | 63027fce6e11e645865607cf4124eb8cfb4c3609 (patch) | |
| tree | 4fe397e04757635d2b09f1fc5dbce83a82975f57 | |
| parent | a9a306f0a1fa09cb3f5e72f17524885cd5bf6d95 (diff) | |
| download | wireshark-63027fce6e11e645865607cf4124eb8cfb4c3609.tar.gz | |
Windows: rename wiretap-${PROJECT_VERSION}.dll to libwiretap.dll
This aligns the name with what is done for other Wireshark shared libraries.
Moreover it allows to compile a wiretap plugin once per major release, without
the need to recompile it each time ${PROJECT_VERSION} changes (each nightly
build / official release).
Change-Id: I53c82277223a4f323079cf695168ac85c2fba523
Reviewed-on: https://code.wireshark.org/review/16058
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
| -rw-r--r-- | image/wiretap.rc.in | 2 | ||||
| -rw-r--r-- | packaging/nsis/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | packaging/nsis/config.nsh.in | 1 | ||||
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 2 | ||||
| -rw-r--r-- | packaging/wix/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | packaging/wix/ComponentGroups.wxi | 2 | ||||
| -rw-r--r-- | wiretap/CMakeLists.txt | 4 |
7 files changed, 4 insertions, 12 deletions
diff --git a/image/wiretap.rc.in b/image/wiretap.rc.in index a006eff1a2..094edc55a4 100644 --- a/image/wiretap.rc.in +++ b/image/wiretap.rc.in @@ -22,7 +22,7 @@ BEGIN VALUE "FileVersion", "@VERSION@\0" VALUE "InternalName", "wiretap @VERSION@\0" VALUE "LegalCopyright", "Copyright © 2000 Gerald Combs <gerald@wireshark.org>, Gilbert Ramirez <gram@alumni.rice.edu> and others\0" - VALUE "OriginalFilename", "wiretap-@VERSION@.dll\0" + VALUE "OriginalFilename", "libwiretap.dll\0" VALUE "ProductName", "Wireshark\0" VALUE "ProductVersion", "@VERSION@\0" END diff --git a/packaging/nsis/CMakeLists.txt b/packaging/nsis/CMakeLists.txt index 00e920c72b..7ecb927dd8 100644 --- a/packaging/nsis/CMakeLists.txt +++ b/packaging/nsis/CMakeLists.txt @@ -69,8 +69,6 @@ string(REPLACE "_" "." PCAP_DISPLAY_VERSION "${WINPCAP_PACKAGE_VERSION}") set(USBPCAP_DISPLAY_VERSION "1.1.0.0-g794bf26-3") set(PRODUCT_VERSION ${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT_PATCH_VERSION}.${PROJECT_BUILD_VERSION}) -# XXX Shouldn't this reflect the API / ABI version? -set(WTAP_VERSION ${PROJECT_VERSION}) # To do: # - Sync the various version names between CMake and NSIS. diff --git a/packaging/nsis/config.nsh.in b/packaging/nsis/config.nsh.in index 827aa88f32..0c5e7dee25 100644 --- a/packaging/nsis/config.nsh.in +++ b/packaging/nsis/config.nsh.in @@ -22,7 +22,6 @@ !define VERSION_MINOR 0 !endif !define PRODUCT_VERSION @PRODUCT_VERSION@ -!define WTAP_VERSION @WTAP_VERSION@ !define MSVCR_DLL "@MSVCR_DLL@" !define VCREDIST_EXE "@VCREDIST_EXE@" diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index cbb9439cf6..33d300d530 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -353,7 +353,7 @@ SetShellVarContext all SetOutPath $INSTDIR File "${STAGING_DIR}\${UNINSTALLER_NAME}" -File "${STAGING_DIR}\wiretap-${WTAP_VERSION}.dll" +File "${STAGING_DIR}\libwiretap.dll" !ifdef ENABLE_LIBWIRESHARK File "${STAGING_DIR}\libwireshark.dll" !endif diff --git a/packaging/wix/CMakeLists.txt b/packaging/wix/CMakeLists.txt index 1f8281e20c..ed9f035a9c 100644 --- a/packaging/wix/CMakeLists.txt +++ b/packaging/wix/CMakeLists.txt @@ -93,8 +93,6 @@ string(REPLACE "_" "." PCAP_DISPLAY_VERSION "${WINPCAP_PACKAGE_VERSION}") set(USBPCAP_DISPLAY_VERSION "1.1.0.0-g794bf26-3") set(PRODUCT_VERSION ${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT_PATCH_VERSION}.${PROJECT_BUILD_VERSION}) -# XXX Shouldn't this reflect the API / ABI version? -set(WTAP_VERSION ${PROJECT_VERSION}) # To do: # - Sync the various version names between CMake and Wix. @@ -300,7 +298,6 @@ set(WIX_CANDLE_DEFINES -dPlatform=${TARGET_MACHINE} -dWiresharkName=${CMAKE_PROJECT_NAME} -dWiresharkVersion=${PRODUCT_VERSION} - -dWiretapVersion=${WTAP_VERSION} -dAssetDir=${CMAKE_SOURCE_DIR}/packaging/wix -dBuildOutputDir=${EXECUTABLE_OUTPUT_PATH}/${CMAKE_BUILD_TYPE} -dVCRedistVersion=${MSVC_CRT_VERSION} diff --git a/packaging/wix/ComponentGroups.wxi b/packaging/wix/ComponentGroups.wxi index 0013a62c3e..db057e2efc 100644 --- a/packaging/wix/ComponentGroups.wxi +++ b/packaging/wix/ComponentGroups.wxi @@ -19,7 +19,7 @@ <Fragment> <DirectoryRef Id="INSTALLFOLDER"> <Component Id="cmpWiretap_dll" Guid="*"> - <File Id="filWiretap_dll" KeyPath="yes" Source="$(var.Staging.Dir)\wiretap-$(var.WiretapVersion).dll" /> + <File Id="filWiretap_dll" KeyPath="yes" Source="$(var.Staging.Dir)\libwiretap.dll" /> </Component> <?ifdef ENABLE_LIBWIRESHARK?> <Component Id="cmpLibwireshark_dll" Guid="*"> diff --git a/wiretap/CMakeLists.txt b/wiretap/CMakeLists.txt index 60c8a1e349..871b05f00f 100644 --- a/wiretap/CMakeLists.txt +++ b/wiretap/CMakeLists.txt @@ -119,14 +119,12 @@ add_dependencies(wiretap version) set(FULL_SO_VERSION "0.0.0") set_target_properties(wiretap PROPERTIES + PREFIX "lib" COMPILE_DEFINITIONS "WS_BUILD_DLL" LINK_FLAGS "${WS_LINK_FLAGS}" VERSION ${FULL_SO_VERSION} SOVERSION 0 FOLDER "DLLs" ) -IF(MSVC) - set_target_properties(wiretap PROPERTIES OUTPUT_NAME "wiretap-${PROJECT_VERSION}") -ENDIF() if(ENABLE_APPLICATION_BUNDLE) set_target_properties(wiretap PROPERTIES |