gem5-dev@gem5.org

The gem5 Developer List

View all threads

[S] Change in gem5/gem5[develop]: misc: Revert gem5 versioning for develop branch

BB
Bobby Bruce (Gerrit)
Mon, Jun 20, 2022 7:56 PM

Bobby Bruce has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/60639 )

Change subject: misc: Revert gem5 versioning for develop branch
......................................................................

misc: Revert gem5 versioning for develop branch

Change-Id: I80cbfc766c71a3137a427d38da4f46b80cd39856
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/60639
Reviewed-by: Bobby Bruce bbruce@ucdavis.edu
Maintainer: Bobby Bruce bbruce@ucdavis.edu
Tested-by: kokoro noreply+kokoro@google.com

M src/Doxyfile
M src/base/version.cc
2 files changed, 15 insertions(+), 2 deletions(-)

Approvals:
Bobby Bruce: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass

diff --git a/src/Doxyfile b/src/Doxyfile
index a49de0f..83686f5 100644
--- a/src/Doxyfile
+++ b/src/Doxyfile
@@ -31,7 +31,7 @@

This could be handy for archiving the generated documentation or

if some version control system is used.

-PROJECT_NUMBER        = v22.0.0.1
+PROJECT_NUMBER        = DEVELOP-FOR-22.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 33b0fd0..c555244 100644
--- a/src/base/version.cc
+++ b/src/base/version.cc
@@ -32,6 +32,6 @@
/**

  • @ingroup api_base_utils
    */
    -const char *gem5Version = "22.0.0.1";
    +const char *gem5Version = "[DEVELOP-FOR-22.1]";

} // namespace gem5

--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/60639
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings

Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I80cbfc766c71a3137a427d38da4f46b80cd39856
Gerrit-Change-Number: 60639
Gerrit-PatchSet: 2
Gerrit-Owner: Bobby Bruce bbruce@ucdavis.edu
Gerrit-Reviewer: Bobby Bruce bbruce@ucdavis.edu
Gerrit-Reviewer: Jason Lowe-Power jason@lowepower.com
Gerrit-Reviewer: kokoro noreply+kokoro@google.com
Gerrit-MessageType: merged

Bobby Bruce has submitted this change. ( https://gem5-review.googlesource.com/c/public/gem5/+/60639 ) Change subject: misc: Revert gem5 versioning for develop branch ...................................................................... misc: Revert gem5 versioning for develop branch Change-Id: I80cbfc766c71a3137a427d38da4f46b80cd39856 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/60639 Reviewed-by: Bobby Bruce <bbruce@ucdavis.edu> Maintainer: Bobby Bruce <bbruce@ucdavis.edu> Tested-by: kokoro <noreply+kokoro@google.com> --- M src/Doxyfile M src/base/version.cc 2 files changed, 15 insertions(+), 2 deletions(-) Approvals: Bobby Bruce: Looks good to me, approved; Looks good to me, approved kokoro: Regressions pass diff --git a/src/Doxyfile b/src/Doxyfile index a49de0f..83686f5 100644 --- a/src/Doxyfile +++ b/src/Doxyfile @@ -31,7 +31,7 @@ # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = v22.0.0.1 +PROJECT_NUMBER = DEVELOP-FOR-22.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 33b0fd0..c555244 100644 --- a/src/base/version.cc +++ b/src/base/version.cc @@ -32,6 +32,6 @@ /** * @ingroup api_base_utils */ -const char *gem5Version = "22.0.0.1"; +const char *gem5Version = "[DEVELOP-FOR-22.1]"; } // namespace gem5 -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/60639 To unsubscribe, or for help writing mail filters, visit https://gem5-review.googlesource.com/settings Gerrit-Project: public/gem5 Gerrit-Branch: develop Gerrit-Change-Id: I80cbfc766c71a3137a427d38da4f46b80cd39856 Gerrit-Change-Number: 60639 Gerrit-PatchSet: 2 Gerrit-Owner: Bobby Bruce <bbruce@ucdavis.edu> Gerrit-Reviewer: Bobby Bruce <bbruce@ucdavis.edu> Gerrit-Reviewer: Jason Lowe-Power <jason@lowepower.com> Gerrit-Reviewer: kokoro <noreply+kokoro@google.com> Gerrit-MessageType: merged