Skip to content

Commit ec2822d

Browse files
committed
update patch 0008
1 parent 299af1f commit ec2822d

File tree

1 file changed

+13
-4
lines changed

1 file changed

+13
-4
lines changed

patches/0008-Append-arduino-to-version-string.patch

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/CMakeLists.txt b/CMakeLists.txt
2-
index 95c89d2..4b8c739 100644
2+
index 9ab5a832..c3b5d8a8 100644
33
--- a/CMakeLists.txt
44
+++ b/CMakeLists.txt
5-
@@ -42,7 +42,7 @@ include(FindPackageMessage)
5+
@@ -49,7 +49,7 @@ include(FindPackageMessage)
66
include(GNUInstallDirs)
77

88
set(CONFIG_DIR "${CMAKE_INSTALL_FULL_SYSCONFDIR}")
@@ -11,15 +11,24 @@ index 95c89d2..4b8c739 100644
1111

1212
# =====================================
1313
# Get Git commit info
14+
@@ -91,7 +91,7 @@ if(Git_FOUND)
15+
16+
# If the commit is not tagged, include the date and commit hash in the full version string.
17+
if(NOT GIT_COMMIT_HASH STREQUAL GIT_TAG_HASH)
18+
- set(AVRDUDE_FULL_VERSION "${CMAKE_PROJECT_VERSION}-${GIT_COMMIT_DATE} (${GIT_COMMIT_HASH})")
19+
+ set(AVRDUDE_FULL_VERSION "ARDUINO_VERSION_PLACEHOLDER-${GIT_COMMIT_DATE} (${GIT_COMMIT_HASH})")
20+
endif()
21+
endif()
22+
1423
diff --git a/src/configure.ac b/src/configure.ac
15-
index ae60e3f..32fb196 100644
24+
index 4b8425f0..2282ed74 100644
1625
--- a/src/configure.ac
1726
+++ b/src/configure.ac
1827
@@ -23,7 +23,7 @@
1928
# Process this file with autoconf to produce a configure script.
2029

2130
AC_PREREQ(2.60)
22-
-AC_INIT(avrdude, 7.1, [email protected])
31+
-AC_INIT(avrdude, 7.2, [email protected])
2332
+AC_INIT(avrdude, ARDUINO_VERSION_PLACEHOLDER, [email protected])
2433

2534
AC_CANONICAL_BUILD

0 commit comments

Comments
 (0)