Sorry for the late reply.

I can't remember if there was a reason that I moved them from 'docs' to
'docs/adoc'.

I think 'docs' is better.

Dave


On Sun, Mar 15, 2020 at 3:39 AM Swapnil M Mane <swapnilmm...@apache.org>
wrote:

> Hello Dave,
> Hope are doing well.
> Any update on this.
>
>
> Best regards,
> Swapnil M Mane,
> www.apache.org
>
> On Mon, Mar 2, 2020 at 10:51 AM Swapnil M Mane <swapnilmm...@apache.org>
> wrote:
> >
> > Hello Dave,
> >
> > While working on the translation of 'Template Guide' document from ODT
> > to AsciiDoc.
> > I found, here we have moved roller-install-guide.adoc from 'docs' to
> > 'docs/adoc'.
> >
> > Just need your kind thoughts on finalizing the file location of these
> > files in the master branch,
> > should we keep the AsciiDoc file at 'docs' directory or at 'docs/adoc'
> > directory.
> >
> >
> > Best regards,
> > Swapnil M Mane,
> > www.apache.org
> >
> > On Mon, Dec 2, 2019 at 4:57 AM <snoopd...@apache.org> wrote:
> > >
> > > This is an automated email from the ASF dual-hosted git repository.
> > >
> > > snoopdave pushed a commit to branch master
> > > in repository https://gitbox.apache.org/repos/asf/roller.git
> > >
> > >
> > > The following commit(s) were added to refs/heads/master by this push:
> > >      new 8cb3da1  Switch to AsciiDoc version of install guide in
> standard release bundle.
> > > 8cb3da1 is described below
> > >
> > > commit 8cb3da13831485886d9905fee45ddb5d89e680a6
> > > Author: David M. Johnson <snoopd...@apache.org>
> > > AuthorDate: Sun Dec 1 18:27:03 2019 -0500
> > >
> > >     Switch to AsciiDoc version of install guide in standard release
> bundle.
> > > ---
> > >  assembly-release/pom.xml                        | 48
> +++++++++++++++++++++++++
> > >  assembly-release/src/main/assembly/standard.xml | 14 +-------
> > >  docs/{ => adoc}/roller-install-guide.adoc       |  0
> > >  3 files changed, 49 insertions(+), 13 deletions(-)
> > >
> > > diff --git a/assembly-release/pom.xml b/assembly-release/pom.xml
> > > index 98fc5fc..d91550d 100644
> > > --- a/assembly-release/pom.xml
> > > +++ b/assembly-release/pom.xml
> > > @@ -32,12 +32,20 @@
> > >      <name>Roller Release Assembly</name>
> > >      <description>Assembles Roller into a distribution
> package</description>
> > >
> > > +    <properties>
> > > +
> <asciidoctor.maven.plugin.version>2.0.0-RC.1</asciidoctor.maven.plugin.version>
> > > +
> <asciidoctorj.pdf.version>1.5.0-beta.6</asciidoctorj.pdf.version>
> > > +        <asciidoctorj.version>2.1.0</asciidoctorj.version>
> > > +        <jruby.version>9.2.8.0</jruby.version>
> > > +    </properties>
> > > +
> > >      <!--
> > >           Check the README.md in the Roller base folder for
> > >           information on creating the Roller distribution files.
> > >      -->
> > >      <build>
> > >          <plugins>
> > > +
> > >              <plugin>
> > >                  <groupId>org.apache.maven.plugins</groupId>
> > >                  <artifactId>maven-assembly-plugin</artifactId>
> > > @@ -58,6 +66,46 @@
> > >                      </execution>
> > >                  </executions>
> > >              </plugin>
> > > +
> > > +            <plugin>
> > > +                <groupId>org.asciidoctor</groupId>
> > > +                <artifactId>asciidoctor-maven-plugin</artifactId>
> > > +                <version>${asciidoctor.maven.plugin.version}</version>
> > > +                <dependencies>
> > > +                    <dependency>
> > > +                        <groupId>org.asciidoctor</groupId>
> > > +                        <artifactId>asciidoctorj-pdf</artifactId>
> > > +                        <version>${asciidoctorj.pdf.version}</version>
> > > +                    </dependency>
> > > +                </dependencies>
> > > +                <configuration>
> > > +                    <sourceDirectory>../docs/adoc</sourceDirectory>
> > > +                    <attributes>
> > > +
> <sourcedir>${project.build.sourceDirectory}</sourcedir>
> > > +                    </attributes>
> > > +                </configuration>
> > > +                <executions>
> > > +                    <execution>
> > > +                        <id>generate-pdf-doc</id>
> > > +                        <phase>generate-resources</phase>
> > > +                        <goals>
> > > +                            <goal>process-asciidoc</goal>
> > > +                        </goals>
> > > +                        <configuration>
> > > +                            <backend>pdf</backend>
> > > +
> <sourceHighlighter>coderay</sourceHighlighter>
> > > +                            <attributes>
> > > +                                <icons>font</icons>
> > > +                                <pagenums/>
> > > +                                <toc/>
> > > +                                <idprefix/>
> > > +                                <idseparator>-</idseparator>
> > > +                            </attributes>
> > > +                        </configuration>
> > > +                    </execution>
> > > +                </executions>
> > > +            </plugin>
> > > +
> > >          </plugins>
> > >      </build>
> > >
> > > diff --git a/assembly-release/src/main/assembly/standard.xml
> b/assembly-release/src/main/assembly/standard.xml
> > > index e206cfe..8bb2fab 100644
> > > --- a/assembly-release/src/main/assembly/standard.xml
> > > +++ b/assembly-release/src/main/assembly/standard.xml
> > > @@ -44,19 +44,7 @@
> > >
> <outputDirectory>${artifact.artifactId}-${artifact.version}</outputDirectory>
> > >          </file>
> > >          <file>
> > > -            <source>../docs/roller-install-guide.odt</source>
> > > -
> <outputDirectory>${artifact.artifactId}-${artifact.version}/docs</outputDirectory>
> > > -        </file>
> > > -        <file>
> > > -            <source>../docs/roller-template-guide.odt</source>
> > > -
> <outputDirectory>${artifact.artifactId}-${artifact.version}/docs</outputDirectory>
> > > -        </file>
> > > -        <file>
> > > -            <source>../docs/roller-user-guide.odt</source>
> > > -
> <outputDirectory>${artifact.artifactId}-${artifact.version}/docs</outputDirectory>
> > > -        </file>
> > > -        <file>
> > > -            <source>../docs/roller-install-guide.pdf</source>
> > > +
> <source>target/generated-docs/roller-install-guide.pdf</source>
> > >
> <outputDirectory>${artifact.artifactId}-${artifact.version}/docs</outputDirectory>
> > >          </file>
> > >          <file>
> > > diff --git a/docs/roller-install-guide.adoc
> b/docs/adoc/roller-install-guide.adoc
> > > similarity index 100%
> > > rename from docs/roller-install-guide.adoc
> > > rename to docs/adoc/roller-install-guide.adoc
> > >
>

Reply via email to