You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2019/09/18 05:52:19 UTC
[isis] 02/08: ISIS-2062: converts extensions/asciidoc module into
ext-asciidoc/ROOT component
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch v2-antora
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 723544b46f23c68fc3e91ea3bb06a9d13b8d68c7
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Sep 17 19:21:21 2019 +0100
ISIS-2062: converts extensions/asciidoc module into ext-asciidoc/ROOT component
---
antora/components/ext-asciidoc/antora.yml | 6 ++++
antora/components/ext-asciidoc/examples.csv | 1 +
.../modules/ROOT}/_attributes.adoc | 0
.../modules/ROOT/assets/attachments}/.gitkeep | 0
.../modules/ROOT}/assets/images/.gitkeep | 0
.../modules/ROOT/examples}/.gitkeep | 0
.../components/ext-asciidoc/modules/ROOT/nav.adoc | 2 ++
.../modules/ROOT}/pages/_attributes.adoc | 0
.../modules/ROOT}/pages/_partials/_attributes.adoc | 0
.../modules/ROOT}/pages/about.adoc | 0
antora/components/ext-asciidoc/sync_examples.sh | 39 ++++++++++++++++++++++
antora/components/extensions/antora.yml | 1 -
.../extensions/modules/asciidoc/nav.adoc | 2 --
.../components/toc/modules/ROOT/pages/about.adoc | 2 +-
site.yml | 3 ++
15 files changed, 52 insertions(+), 4 deletions(-)
diff --git a/antora/components/ext-asciidoc/antora.yml b/antora/components/ext-asciidoc/antora.yml
new file mode 100644
index 0000000..852d599
--- /dev/null
+++ b/antora/components/ext-asciidoc/antora.yml
@@ -0,0 +1,6 @@
+name: ext-asciidoc
+title: "Extensions - Asciidoc"
+version: master
+start_page: ROOT:about.adoc
+nav:
+- modules/ROOT/nav.adoc
diff --git a/antora/components/ext-asciidoc/examples.csv b/antora/components/ext-asciidoc/examples.csv
new file mode 100644
index 0000000..5d5804b
--- /dev/null
+++ b/antora/components/ext-asciidoc/examples.csv
@@ -0,0 +1 @@
+#file,source,target
diff --git a/antora/components/extensions/modules/asciidoc/_attributes.adoc b/antora/components/ext-asciidoc/modules/ROOT/_attributes.adoc
similarity index 100%
rename from antora/components/extensions/modules/asciidoc/_attributes.adoc
rename to antora/components/ext-asciidoc/modules/ROOT/_attributes.adoc
diff --git a/antora/components/extensions/modules/asciidoc/examples/.gitkeep b/antora/components/ext-asciidoc/modules/ROOT/assets/attachments/.gitkeep
similarity index 100%
rename from antora/components/extensions/modules/asciidoc/examples/.gitkeep
rename to antora/components/ext-asciidoc/modules/ROOT/assets/attachments/.gitkeep
diff --git a/antora/components/extensions/modules/asciidoc/assets/images/.gitkeep b/antora/components/ext-asciidoc/modules/ROOT/assets/images/.gitkeep
similarity index 100%
rename from antora/components/extensions/modules/asciidoc/assets/images/.gitkeep
rename to antora/components/ext-asciidoc/modules/ROOT/assets/images/.gitkeep
diff --git a/antora/components/extensions/modules/asciidoc/assets/attachments/.gitkeep b/antora/components/ext-asciidoc/modules/ROOT/examples/.gitkeep
similarity index 100%
rename from antora/components/extensions/modules/asciidoc/assets/attachments/.gitkeep
rename to antora/components/ext-asciidoc/modules/ROOT/examples/.gitkeep
diff --git a/antora/components/ext-asciidoc/modules/ROOT/nav.adoc b/antora/components/ext-asciidoc/modules/ROOT/nav.adoc
new file mode 100644
index 0000000..2815342
--- /dev/null
+++ b/antora/components/ext-asciidoc/modules/ROOT/nav.adoc
@@ -0,0 +1,2 @@
+* xref:about.adoc[About]
+
diff --git a/antora/components/extensions/modules/asciidoc/pages/_attributes.adoc b/antora/components/ext-asciidoc/modules/ROOT/pages/_attributes.adoc
similarity index 100%
rename from antora/components/extensions/modules/asciidoc/pages/_attributes.adoc
rename to antora/components/ext-asciidoc/modules/ROOT/pages/_attributes.adoc
diff --git a/antora/components/extensions/modules/asciidoc/pages/_partials/_attributes.adoc b/antora/components/ext-asciidoc/modules/ROOT/pages/_partials/_attributes.adoc
similarity index 100%
rename from antora/components/extensions/modules/asciidoc/pages/_partials/_attributes.adoc
rename to antora/components/ext-asciidoc/modules/ROOT/pages/_partials/_attributes.adoc
diff --git a/antora/components/extensions/modules/asciidoc/pages/about.adoc b/antora/components/ext-asciidoc/modules/ROOT/pages/about.adoc
similarity index 100%
rename from antora/components/extensions/modules/asciidoc/pages/about.adoc
rename to antora/components/ext-asciidoc/modules/ROOT/pages/about.adoc
diff --git a/antora/components/ext-asciidoc/sync_examples.sh b/antora/components/ext-asciidoc/sync_examples.sh
new file mode 100644
index 0000000..5260cd7
--- /dev/null
+++ b/antora/components/ext-asciidoc/sync_examples.sh
@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+SCRIPT=$(readlink -f "$0")
+SCRIPTPATH=$(dirname "$SCRIPT")
+if [ $# -ne 1 ]; then
+ FILELIST=$SCRIPTPATH/examples.csv
+else
+ FILELIST=$1
+fi
+FILELISTFQN=$(readlink -f $FILELIST)
+DIRNAME=$(dirname $FILELISTFQN)
+BASENAME=$(basename $FILELISTFQN)
+
+cd $DIRNAME >/dev/null 2>&1
+cat $BASENAME | tail +2 | grep -v ^# | while read LINE
+do
+ FILE=$(echo $LINE | awk -F, '{print $1}' | awk '{$1=$1;print}')
+ F2=$(echo $LINE | awk -F, '{print $2}' | awk '{$1=$1;print}')
+ F3=$(echo $LINE | awk -F, '{print $3}' | awk '{$1=$1;print}')
+ SOURCEFQN=$DIRNAME/$F2/$FILE
+ TARGETDIR=$DIRNAME/$F3
+ TARGETFQN=$DIRNAME/$F3/$FILE
+
+ echo "SOURCEFQN: $SOURCEFQN"
+
+ if [ -f "$SOURCEFQN" ]
+ then
+
+ if [ -f "$TARGETFQN" ]
+ then
+ rm $TARGETFQN
+ fi
+ mkdir -p $TARGETDIR
+ cp $SOURCEFQN $TARGETFQN
+ else
+ echo "- does not exist ($SOURCEFQN) " >&2
+ exit 1
+ fi
+done
+cd - >/dev/null 2>&1
\ No newline at end of file
diff --git a/antora/components/extensions/antora.yml b/antora/components/extensions/antora.yml
index 46631e3..2e80ed4 100644
--- a/antora/components/extensions/antora.yml
+++ b/antora/components/extensions/antora.yml
@@ -8,5 +8,4 @@ nav:
- modules/specsupport/nav.adoc
- modules/secman/nav.adoc
- modules/viewer-wicket-excel/nav.adoc
-- modules/asciidoc/nav.adoc
- modules/markdown/nav.adoc
diff --git a/antora/components/extensions/modules/asciidoc/nav.adoc b/antora/components/extensions/modules/asciidoc/nav.adoc
deleted file mode 100644
index f0240e0..0000000
--- a/antora/components/extensions/modules/asciidoc/nav.adoc
+++ /dev/null
@@ -1,2 +0,0 @@
-* xref:about.adoc[Asciidoc]
-
diff --git a/antora/components/toc/modules/ROOT/pages/about.adoc b/antora/components/toc/modules/ROOT/pages/about.adoc
index 1d553ce..1bebc4f 100644
--- a/antora/components/toc/modules/ROOT/pages/about.adoc
+++ b/antora/components/toc/modules/ROOT/pages/about.adoc
@@ -66,7 +66,7 @@ include::_attributes.adoc[]
** xref:ext:secman:about.adoc[Security Manager]
** xref:ext:viewer-wicket-excel:about.adoc[Excel Download (Wicket)]
* Values Types
-** xref:ext:asciidoc:about.adoc[Asciidoc], xref:ext:markdown:about.adoc[Markdown]
+** xref:ext-asciidoc:ROOT:about.adoc[Asciidoc], xref:ext:markdown:about.adoc[Markdown]
|*Get involved*
diff --git a/site.yml b/site.yml
index 024ce3f..7b27e7e 100644
--- a/site.yml
+++ b/site.yml
@@ -22,6 +22,9 @@ content:
start_path: antora/components/extensions
- url: .
branches: HEAD
+ start_path: antora/components/ext-asciidoc
+ - url: .
+ branches: HEAD
start_path: examples/apps/demo/_adoc
- url: .
branches: HEAD