From 1cfeab7359f24cc0fe2a5c08147a70346167a8f3 Mon Sep 17 00:00:00 2001 From: "Bobby R. Bruce" Date: Wed, 23 Jun 2021 11:35:23 -0700 Subject: [PATCH] misc: Revert version info back to develop Change-Id: I0afb7e18c66a829fe1f1f3330da3300c0d0eb99b Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/47160 Reviewed-by: Bobby R. Bruce Maintainer: Bobby R. Bruce Tested-by: kokoro --- ext/testlib/configuration.py | 2 +- src/Doxyfile | 2 +- src/base/version.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ext/testlib/configuration.py b/ext/testlib/configuration.py index 18bebdd946..1fffab46ff 100644 --- a/ext/testlib/configuration.py +++ b/ext/testlib/configuration.py @@ -213,7 +213,7 @@ def define_defaults(defaults): os.pardir, os.pardir)) defaults.result_path = os.path.join(os.getcwd(), 'testing-results') - defaults.resource_url = 'http://dist.gem5.org/dist/v21-0' + defaults.resource_url = 'http://dist.gem5.org/dist/develop' defaults.resource_path = os.path.abspath(os.path.join(defaults.base_dir, 'tests', 'gem5', diff --git a/src/Doxyfile b/src/Doxyfile index f8b481ec1a..a557e013f6 100644 --- a/src/Doxyfile +++ b/src/Doxyfile @@ -31,7 +31,7 @@ PROJECT_NAME = gem5 # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = v21.0.1.0 +PROJECT_NUMBER = DEVELOP-FOR-v21.1 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff --git a/src/base/version.cc b/src/base/version.cc index 4c0bebcc21..8fb6926dc3 100644 --- a/src/base/version.cc +++ b/src/base/version.cc @@ -29,5 +29,5 @@ /** * @ingroup api_base_utils */ -const char *gem5Version = "21.0.1.0"; +const char *gem5Version = "[DEVELOP-FOR-V21.01]";