Repository: incubator-unomi Updated Branches: refs/heads/master cfe3158e7 -> f502839ba
UNOMI-208 Improve documentation flow - Add generation of manual archives Signed-off-by: Serge Huber <shu...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/f502839b Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/f502839b Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/f502839b Branch: refs/heads/master Commit: f502839ba295c6b80254def597ed9e55ecaa7e89 Parents: cfe3158 Author: Serge Huber <shu...@apache.org> Authored: Mon Nov 5 15:13:56 2018 +0100 Committer: Serge Huber <shu...@apache.org> Committed: Mon Nov 5 15:13:56 2018 +0100 ---------------------------------------------------------------------- generate-site-and-upload.sh | 8 +++++++- generate-site.sh | 8 +++++++- manual/pom.xml | 17 ++++++++++++----- 3 files changed, 26 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/f502839b/generate-site-and-upload.sh ---------------------------------------------------------------------- diff --git a/generate-site-and-upload.sh b/generate-site-and-upload.sh index d8dc0c5..87338e8 100755 --- a/generate-site-and-upload.sh +++ b/generate-site-and-upload.sh @@ -25,6 +25,12 @@ fi echo Generating documentation... mvn clean cd manual +mvn -Phtml -Ddoc.source=src/archives/1.1/asciidoc -Ddoc.output.html=target/generated-html/1_1_x +mvn -Ppdf -Ddoc.source=src/archives/1.1/asciidoc -Ddoc.output.pdf=target/generated-pdf/1_1_x +mvn -Phtml -Ddoc.source=src/archives/1.2/asciidoc -Ddoc.output.html=target/generated-html/1_2_x +mvn -Ppdf -Ddoc.source=src/archives/1.2/asciidoc -Ddoc.output.pdf=target/generated-pdf/1_2_x +mvn -Phtml -Ddoc.source=src/archives/1.3/asciidoc -Ddoc.output.html=target/generated-html/1_3_x +mvn -Ppdf -Ddoc.source=src/archives/1.3/asciidoc -Ddoc.output.pdf=target/generated-pdf/1_3_x mvn -Phtml mvn -Ppdf cd .. @@ -36,7 +42,7 @@ cd .. mkdir target/staging/unomi-api mkdir target/staging/manual cp -R target/site/apidocs target/staging/unomi-api -cp -R manual/target/generated-html/latest target/staging/manual +cp -Rf manual/target/generated-html/* target/staging/manual echo Committing documentation to Apache SVN... mvn scm-publish:publish-scm -Dscmpublish.pubScmUrl=scm:svn:https://svn.apache.org/repos/asf/incubator/unomi/website/manual -Dscmpublish.content=target/staging/manual -Dusername=$1 -Dpassword=$2 mvn scm-publish:publish-scm -Dscmpublish.pubScmUrl=scm:svn:https://svn.apache.org/repos/asf/incubator/unomi/website/unomi-api -Dscmpublish.content=target/staging/unomi-api -Dusername=$1 -Dpassword=$2 http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/f502839b/generate-site.sh ---------------------------------------------------------------------- diff --git a/generate-site.sh b/generate-site.sh index 10b23f8..35aee66 100755 --- a/generate-site.sh +++ b/generate-site.sh @@ -20,6 +20,12 @@ echo Generating documentation... mvn clean cd manual +mvn -Phtml -Ddoc.source=src/archives/1.1/asciidoc -Ddoc.output.html=target/generated-html/1_1_x +mvn -Ppdf -Ddoc.source=src/archives/1.1/asciidoc -Ddoc.output.pdf=target/generated-pdf/1_1_x +mvn -Phtml -Ddoc.source=src/archives/1.2/asciidoc -Ddoc.output.html=target/generated-html/1_2_x +mvn -Ppdf -Ddoc.source=src/archives/1.2/asciidoc -Ddoc.output.pdf=target/generated-pdf/1_2_x +mvn -Phtml -Ddoc.source=src/archives/1.3/asciidoc -Ddoc.output.html=target/generated-html/1_3_x +mvn -Ppdf -Ddoc.source=src/archives/1.3/asciidoc -Ddoc.output.pdf=target/generated-pdf/1_3_x mvn -Phtml mvn -Ppdf cd .. @@ -31,5 +37,5 @@ cd .. mkdir target/staging/unomi-api mkdir target/staging/manual cp -R target/site/apidocs target/staging/unomi-api -cp -R manual/target/generated-html/latest target/staging/manual +cp -Rf manual/target/generated-html/* target/staging/manual echo Documentation generation completed! \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/f502839b/manual/pom.xml ---------------------------------------------------------------------- diff --git a/manual/pom.xml b/manual/pom.xml index 6403a5c..bf1c47f 100644 --- a/manual/pom.xml +++ b/manual/pom.xml @@ -30,6 +30,13 @@ <name>Apache Unomi :: Manual</name> <packaging>bundle</packaging> + <properties> + <doc.source>src/main/asciidoc</doc.source> + <doc.output.html>target/generated-html/latest</doc.output.html> + <doc.output.pdf>target/generated-pdf/latest</doc.output.pdf> + </properties> + + <profiles> <profile> <id>html</id> @@ -60,11 +67,11 @@ </execution> </executions> <configuration> - <sourceDirectory>src/main/asciidoc</sourceDirectory> - <outputDirectory>target/generated-html/latest</outputDirectory> + <sourceDirectory>${doc.source}</sourceDirectory> + <outputDirectory>${doc.output.html}</outputDirectory> <preserveDirectories>true</preserveDirectories> <headerFooter>true</headerFooter> - <imagesDir>src/main/asciidoc/images</imagesDir> + <imagesDir>${doc.source}/images</imagesDir> </configuration> </plugin> </plugins> @@ -88,8 +95,8 @@ </dependency> </dependencies> <configuration> - <sourceDirectory>src/main/asciidoc</sourceDirectory> - <outputDirectory>target/generated-pdf/latest</outputDirectory> + <sourceDirectory>${doc.source}</sourceDirectory> + <outputDirectory>${doc.output.pdf}</outputDirectory> <preserveDirectories>true</preserveDirectories> <headerFooter>true</headerFooter> <backend>pdf</backend>
