Fixed ADOC compilation from TeX files

zextras · Jul 17, 2017 · 7a605d5 · 7a605d5
1 parent 8b0706f
commit 7a605d5
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 24 deletions.
diff --git a/Makefile b/Makefile
@@ -22,16 +22,20 @@ ZAL_ZIMBRA_VERSION?=dev-last
 all: dist/zimbra_drive.tgz dist/zimbradrive.tar.gz dist/zimbra_drive.md5
 
 clean:
-	rm -rf build/nextcloud-app \
+	rm -rf \
+		build/nextcloud-app \
 		build/zimbra-extension \
-		build/zimlet
-	rm -f build/LICENSE	\
+		build/zimlet \
+		build/LICENSE \
 		build/README.md \
 		build/zimbra_drive.md5 \
+		dist/asciidoc \
 		dist/zimbra_drive.tgz \
 		dist/zimbra_drive.md5 \
 		dist/zimbradrive.tar.gz \
-		dist/zimbradrive.tar.gz.sign
+		dist/zimbradrive.tar.gz.sign \
+		dist/admin-guide.pdf
+	cd docs-src && make clean
 	cd nextcloud-app && make clean
 	cd zimbra-extension && make clean
 	cd zimlet && make clean
@@ -110,5 +114,19 @@ dist/zimbradrive.tar.gz: build/nextcloud-app/zimbradrive.tar.gz
 dist/zimbra_drive.md5: dist/zimbra_drive.tgz
 	cd dist && md5sum zimbra_drive.tgz > zimbra_drive.md5
 
+docs-src/dist/asciidoc/admin-guide.adoc:
+	cd docs-src && make dist/asciidoc/admin-guide.adoc
+
+dist/asciidoc/admin-guide.adoc: docs-src/dist/asciidoc/admin-guide.adoc
+	mkdir -p dist
+	cp -r docs-src/dist/asciidoc dist/
+
+docs-src/dist/admin-guide.pdf:
+	cd docs-src && make dist/admin-guide.pdf
+
+dist/admin-guide.pdf: docs-src/dist/admin-guide.pdf
+	mkdir -p dist
+	cp docs-src/dist/admin-guide.pdf dist/admin-guide.pdf
+
 sign-app:
 	openssl dgst -sha512 -sign ~/.nextcloud/certificates/zimbradrive.key dist/zimbradrive.tar.gz | openssl base64 > dist/zimbradrive.tar.gz.sign
diff --git a/docs-src/Makefile b/docs-src/Makefile
@@ -61,16 +61,17 @@ build/admin-guide.adoc: build/variables.tex
 	mkdir -p build
 	pandoc -f latex -t asciidoc admin-guide.tex -o build/admin-guide.adoc
 
-dist/admin-guide.adoc: build/admin-guide.adoc
+dist/asciidoc/admin-guide.adoc: build/admin-guide.adoc
 	mkdir -p dist/asciidoc
 	cp build/admin-guide.adoc dist/asciidoc/admin-guide.adoc
-	sed -i 's/\[\[==/\[\[/g' dist/asciidoc/admin-guide.adoc
-	sed -i 's/==\]\]/\]\]/g' dist/asciidoc/admin-guide.adoc
-	sed -i 's/\[==/<</g' dist/asciidoc/admin-guide.adoc
-	sed -i 's/==\]/>>/g' dist/asciidoc/admin-guide.adoc
-	sed -i ':a;N;$$!ba;s/TIP:\n\n/TIP\: /g' dist/asciidoc/admin-guide.adoc
-	sed -i ':a;N;$$!ba;s/WARNING:\n\n/WARNING\: /g' dist/asciidoc/admin-guide.adoc
-
+	sed -i \
+		-e 's/\[\[==/\[\[/g' \
+		-e 's/==\]\]/\]\]/g' \
+		-e 's/\[==/<</g' \
+		-e 's/==\]/>>/g' \
+		-e ':a;N;$$!ba;s/TIP:\n\n/TIP\: /g' \
+		-e ':a;N;$$!ba;s/WARNING:\n\n/WARNING\: /g' \
+		dist/asciidoc/admin-guide.adoc
 	mkdir -p dist/asciidoc/template
 	cp template/cc-by-nc-sa.png dist/asciidoc/template
 
@@ -84,7 +85,9 @@ dist/admin-guide.adoc: build/admin-guide.adoc
 #	cp build/user-guide.pdf dist/user-guide.pdf
 
 clean:
-	rm -f build/variables.tex \
+	rm -f -r \
+		build/variables.tex \
+		build/admin-guide.adoc \
 		build/admin-guide.aux \
 		build/admin-guide.log \
 		build/admin-guide.out \
@@ -100,6 +103,6 @@ clean:
 		build/user-guide.toc \
 		dist/user-guide.pdf \
 		build/excuses.txt \
-		excuses.txt
-	rm -rf build/html
-	rm -rf dist/asciidoc
+		excuses.txt\
+		build/html\
+		dist/asciidoc
diff --git a/docs-src/docs-src.iml b/docs-src/docs-src.iml
@@ -4,6 +4,8 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/build" />
+      <excludeFolder url="file://$MODULE_DIR$/dist" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

diff --git a/docs-src/template/commands.tex b/docs-src/template/commands.tex
@@ -4,18 +4,12 @@
   \renewcommand\stacktype{L}
   \scaleto{\stackon[.8pt]{\color{red}$\triangle$}{\tiny\bfseries !}}{#1}
 }
+
 \newcommand\infosign[1][3ex]{
   \renewcommand\stacktype{L}
   \scaleto{\stackon[-1.5pt]{\scalebox{.3}{\bfseries i}}{\color{blue}$\circ$}}{#1}
 }
 
-\newcommand{\ccbyncsa}{
-  \begingroup
-  \normalfont
-  \includegraphics[height=\fontcharht\font`\B]{template/cc-by-nc-sa.png}
-  \endgroup
-}
-
 \newenvironment{warning}
 {
     \par

diff --git a/docs-src/template/copyright-page.tex b/docs-src/template/copyright-page.tex
@@ -10,7 +10,10 @@
 
 \url{www.zextras.com} % URL
 
-\ccbyncsa{}
+\begingroup
+\normalfont
+\includegraphics[height=\fontcharht\font`\B]{template/cc-by-nc-sa.png}
+\endgroup
 
 This work is licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License.