From a10f0828e7d1bde3e26caad293040c5dd5c4e4ce Mon Sep 17 00:00:00 2001 From: Georgy Litvinov Date: Mon, 9 Mar 2020 15:39:56 +0100 Subject: [PATCH] Set correct build version and date --- build.gradle | 15 ++++---- project.properties | 1 - .../java/w2phtml/api/ConverterFactory.java | 38 ++++++++++++++++--- src/main/java/w2phtml/project.properties | 3 ++ src/main/oxt/writer2xhtml/description.xml | 21 +++++----- 5 files changed, 53 insertions(+), 25 deletions(-) delete mode 100644 project.properties create mode 100644 src/main/java/w2phtml/project.properties diff --git a/build.gradle b/build.gradle index 516071c..1e89ad1 100644 --- a/build.gradle +++ b/build.gradle @@ -2,17 +2,18 @@ apply plugin: 'java' repositories{ mavenCentral() } +def releaseVersion = "0.5.4" +def propertyFile = file "src/main/java/w2phtml/project.properties" Properties properties = new Properties() -properties.load(project.rootProject.file('project.properties').newDataInputStream()) -def releaseVersion = properties.getProperty('ReleaseVersion') -def getDate() { - return new Date().format('yyyyMMddHHmmss') -} +propertyFile.withReader { properties.load(it) } +properties.setProperty('releaseDate', new Date().format('HH:mm:ss dd-MM-YYYY')) +properties.setProperty('releaseVersion', releaseVersion ) +propertyFile.withWriter { properties.store(it, null) } sourceCompatibility = 1.8 jar { manifest { - attributes("Implementation-Title": "w2phtml", + attributes("Implementation-Title": rootProject.name, "Implementation-Version": releaseVersion, "Main-Class" : "w2phtml.Application", "Class-Path" : "jasp.jar parser.jar") @@ -46,7 +47,7 @@ jar { } task xhtml(type: Jar) { manifest { - attributes("Implementation-Title": "w2phtml", + attributes("Implementation-Title": rootProject.name, "Implementation-Version": releaseVersion, "Built-By": "litvinovg", "RegistrationClassName" : "org.openoffice.da.comp.writer2xhtml.W2XRegistration", diff --git a/project.properties b/project.properties deleted file mode 100644 index 5b5f29e..0000000 --- a/project.properties +++ /dev/null @@ -1 +0,0 @@ -ReleaseVersion=0.5.3 diff --git a/src/main/java/w2phtml/api/ConverterFactory.java b/src/main/java/w2phtml/api/ConverterFactory.java index 32778c8..61037bd 100644 --- a/src/main/java/w2phtml/api/ConverterFactory.java +++ b/src/main/java/w2phtml/api/ConverterFactory.java @@ -25,26 +25,54 @@ package w2phtml.api; +import java.io.IOException; +import java.io.InputStream; +import java.util.Properties; + /** This is a factory class which provides static methods to create converters * for documents in OpenDocument (or OpenOffice.org 1.x) format into a specific MIME type */ public class ConverterFactory { // Version information - private static final String VERSION = "0.4.4"; - private static final String DATE = "2019-02-11"; - + private static final String propPath = "w2phtml/project.properties"; /** Return the Writer2LaTeX version in the form * (major version).(minor version).(patch level)
* Development versions have an odd minor version number * @return the version number */ - public static String getVersion() { return VERSION; } + public static String getVersion() { + Properties prop = new Properties(); + ClassLoader loader = Thread.currentThread().getContextClassLoader(); + InputStream stream = loader.getResourceAsStream(propPath); + String version = "Failed to get version"; + try { + prop.load(stream); + version = (String) prop.get("releaseVersion"); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + return version; + } /** Return date information * @return the release date for this Writer2LaTeX version */ - public static String getDate() { return DATE; } + public static String getDate() { + Properties prop = new Properties(); + ClassLoader loader = Thread.currentThread().getContextClassLoader(); + InputStream stream = loader.getResourceAsStream(propPath); + String date = "Failed to get date"; + try { + prop.load(stream); + date = (String) prop.get("releaseDate"); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + return date; + } /**

Create a Converter implementation which supports * conversion into the specified MIME type.

diff --git a/src/main/java/w2phtml/project.properties b/src/main/java/w2phtml/project.properties new file mode 100644 index 0000000..7a9d2ad --- /dev/null +++ b/src/main/java/w2phtml/project.properties @@ -0,0 +1,3 @@ +#Mon Mar 09 15:37:23 CET 2020 +releaseVersion=0.5.4 +releaseDate=15\:37\:23 09-03-2020 diff --git a/src/main/oxt/writer2xhtml/description.xml b/src/main/oxt/writer2xhtml/description.xml index 98daf49..75db304 100644 --- a/src/main/oxt/writer2xhtml/description.xml +++ b/src/main/oxt/writer2xhtml/description.xml @@ -1,19 +1,16 @@ - - + + - + - + - + - Writer2PaginatedHTML + Writer2PaginatedHTML @@ -37,8 +34,8 @@ - - + + - +