diff --git a/.gitattributes b/.gitattributes
index d6e99cb389..23a4a3e1b2 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -5,5 +5,5 @@
.gitattributes export-ignore
.gitignore export-ignore
.gitreview export-ignore
-tools/make-version.pl export-subst
+tools/make-version.py export-subst
packaging/source/git-export-release.sh.in export-subst
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1bd87a0bc5..40bcdb4c13 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -143,7 +143,7 @@ variables:
- git config --global user.name "Your Name"
- mkdir build
- cd build
- - perl ../tools/make-version.pl --set-release
+ - python3 ../tools/make-version.py --set-release ..
- mv -v ../wireshark-*.tar.* .
artifacts:
paths:
@@ -185,7 +185,7 @@ Source Package:
stage: .pre
rules: !reference [.if-merged]
script:
- - perl ../tools/make-version.pl --set-release || ../perl make-version.pl --set-release
+ - python3 ../tools/make-version.py --set-release ..
- printf "\e[0Ksection_start:%s:cmake_section[collapsed=true]\r\e[0KRunning CMake" "$( date +%s)"
- cmake -G Ninja $CMAKE_ARGS -DENABLE_CCACHE=ON ..
- printf "\e[0Ksection_end:%s:cmake_section\r\e[0K" "$( date +%s)"
@@ -208,7 +208,7 @@ Debian Stable APT Package:
image: registry.gitlab.com/wireshark/wireshark-containers/debian-stable-dev
script:
- ln --symbolic --no-dereference --force packaging/debian
- - perl tools/make-version.pl --set-release
+ - python3 tools/make-version.py --set-release .
# Shared GitLab runners limit the log size to 4M, so reduce verbosity. See
# https://gitlab.com/gitlab-com/support-forum/issues/2790
- export DH_QUIET=1
@@ -330,7 +330,7 @@ Win64 Package:
- mkdir build
- cd build
script:
- - perl ../tools/make-version.pl --set-release
+ - python3 ../tools/make-version.py --set-release ..
- cmake -G "Visual Studio 17 2022" -A x64 -DUSE_qt6=ON -DENABLE_LTO=off ..
- msbuild /verbosity:minimal "/consoleloggerparameters:PerformanceSummary;NoSummary" /maxcpucount Wireshark.sln
- msbuild /verbosity:minimal /maxcpucount test-programs.vcxproj
@@ -366,7 +366,7 @@ macOS Arm Package:
- wireshark-macos-arm-package
retry: 1
script:
- - perl tools/make-version.pl --set-release
+ - python3 tools/make-version.py --set-release .
- mkdir build
- cd build
- printf "\e[0Ksection_start:%s:cmake_section[collapsed=true]\r\e[0KRunning CMake" "$( date +%s)"
@@ -400,7 +400,7 @@ macOS Intel Package:
script:
- export CMAKE_PREFIX_PATH=/usr/local/Qt-5.15.3
- export PATH="$PATH:$HOME/bin"
- - perl tools/make-version.pl --set-release
+ - python3 tools/make-version.py --set-release .
- mkdir build
- cd build
- printf "\e[0Ksection_start:%s:cmake_section[collapsed=true]\r\e[0KRunning CMake" "$( date +%s)"
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 643cf87573..534df8a313 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,7 +38,7 @@ endif()
project(${_project_name} C CXX)
-# Updated by tools/make-version.pl
+# Updated by tools/make-version.py
set(PROJECT_MAJOR_VERSION 3)
set(PROJECT_MINOR_VERSION 7)
set(PROJECT_PATCH_VERSION 2)
@@ -1715,8 +1715,8 @@ if(VCSVERSION_OVERRIDE)
else()
add_custom_target(vcs_version
BYPRODUCTS vcs_version.h
- COMMAND ${PERL_EXECUTABLE}
- ${CMAKE_SOURCE_DIR}/tools/make-version.pl
+ COMMAND ${PYTHON_EXECUTABLE}
+ ${CMAKE_SOURCE_DIR}/tools/make-version.py
${CMAKE_SOURCE_DIR}
)
set_target_properties(vcs_version PROPERTIES FOLDER "Auxiliary")
@@ -3582,8 +3582,8 @@ if(RPMBUILD_EXECUTABLE)
endif()
execute_process(
- COMMAND ${PERL_EXECUTABLE}
- ${CMAKE_SOURCE_DIR}/tools/make-version.pl
+ COMMAND ${PYTHON_EXECUTABLE}
+ ${CMAKE_SOURCE_DIR}/tools/make-version.py
${CMAKE_SOURCE_DIR}
)
diff --git a/appveyor.yml b/appveyor.yml
index f2709cdd4c..5003615552 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -38,7 +38,7 @@ build:
project: build\Wireshark.sln
before_build:
- - perl tools/make-version.pl --set-release --untagged-version-extra=-{vcsinfo}-AppVeyor --tagged-version-extra=-AppVeyor
+ - python3 tools/make-version.py --set-release --untagged-version-extra=-{vcsinfo}-AppVeyor --tagged-version-extra=-AppVeyor
- mkdir build
- cd build
- cmake -E time cmake -DCMAKE_SYSTEM_VERSION=10.0.20348.0 -G "%CMAKE_GENERATOR%" ..
diff --git a/docbook/developer-guide-docinfo.xml b/docbook/developer-guide-docinfo.xml
index 11320680ef..b7b8f5b230 100644
--- a/docbook/developer-guide-docinfo.xml
+++ b/docbook/developer-guide-docinfo.xml
@@ -1,6 +1,6 @@
-
+
For Wireshark 3.7
diff --git a/docbook/user-guide-docinfo.xml b/docbook/user-guide-docinfo.xml
index 70239c3bbb..30a938ee7f 100644
--- a/docbook/user-guide-docinfo.xml
+++ b/docbook/user-guide-docinfo.xml
@@ -1,6 +1,6 @@
-
+
For Wireshark 3.7