From c27c4b4dd81ccad1edb198443de589b417915310 Mon Sep 17 00:00:00 2001 From: "Kai J." Date: Thu, 29 Aug 2024 09:38:03 +0200 Subject: [PATCH] Fix build (#2759) --- build.gradle | 13 ++++++++++--- doc/antora.yml | 2 +- doc/build.gradle | 11 ++++++++--- doc/build/site.yml | 4 ++-- io.openems.edge.evcs.spelsberg/readme.adoc | 6 +++--- 5 files changed, 24 insertions(+), 12 deletions(-) diff --git a/build.gradle b/build.gradle index 72457c55315..82249fb14f2 100644 --- a/build.gradle +++ b/build.gradle @@ -344,12 +344,19 @@ task copyBundleReadmes() { */ task buildAntoraDocs(dependsOn: copyBundleReadmes) { group 'Documentation' - dependsOn ":doc:buildAntoraDocs" + + def source = file("doc/build/www") + def output = file("${buildDir}/www") + doLast { + output.deleteDir() copy { - from "doc/build/www" - into "${buildDir}/www" + from source + into output } + source.deleteDir() + + println("Built ${output}!") } } diff --git a/doc/antora.yml b/doc/antora.yml index 44a009a71f4..e2a06e35be5 100644 --- a/doc/antora.yml +++ b/doc/antora.yml @@ -3,4 +3,4 @@ title: Open Energy Management System version: latest start_page: ROOT:introduction.adoc nav: -- modules/ROOT/nav.adoc + - modules/ROOT/nav.adoc diff --git a/doc/build.gradle b/doc/build.gradle index 4aaf5ee6b5a..100f1e0ffd9 100644 --- a/doc/build.gradle +++ b/doc/build.gradle @@ -12,11 +12,16 @@ node { task buildAntoraDocs(type: NodeTask) { dependsOn npmInstall script = file("build/node_modules/@antora/cli/bin/antora") - args = ["site.yml"] + args = ["--log-format=pretty", "site.yml"] + + def nojekyll = file("build/.nojekyll") + def source = file("build/CNAME") + def output = file("build/www") + doLast { copy { - from "build/.nojekyll", "build/CNAME" - into "build/www" + from nojekyll, source + into output } } } diff --git a/doc/build/site.yml b/doc/build/site.yml index be6edfdcade..79e4816da4f 100644 --- a/doc/build/site.yml +++ b/doc/build/site.yml @@ -6,8 +6,8 @@ site: content: sources: - - url: https://github.com/OpenEMS/openems.git - edit_url: https://github.com/OpenEMS/openems/tree/{refname}/{path} + - url: ./../../ + edit_url: https://github.com/OpenEMS/openems/tree/develop/{path} branches: HEAD start_path: doc diff --git a/io.openems.edge.evcs.spelsberg/readme.adoc b/io.openems.edge.evcs.spelsberg/readme.adoc index 00dc5bbffa0..5e972a157f1 100644 --- a/io.openems.edge.evcs.spelsberg/readme.adoc +++ b/io.openems.edge.evcs.spelsberg/readme.adoc @@ -5,7 +5,7 @@ Implementation of the Spelsberg SMART PRO charging station. This EVCS component implementation is not yet fully feature tested. Please consider it BETA quality. -=== Technical Data +== Technical Data * Rated current: 16A single and three phase * Charging cable: Type 2, up to 16A @@ -13,7 +13,7 @@ This EVCS component implementation is not yet fully feature tested. Please consi * Communication protocol: Modbus TCP -=== This implementation includes: +== This implementation includes: ** Reading of current and power from the EVCS ** Setting charge power/current via OpenEMS Edge EVCS Controller @@ -21,7 +21,7 @@ This EVCS component implementation is not yet fully feature tested. Please consi ** EVCS status updates ** Validation of Modbus TCP connection -=== Planned Features: +== Planned Features: ** Support for automatic phase shifting