From f9d424ffd891cf747315a22b7c7711c934f09be4 Mon Sep 17 00:00:00 2001
From: Georgy Litvinov <git@litvinovg.pro>
Date: Tue, 24 Nov 2020 23:40:17 +0100
Subject: [PATCH] Modified build

---
 build.gradle                             | 17 +++++++++++++++--
 src/main/java/w2phtml/project.properties |  4 ++--
 src/main/{ => tmp}/description.xml       |  2 +-
 src/main/tmp/w2phtml/project.properties  |  3 +++
 4 files changed, 21 insertions(+), 5 deletions(-)
 rename src/main/{ => tmp}/description.xml (98%)
 create mode 100644 src/main/tmp/w2phtml/project.properties

diff --git a/build.gradle b/build.gradle
index 89f4a05..cdad635 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,11 +4,12 @@ repositories{
 }
 def releaseVersion = "0.9.1"
 def propertyFile = file "src/main/java/w2phtml/project.properties"
+def propertyDestFile = file "src/main/tmp/w2phtml/project.properties"
 Properties properties = new Properties()
 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) }
+propertyDestFile.withWriter { properties.store(it, null) }
 
 sourceCompatibility = 1.8
 configurations{
@@ -50,6 +51,10 @@ jar {
         exclude '**/*Test.class'
         exclude '**/AllTests.class'
         exclude 'org/openoffice/**/*'
+        exclude 'w2phtml/project.properties'
+    }
+    from('src/main/tmp') {
+        include 'w2phtml/project.properties'
     }
 }
 task xhtml(type: Jar) {
@@ -128,12 +133,16 @@ task xhtml2(type: Jar) {
         from 'src/main/java'
         include 'w2phtml/xhtml/**/*.properties'
         include 'w2phtml/xhtml/**/**/*.properties'
+        exclude 'w2phtml/project.properties'
         from sourceSets.main.output
         include 'org/**/*'
         include 'net/**/*'
         include 'logback.xml'
         include 'ch/**/*'
         include '**/*.properties'
+    from('src/main/tmp') {
+        include 'w2phtml/project.properties'
+    }
 }
 
 
@@ -158,6 +167,10 @@ task oxtNew(type: Zip){
     include '*'
     include '**'
     exclude '.gradle'
+    exclude 'description.xml'
+    from('src/main/tmp') {
+        include 'description.xml'
+    }
     from 'build/libs/writer2phtml.jar'
     include '*'
     from 'idl/writer2paginatedhtml.rdb'
@@ -167,7 +180,7 @@ task oxtNew(type: Zip){
 
 task setVersion(){   
    ant.taskdef(name: 'xmltask', classpath: 'buildPlugins/xmltask.jar', classname: 'com.oopsconsultancy.xmltask.ant.XmlTask') 
-   ant.xmltask(source: 'src/main/description.xml', dest: 'src/main/oxt2/description.xml', report:'true') {
+   ant.xmltask(source: 'src/main/oxt2/description.xml', dest: 'src/main/tmp/description.xml', report:'true') {
      replace(path: "//*[local-name()='version']/@value", withText: "${releaseVersion}")
    }
 }
diff --git a/src/main/java/w2phtml/project.properties b/src/main/java/w2phtml/project.properties
index 23a9211..4947dc8 100644
--- a/src/main/java/w2phtml/project.properties
+++ b/src/main/java/w2phtml/project.properties
@@ -1,3 +1,3 @@
 #Tue Nov 24 23:04:59 CET 2020
-releaseVersion=0.9.1
-releaseDate=23\:04\:59 24-11-2020
+releaseVersion=testing
+releaseDate=now
diff --git a/src/main/description.xml b/src/main/tmp/description.xml
similarity index 98%
rename from src/main/description.xml
rename to src/main/tmp/description.xml
index 3192346..bb49cc7 100644
--- a/src/main/description.xml
+++ b/src/main/tmp/description.xml
@@ -3,7 +3,7 @@
 			 
   <identifier value="pro.litvinovg.writer2paginatedhtml"/>
   
-  <version value=""/>
+  <version value="0"/>
   <extension-description>
 	<src lang="en" xlink:href="description/desc_en.txt"/>
   </extension-description>
diff --git a/src/main/tmp/w2phtml/project.properties b/src/main/tmp/w2phtml/project.properties
new file mode 100644
index 0000000..d596429
--- /dev/null
+++ b/src/main/tmp/w2phtml/project.properties
@@ -0,0 +1,3 @@
+#Tue Nov 24 23:36:58 CET 2020
+releaseVersion=0.9.1
+releaseDate=23\:36\:58 24-11-2020