Update to version 2.6.0

Updates from 2.5.xx to 2.6.xx.
DynamoRIO · Sep 21, 2023 · 7e49a22 · 7e49a22
1 parent 77bbc00
commit 7e49a22
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 21 deletions.
diff --git a/.github/workflows/ci-package.yml b/.github/workflows/ci-package.yml
@@ -1,5 +1,5 @@
 # **********************************************************
-# Copyright (c) 2020-2022 Google, Inc.  All rights reserved.
+# Copyright (c) 2020-2023 Google, Inc.  All rights reserved.
 # **********************************************************
 
 # Dr. Memory: the memory debugger
@@ -87,7 +87,7 @@ jobs:
       # We only use a non-zero build # when making multiple manual builds in one day.
       run: |
         if test -z "${{ github.event.inputs.version }}"; then
-          export VERSION_NUMBER="2.5.$((`git log -n 1 --format=%ct` / (60*60*24)))"
+          export VERSION_NUMBER="2.6.$((`git log -n 1 --format=%ct` / (60*60*24)))"
           export PREFIX="cronbuild-"
         else
           export VERSION_NUMBER=${{ github.event.inputs.version }}
@@ -136,7 +136,7 @@ jobs:
         if test -z "${{ github.event.inputs.version }}"; then
           export PATCHLEVEL=$((`git log -n 1 --format=%ct` / (60*60*24)))
           export PATCHLEVEL=$(((PATCHLEVEL %200) + 56))
-          export VERSION_NUMBER="2.5.${PATCHLEVEL}"
+          export VERSION_NUMBER="2.6.${PATCHLEVEL}"
           export PREFIX="cronbuild-"
         else
           export VERSION_NUMBER=${{ github.event.inputs.version }}
@@ -187,7 +187,7 @@ jobs:
       # XXX: See x86 job comments on sharing the default ver# with CMakeLists.txt.
       run: |
         if test -z "${{ github.event.inputs.version }}"; then
-          export VERSION_NUMBER="2.5.$((`git log -n 1 --format=%ct` / (60*60*24)))"
+          export VERSION_NUMBER="2.6.$((`git log -n 1 --format=%ct` / (60*60*24)))"
           export PREFIX="cronbuild-"
         else
             export VERSION_NUMBER=${{ github.event.inputs.version }}
@@ -253,10 +253,10 @@ jobs:
       # XXX: See x86 job comments on sharing the default ver# with CMakeLists.txt.
       run: |
         if test -z "${{ github.event.inputs.version }}"; then
-          export VERSION_NUMBER="2.5.$((`git log -n 1 --format=%ct` / (60*60*24)))"
+          export VERSION_NUMBER="2.6.$((`git log -n 1 --format=%ct` / (60*60*24)))"
           export OSX_PATCHLEVEL=$((`git log -n 1 --format=%ct` / (60*60*24)))
           export OSX_PATCHLEVEL=$(((OSX_PATCHLEVEL % 200) + 56))
-          export OSX_VERSION_NUMBER="2.5.${OSX_PATCHLEVEL}"
+          export OSX_VERSION_NUMBER="2.6.${OSX_PATCHLEVEL}"
           export PREFIX="cronbuild-"
         else
           export VERSION_NUMBER=${{ github.event.inputs.version }}

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -229,7 +229,7 @@ endif (APPLE)
 
 # N.B.: When updating this, update all instances in .github/workflows/ci-package.yml.
 # We should find a way to share (xref DRi#1565).
-set(VERSION_NUMBER_DEFAULT "2.5.${VERSION_NUMBER_PATCHLEVEL}")
+set(VERSION_NUMBER_DEFAULT "2.6.${VERSION_NUMBER_PATCHLEVEL}")
 # Do not store the default TOOL_VERSION_NUMBER in the cache to prevent a stale one
 # from preventing future version updates in a pre-existing build dir.
 # Avoid "VERSION_NUMBER" name since conflics w/ DR's var.
@@ -812,7 +812,7 @@ else ()
 endif ()
 
 # when updating this, also update the git submodule
-set(DynamoRIO_VERSION_REQUIRED "8.0.18915")
+set(DynamoRIO_VERSION_REQUIRED "10.0.0")
 
 set(DR_install_dir "dynamorio")
 

