mirror of
https://github.com/PhotonVision/photonvision
synced 2026-06-28 02:11:40 +00:00
Add date to version (#46)
* Add date to version * Include build date, use new format * Use version string in main * Fix hours/mins/secs
This commit is contained in:
@@ -11,7 +11,7 @@ apply from: 'versioningHelper.gradle'
|
||||
mainClassName = 'org.photonvision.Main'
|
||||
|
||||
group 'org.photonvision'
|
||||
version getCurrentVersion()
|
||||
version versionString
|
||||
|
||||
sourceCompatibility = 11
|
||||
|
||||
|
||||
@@ -39,10 +39,6 @@ public class Main {
|
||||
private static final Logger logger = new Logger(Main.class, LogGroup.General);
|
||||
public static final int DEFAULT_WEBPORT = 5800;
|
||||
|
||||
private static String getVersion() {
|
||||
return "2020.7.1"; // TODO: grab from gradle/resource somehow
|
||||
}
|
||||
|
||||
public static void main(String[] args) {
|
||||
Logger.setLevel(LogGroup.Camera, LogLevel.TRACE);
|
||||
Logger.setLevel(LogGroup.WebServer, LogLevel.TRACE);
|
||||
@@ -54,7 +50,7 @@ public class Main {
|
||||
|
||||
logger.info(
|
||||
"Starting PhotonVision version "
|
||||
+ getVersion()
|
||||
+ PhotonVersion.versionString
|
||||
+ " on "
|
||||
+ Platform.CurrentPlatform.toString());
|
||||
try {
|
||||
|
||||
@@ -1,3 +1,6 @@
|
||||
import java.time.LocalDateTime
|
||||
import java.time.format.DateTimeFormatter
|
||||
|
||||
gradle.allprojects {
|
||||
ext.getCurrentVersion = { ->
|
||||
def stdout = new ByteArrayOutputStream()
|
||||
@@ -5,11 +8,15 @@ gradle.allprojects {
|
||||
commandLine 'git', 'describe', '--tags'
|
||||
standardOutput = stdout
|
||||
}
|
||||
return stdout.toString().trim().toLowerCase()
|
||||
String tagIsh = stdout.toString().trim().toLowerCase()
|
||||
println("Picked up version: " + tagIsh)
|
||||
return tagIsh
|
||||
}
|
||||
ext.versionString = getCurrentVersion()
|
||||
}
|
||||
|
||||
task writeCurrentVersionJava {
|
||||
String date = DateTimeFormatter.ofPattern("yyyy-M-d hh:mm:ss").format(LocalDateTime.now())
|
||||
File versionFile = new File("src/main/java/org/photonvision/PhotonVersion.java")
|
||||
versionFile.delete()
|
||||
versionFile << "package org.photonvision;\n" +
|
||||
@@ -17,9 +24,13 @@ task writeCurrentVersionJava {
|
||||
"/*\n" +
|
||||
" * Autogenerated file! Do not manually edit this file. This version is regenerated\n" +
|
||||
" * any time the publish task is run, or when this file is deleted.\n" +
|
||||
" */\n\n" +
|
||||
"public class PhotonVersion {\n" +
|
||||
String.format(" public static final String versionString = \"%s\";\n", getCurrentVersion()) +
|
||||
" */\n" +
|
||||
"\n" +
|
||||
"@SuppressWarnings(\"ALL\")\n" +
|
||||
"public final class PhotonVersion {\n" +
|
||||
" public static final String versionString = \"${versionString}\";\n" +
|
||||
" public static final String buildDate = \"${date}\";\n" +
|
||||
" public static final boolean isRelease = versionString.startsWith(\"dev\");\n" +
|
||||
"}"
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user