Fix version to Jakarta 2020.330

gempa-jabe · gempa-jabe · commit c0648f42221c · 2020-11-26T12:04:07.000+01:00
diff --git a/doc/templates/conf.py b/doc/templates/conf.py
@@ -71,7 +71,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = 'Year.Day'
+version = '2020.330'
 # The full version, including alpha/beta/rc tags.
 release = 'Jakarta'
 
diff --git a/src/trunk/libs/seiscomp3/core/version.cpp b/src/trunk/libs/seiscomp3/core/version.cpp
@@ -45,11 +45,7 @@ FrameworkVersion CurrentVersion;
 
 
 FrameworkVersion::FrameworkVersion() {
-#ifdef WITH_GIT_REVISION
-	_text = std::string("Jakarta git-") + git_revision();
-#else
-	_text = std::string("Jakarta git-unknown");
-#endif
+	_text = "Jakarta 2020.330";
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@`
`71`	`71`	`# built documents.`
`72`	`72`	`#`
`73`	`73`	`# The short X.Y version.`
`74`		`-version = 'Year.Day'`
	`74`	`+version = '2020.330'`
`75`	`75`	`# The full version, including alpha/beta/rc tags.`
`76`	`76`	`release = 'Jakarta'`
`77`	`77`
Original file line number	Diff line number	Diff line change
`@@ -45,11 +45,7 @@ FrameworkVersion CurrentVersion;`
`45`	`45`
`46`	`46`
`47`	`47`	`FrameworkVersion::FrameworkVersion() {`
`48`		`-#ifdef WITH_GIT_REVISION`
`49`		`- _text = std::string("Jakarta git-") + git_revision();`
`50`		`-#else`
`51`		`- _text = std::string("Jakarta git-unknown");`
`52`		`-#endif`
	`48`	`+ _text = "Jakarta 2020.330";`
`53`	`49`	`}`
`54`	`50`
`55`	`51`