Skip to content

Commit

Permalink
Merge pull request #1001 from lat-lon/migrateHandbook-858
Browse files Browse the repository at this point in the history 
Migrate handbook from Sphinx to asciidoc
  • Loading branch information
@copierrj
copierrj authored Oct 11, 2019
2 parents 854e193 + 080e735 commit ea5d1da
Show file tree
Hide file tree
Showing 255 changed files with 10,871 additions and 9,873 deletions.
15 changes: 0 additions & 15 deletions deegree-services/deegree-webservices-handbook/assembly.xml
View file

This file was deleted.

101 changes: 48 additions & 53 deletions deegree-services/deegree-webservices-handbook/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@
<version>3.4.10-SNAPSHOT</version>
</parent>

<properties>
<revdate>${maven.build.timestamp}</revdate>
<revnumber>${project.version}</revnumber>
<maven.build.timestamp.format>yyyy-MM-dd</maven.build.timestamp.format>
</properties>

<repositories>
<repository>
<id>deegree-repo</id>
Expand All @@ -36,17 +42,17 @@
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${basedir}/target/generated-sources</outputDirectory>
<outputDirectory>${project.build.outputDirectory}/generated-sources</outputDirectory>
<resources>
<resource>
<directory>src/main/sphinx</directory>
<directory>src/main/asciidoc</directory>
<excludes>
<exclude>images/*.*</exclude>
</excludes>
<filtering>true</filtering>
</resource>
<resource>
<directory>src/main/sphinx</directory>
<directory>src/main/asciidoc</directory>
<includes>
<include>images/*.*</include>
</includes>
Expand All @@ -57,81 +63,70 @@
</execution>
</executions>
</plugin>

<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctor-maven-plugin</artifactId>
<dependencies>
<dependency>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctorj-pdf</artifactId>
<version>1.5.0-beta.2</version>
</dependency>
</dependencies>
<executions>
<execution>
<id>build-html</id>
<phase>compile</phase>
<id>pdf</id>
<phase>generate-resources</phase>
<goals>
<goal>run</goal>
<goal>process-asciidoc</goal>
</goals>
<configuration>
<tasks>
<exec dir="${basedir}" executable="sphinx-build" failonerror="true">
<arg line="-b html -d target/doctrees target/generated-sources target/html" />
</exec>
</tasks>
<backend>pdf</backend>
<attributes>
<revdate>${revdate}</revdate>
<revnumber>${revnumber}</revnumber>
</attributes>
<sourceDirectory>${project.build.outputDirectory}/generated-sources</sourceDirectory>
<outputDirectory>${project.build.directory}/pdf</outputDirectory>
<sourceDocumentName>index.adoc</sourceDocumentName>
</configuration>
</execution>
<execution>
<id>build-pdf</id>
<phase>compile</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<tasks>
<exec dir="${basedir}" executable="sphinx-build" failonerror="true">
<arg line="-b latex -d target/doctrees -D latex_paper_size=a4 target/generated-sources target/latex" />
</exec>
<exec dir="${basedir}" executable="make" failonerror="true">
<arg line="-C target/latex all-pdf" />
</exec>
</tasks>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
<id>attach-artifacts</id>
<phase>package</phase>
<id>html</id>
<phase>generate-resources</phase>
<goals>
<goal>attach-artifact</goal>
<goal>process-asciidoc</goal>
</goals>
<configuration>
<artifacts>
<artifact>
<file>target/latex/deegreeWebservices.pdf</file>
<type>pdf</type>
</artifact>
</artifacts>
<doctype>book</doctype>
<backend>html</backend>
<attributes>
<toc/>
<linkcss>false</linkcss>
<revdate>${revdate}</revdate>
<revnumber>${revnumber}</revnumber>
</attributes>
<sourceDirectory>${project.build.outputDirectory}/generated-sources</sourceDirectory>
<outputDirectory>${project.build.directory}/html</outputDirectory>
<sourceDocumentName>index.adoc</sourceDocumentName>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptors>
<descriptor>assembly.xml</descriptor>
</descriptors>
</configuration>
<executions>
<execution>
<id>assemble-html</id>
<id>deegree-core-assembly</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<appendAssemblyId>false</appendAssemblyId>
<ignoreMissingDescriptor>true</ignoreMissingDescriptor>
<descriptors>
<descriptor>src/assembly/html.xml</descriptor>
<descriptor>src/assembly/pdf.xml</descriptor>
</descriptors>
</configuration>
</execution>
</executions>
Expand Down
15 changes: 15 additions & 0 deletions deegree-services/deegree-webservices-handbook/src/assembly/html.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
<id>html</id>
<formats>
<format>zip</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
<directory>${project.build.directory}/html</directory>
<outputDirectory>${project.build.finalName}</outputDirectory>
</fileSet>
</fileSets>
</assembly>
16 changes: 16 additions & 0 deletions deegree-services/deegree-webservices-handbook/src/assembly/pdf.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
<id>pdf</id>
<formats>
<format>zip</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<files>
<file>
<source>${project.build.directory}/pdf/index.pdf</source>
<outputDirectory></outputDirectory>
<destName>${project.build.finalName}.pdf</destName>
</file>
</files>
</assembly>
Loading

0 comments on commit ea5d1da

Please sign in to comment.