diff --git a/drmemory/docs/download.dox b/drmemory/docs/download.dox
@@ -1,5 +1,5 @@
 /* **********************************************************
- * Copyright (c) 2010-2021 Google, Inc.  All rights reserved.
+ * Copyright (c) 2010-2023 Google, Inc.  All rights reserved.
  * **********************************************************/
 
 /* Dr. Memory: the memory debugger
@@ -32,25 +32,25 @@ For more recent bug fixes and features prior to the next official release, [week
 
 Official Dr. Memory packages are hosted as [GitHub releases](https://github.com/DynamoRIO/drmemory/releases).
 
-The [2.5.0 release](https://github.com/DynamoRIO/drmemory/releases/tag/release_2.5.0):
+The [2.6.0 release](https://github.com/DynamoRIO/drmemory/releases/tag/release_2.6.0):
 
-  - [Dr. Memory installer for Windows (DrMemory-Windows-2.5.0.msi)](https://github.com/DynamoRIO/drmemory/releases/download/release_2.5.0/DrMemory-Windows-2.5.0.msi)
+  - [Dr. Memory installer for Windows (DrMemory-Windows-2.6.0.msi)](https://github.com/DynamoRIO/drmemory/releases/download/release_2.6.0/DrMemory-Windows-2.6.0.msi)
 
-  - [Dr. Memory zip file for portable/local installation on Windows (DrMemory-Windows-2.5.0.zip)](https://github.com/DynamoRIO/drmemory/releases/download/release_2.5.0/DrMemory-Windows-2.5.0.zip)
+  - [Dr. Memory zip file for portable/local installation on Windows (DrMemory-Windows-2.6.0.zip)](https://github.com/DynamoRIO/drmemory/releases/download/release_2.6.0/DrMemory-Windows-2.6.0.zip)
 
-  - [Dr. Memory for Linux (DrMemory-Linux-2.5.0.tar.gz)](https://github.com/DynamoRIO/drmemory/releases/download/release_2.5.0/DrMemory-Linux-2.5.0.tar.gz)
+  - [Dr. Memory for Linux (DrMemory-Linux-2.6.0.tar.gz)](https://github.com/DynamoRIO/drmemory/releases/download/release_2.6.0/DrMemory-Linux-2.6.0.tar.gz)
 
-  - [Dr. Memory for Mac -- alpha release (DrMemory-MacOS-2.5.0.tar.gz)](https://github.com/DynamoRIO/drmemory/releases/download/release_2.5.0/DrMemory-MacOS-2.5.0.tar.gz)
+  - [Dr. Memory for Mac -- alpha release (DrMemory-MacOS-2.6.0.tar.gz)](https://github.com/DynamoRIO/drmemory/releases/download/release_2.6.0/DrMemory-MacOS-2.6.0.tar.gz)
 
-The prior [2.4.0 release](https://github.com/DynamoRIO/drmemory/releases/tag/release_2.4.0):
+The prior [2.5.0 release](https://github.com/DynamoRIO/drmemory/releases/tag/release_2.5.0):
 
-  - [Dr. Memory installer for Windows (DrMemory-Windows-2.4.0-2.msi)](https://github.com/DynamoRIO/drmemory/releases/download/release_2.4.0/DrMemory-Windows-2.4.0-2.msi)
+  - [Dr. Memory installer for Windows (DrMemory-Windows-2.5.0-2.msi)](https://github.com/DynamoRIO/drmemory/releases/download/release_2.5.0/DrMemory-Windows-2.5.0-2.msi)
 
-  - [Dr. Memory zip file for portable/local installation on Windows (DrMemory-Windows-2.4.0-2.zip)](https://github.com/DynamoRIO/drmemory/releases/download/release_2.4.0/DrMemory-Windows-2.4.0-2.zip)
+  - [Dr. Memory zip file for portable/local installation on Windows (DrMemory-Windows-2.5.0-2.zip)](https://github.com/DynamoRIO/drmemory/releases/download/release_2.5.0/DrMemory-Windows-2.5.0-2.zip)
 
-  - [Dr. Memory for Linux (DrMemory-Linux-2.4.0-2.tar.gz)](https://github.com/DynamoRIO/drmemory/releases/download/release_2.4.0/DrMemory-Linux-2.4.0-2.tar.gz)
+  - [Dr. Memory for Linux (DrMemory-Linux-2.5.0-2.tar.gz)](https://github.com/DynamoRIO/drmemory/releases/download/release_2.5.0/DrMemory-Linux-2.5.0-2.tar.gz)
 
-  - [Dr. Memory for Mac -- alpha release (DrMemory-MacOS-2.4.0-2.tar.gz)](https://github.com/DynamoRIO/drmemory/releases/download/release_2.4.0/DrMemory-MacOS-2.4.0-2.tar.gz)
+  - [Dr. Memory for Mac -- alpha release (DrMemory-MacOS-2.5.0-2.tar.gz)](https://github.com/DynamoRIO/drmemory/releases/download/release_2.5.0/DrMemory-MacOS-2.5.0-2.tar.gz)
 
 # Tutorials and talks
 

diff --git a/drmemory/docs/release.dox b/drmemory/docs/release.dox
@@ -1,5 +1,5 @@
 /* **********************************************************
- * Copyright (c) 2010-2021 Google, Inc.  All rights reserved.
+ * Copyright (c) 2010-2023 Google, Inc.  All rights reserved.
  * Copyright (c) 2009-2010 VMware, Inc.  All rights reserved.
  * **********************************************************/
 
@@ -60,7 +60,10 @@ The Dr. Memory distribution contains the following:
 \section sec_changes Changes Since Prior Releases
 
 The current version is \TOOL_VERSION.
-The changes between \TOOL_VERSION and version 2.4.0 include:
+The changes between \TOOL_VERSION and version 2.5.0 include:
+ - Added glibc 2.34+ support on Linux.
+
+The changes between 2.5.0 and version 2.4.0 include:
  - Added better callstack walking on Linux via -callstack_use_unwind which
    is on by default.