roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [roller] 02/02: Preparing for 6.0.1 rc-2: switch to AsciiDoc versions of docs.
Date Sun, 03 May 2020 20:03:55 GMT
This is an automated email from the ASF dual-hosted git repository.

snoopdave pushed a commit to branch roller-6.0.x
in repository https://gitbox.apache.org/repos/asf/roller.git

commit 2b12891d7e3351a6345f25d568e2502724296d72
Author: David M. Johnson <snoopdave@apache.org>
AuthorDate: Sun May 3 16:03:41 2020 -0400

    Preparing for  6.0.1 rc-2: switch to AsciiDoc versions of docs.
---
 assembly-release/pom.xml                      |   2 +-
 assembly-release/sign-release.sh              |   2 +-
 assembly-release/src/main/assembly/binary.xml |   4 ++--
 docs/roller-install-guide.odt                 | Bin 386049 -> 0 bytes
 docs/roller-install-guide.pdf                 | Bin 523568 -> 0 bytes
 docs/roller-template-guide.odt                | Bin 238537 -> 0 bytes
 docs/roller-template-guide.pdf                | Bin 471256 -> 0 bytes
 docs/roller-user-guide.odt                    | Bin 2740008 -> 0 bytes
 docs/roller-user-guide.pdf                    | Bin 2033057 -> 0 bytes
 9 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/assembly-release/pom.xml b/assembly-release/pom.xml
index 582604a..51493f1 100644
--- a/assembly-release/pom.xml
+++ b/assembly-release/pom.xml
@@ -79,7 +79,7 @@
                     </dependency>
                 </dependencies>
                 <configuration>
-                    <sourceDirectory>../docs/adoc</sourceDirectory>
+                    <sourceDirectory>../docs</sourceDirectory>
                     <attributes>
                         <sourcedir>${project.build.sourceDirectory}</sourcedir>
                     </attributes>
diff --git a/assembly-release/sign-release.sh b/assembly-release/sign-release.sh
index b7248e5..0f39725 100755
--- a/assembly-release/sign-release.sh
+++ b/assembly-release/sign-release.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-export rcstring="-rc-1"
+export rcstring="-rc-2"
 export vstring="6.0.1"
 
 # for rc releases we rename the release files
diff --git a/assembly-release/src/main/assembly/binary.xml b/assembly-release/src/main/assembly/binary.xml
index 994f3ed..ae75c95 100644
--- a/assembly-release/src/main/assembly/binary.xml
+++ b/assembly-release/src/main/assembly/binary.xml
@@ -48,11 +48,11 @@
             <outputDirectory>${artifact.artifactId}-${artifact.version}/docs</outputDirectory>
         </file>
         <file>
-            <source>../docs/roller-template-guide.pdf</source>
+            <source>target/generated-docs/roller-template-guide.pdf</source>
             <outputDirectory>${artifact.artifactId}-${artifact.version}/docs</outputDirectory>
         </file>
         <file>
-            <source>../docs/roller-user-guide.pdf</source>
+            <source>target/generated-docs/roller-user-guide.pdf</source>
             <outputDirectory>${artifact.artifactId}-${artifact.version}/docs</outputDirectory>
         </file>
     </files>
diff --git a/docs/roller-install-guide.odt b/docs/roller-install-guide.odt
deleted file mode 100644
index eb8d53d..0000000
Binary files a/docs/roller-install-guide.odt and /dev/null differ
diff --git a/docs/roller-install-guide.pdf b/docs/roller-install-guide.pdf
deleted file mode 100644
index 376b33b..0000000
Binary files a/docs/roller-install-guide.pdf and /dev/null differ
diff --git a/docs/roller-template-guide.odt b/docs/roller-template-guide.odt
deleted file mode 100644
index 541eb86..0000000
Binary files a/docs/roller-template-guide.odt and /dev/null differ
diff --git a/docs/roller-template-guide.pdf b/docs/roller-template-guide.pdf
deleted file mode 100644
index 6ae010d..0000000
Binary files a/docs/roller-template-guide.pdf and /dev/null differ
diff --git a/docs/roller-user-guide.odt b/docs/roller-user-guide.odt
deleted file mode 100644
index dcb059e..0000000
Binary files a/docs/roller-user-guide.odt and /dev/null differ
diff --git a/docs/roller-user-guide.pdf b/docs/roller-user-guide.pdf
deleted file mode 100644
index eb7bba4..0000000
Binary files a/docs/roller-user-guide.pdf and /dev/null differ


Mime
View raw message