Merge pull request #20 from proDOOMman/develop

v1.3

Author: proDOOMman

README.md

@@ -16,40 +16,45 @@
 
 ```cmd
 Usage: Coverage41C [-hV] [-p] [--verbose] [-a=<commandAction>]
-                       [-e=<extensionName>] -i=<infobaseAlias> [-o=<outputFile>]
-                       [-P=<projectDirName>] [-p:env=<passwordEnv>]
-                       [-r=<removeSupport>] [-s=<srcDirName>] [-t=<pingTimeout>]
-                       [-u=<debugServerUrl>] [-x=<externalDataProcessorUrl>]
-                       [-n=<debugAreaNames>]...
-    Make measures from 1C:Enterprise and save them to genericCoverage.xml file
-      -a, --action=<commandAction>
-                               Action: start, stop, dump, clean, check. Default -
-                                 start
-      -i, --infobase=<infobaseAlias>
-                               InfoBase name. For file infobase use 'DefAlias' name
-      -e, --extensionName=<extensionName>
-                               Extension name
-      -x, --externalDataProcessor=<externalDataProcessorUrl>
-                               External data processor (or external report) url
-      -s, --srcDir=<srcDirName>
-                               Directory with sources exported to xml
-      -P, --projectDir=<projectDirName>
-                               Directory with project
-      -o, --out=<outputFile>   Output file name
-      -u, --debugger=<debugServerUrl>
-                               Debugger url. Default - http://127.0.0.1:1550/
-      -p, --password           Dbgs password
-          -p:env, --password:env=<passwordEnv>
-                               Password environment variable name
-      -n, --areanames=<debugAreaNames>
-                               Debug area names (not for general use!)
-      -t, --timeout=<pingTimeout>
-                               Ping timeout. Default - 1000
-      -r, --removeSupport=<removeSupport>
-                               Remove support values: NOT_EDITABLE,
-                                 EDITABLE_SUPPORT_ENABLED, NOT_SUPPORTED, NONE.
-                                 Default - NONE
-          --verbose            If you need more logs. Default - false
-      -h, --help               Show this help message and exit.
-      -V, --version            Print version information and exit.
+                   [-c=<inputRawXmlFile>] [-e=<extensionName>]
+                   -i=<infobaseAlias> [-o=<outputFile>] [-P=<projectDirName>]
+                   [-p:env=<passwordEnv>] [-r=<removeSupport>]
+                   [-s=<srcDirName>] [-t=<pingTimeout>] [-u=<debugServerUrl>]
+                   [-u:file=<debugServerUrlFileName>]
+                   [-x=<externalDataProcessorUrl>] [-n=<debugAreaNames>]...
+Make measures from 1C:Enterprise and save them to genericCoverage.xml file
+  -a, --action=<commandAction>
+                           Action: start, stop, dump, clean, check, convert.
+                             Default - start
+  -i, --infobase=<infobaseAlias>
+                           InfoBase name. For file infobase use 'DefAlias' name
+  -e, --extensionName=<extensionName>
+                           Extension name
+  -x, --externalDataProcessor=<externalDataProcessorUrl>
+                           External data processor (or external report) url
+  -s, --srcDir=<srcDirName>
+                           Directory with sources exported to xml
+  -P, --projectDir=<projectDirName>
+                           Directory with project
+  -o, --out=<outputFile>   Output file name
+  -c, --convertFile=<inputRawXmlFile>
+                           Input file name with RAW xml coverage data
+  -u, --debugger=<debugServerUrl>
+                           Debugger url. Default - http://127.0.0.1:1550/
+      -u:file, --debugger:file=<debugServerUrlFileName>
+                           Debugger url file name
+  -p, --password           Dbgs password
+      -p:env, --password:env=<passwordEnv>
+                           Password environment variable name
+  -n, --areanames=<debugAreaNames>
+                           Debug area names (not for general use!)
+  -t, --timeout=<pingTimeout>
+                           Ping timeout. Default - 1000
+  -r, --removeSupport=<removeSupport>
+                           Remove support values: NOT_EDITABLE,
+                             EDITABLE_SUPPORT_ENABLED, NOT_SUPPORTED, NONE.
+                             Default - NONE
+      --verbose            If you need more logs. Default - false
+  -h, --help               Show this help message and exit.
+  -V, --version            Print version information and exit.
 ```

build.gradle

@@ -2,10 +2,11 @@ plugins {
     id 'java'
     id 'application'
     id "com.github.breadmoirai.github-release" version "2.2.12"
+    id "com.github.jarmstrong.buildconfig" version "1.9.0"
 }
 
 group 'com.clouds42'
-version '1.2-SNAPSHOT'
+version '1.3-SNAPSHOT'
 
 sourceCompatibility = 11
 
@@ -53,7 +54,7 @@ dependencies {
 
     compile group: 'com.google.guava', name: 'guava', version: '28.2-jre'
 
-    implementation 'com.github.proDOOMman:mdclasses:676043538506e56870059b10e672e8f77e4ee195' // TODO: change to 1c-syntax
+    implementation 'com.github.1c-syntax:mdclasses:42fcc53f34b08a7a748528c9dd53ae1a2e04bb40' // TODO: change to release
 
     implementation('com.github.1c-syntax:bsl-parser:0.13.0') {
         exclude group: "com.tunnelvisionlabs", module: "antlr4-annotations"
@@ -100,6 +101,13 @@ application {
     mainClassName = 'com.clouds42.Coverage41C'
 }
 
+buildConfig {
+    className("BuildConfig")
+    packageName("com.clouds42")
+    buildConfigField("String", "APP_VERSION", "\"${project.version}\"")
+    buildConfigField("long", "BUILD_TIME", "${System.currentTimeMillis()}L")
+}
+
 githubRelease {
     token findProperty('github.token')
     owner "proDOOMman"