Merge pull request #200 from jan-cerny/asciidoc

Use AsciiDoc instead of Asciidoctor

Author: cipherboy

.travis.yml

@@ -11,7 +11,7 @@ before_install:
   - brew update
   - brew install jq
   - brew install cartr/qt4/qt@4
-  - brew install asciidoctor
+  - brew install asciidoc
 
 before_script:
   - git clone --depth 1 https://github.com/openscap/openscap.git -b master

CMakeLists.txt

@@ -89,15 +89,15 @@ if (SCAP_AS_RPM_EXECUTABLE)
 endif()
 
 # This is optional, only required if user wants documentation rebuilt
-find_program(ASCIIDOCTOR_EXECUTABLE NAMES asciidoctor)
-option(SCAP_WORKBENCH_REBUILD_MANUAL "If enabled, user manual will be rebuilt (requires asciidoctor to be installed)" TRUE)
+find_program(ASCIIDOC_EXECUTABLE NAMES asciidoc)
+option(SCAP_WORKBENCH_REBUILD_MANUAL "If enabled, user manual will be rebuilt (requires asciidoc to be installed)" TRUE)
 option(SCAP_WORKBENCH_USE_NATIVE_FILE_DIALOGS "If enabled, native desktop environment file dialogs are used (disable if you have crashes at startup)" TRUE)
-if (SCAP_WORKBENCH_REBUILD_MANUAL AND NOT ASCIIDOCTOR_EXECUTABLE)
-    message("asciidoctor has not been found, user manual won't be rebuilt even though SCAP_WORKBENCH_REBUILD_MANUAL has been enabled.")
+if (SCAP_WORKBENCH_REBUILD_MANUAL AND NOT ASCIIDOC_EXECUTABLE)
+    message("asciidoc has not been found, user manual won't be rebuilt even though SCAP_WORKBENCH_REBUILD_MANUAL has been enabled.")
 endif()
 if (NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/doc/user_manual.html")
-    if (NOT ASCIIDOCTOR_EXECUTABLE)
-        message(FATAL_ERROR "You seem to be using scap-workbench from the repository ('${CMAKE_SOURCE_DIR}/doc/user_manual.html' hasn't been found). Please install asciidoctor to build the manual! You can use `gem install asciidoctor` if asciidoctor is not in your distribution package repository. If you don't have access to asciidoctor and don't mind not having a manual, run `touch ${CMAKE_SOURCE_DIR}/doc/user_manual.html` and rerun cmake.")
+    if (NOT ASCIIDOC_EXECUTABLE)
+        message(FATAL_ERROR "You seem to be using scap-workbench from the repository ('${CMAKE_SOURCE_DIR}/doc/user_manual.html' hasn't been found). Please install asciidoc to build the manual! If you don't have access to asciidoc and don't mind not having a manual, run `touch ${CMAKE_SOURCE_DIR}/doc/user_manual.html` and rerun cmake.")
     endif()
     set(SCAP_WORKBENCH_REBUILD_MANUAL TRUE)
 endif()
@@ -269,12 +269,12 @@ install(FILES "share/pixmaps/scap-workbench.svg"
 install(FILES "scap-workbench.appdata.xml"
     DESTINATION "${CMAKE_INSTALL_DATADIR}/appdata")
 
-if (ASCIIDOCTOR_EXECUTABLE)
+if (ASCIIDOC_EXECUTABLE)
     file(GLOB USER_MANUAL_SCREENSHOTS "${CMAKE_CURRENT_SOURCE_DIR}/doc/user_manual/*.png")
     add_custom_command(
         OUTPUT doc/user_manual.html
         COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/doc
-        COMMAND ${ASCIIDOCTOR_EXECUTABLE} --destination-dir ${CMAKE_CURRENT_BINARY_DIR}/doc -b html5 -a data-uri user_manual.adoc
+        COMMAND ${ASCIIDOC_EXECUTABLE} -o ${CMAKE_CURRENT_BINARY_DIR}/doc/user_manual.html -b html5 -a data-uri user_manual.adoc
         COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/doc/user_manual.html ${CMAKE_CURRENT_SOURCE_DIR}/doc/user_manual.html
         DEPENDS doc/user_manual.adoc ${USER_MANUAL_SCREENSHOTS}
         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/doc

README.md

@@ -24,7 +24,7 @@ required dependencies:
 
 required dependencies (only for the git repo, not required for released tarballs):
 ```console
-# yum install rubygem-asciidoctor
+# yum install asciidoc
 ```
 
 optional dependencies:

doc/user_manual.adoc

@@ -2,7 +2,7 @@
 :imagesdir: ./user_manual
 :toc:
 
-image::logo.svg[align="center"]
+image::logo.png[align="center"]
 
 SCAP Workbench is a tool that can open XCCDF footnote:[The Extensible
 Configuration Checklist Description Format] or SDS footnote:[Source

doc/user_manual/logo.png

@@ -142,8 +142,8 @@
                             <Component Id="INTRO_SCREENSHOT.PNG" DiskId="1" Guid="D73F334F-EEC2-4C30-A440-7EDFC26D8897">
                                 <File Id="INTRO_SCREENSHOT.PNG" Name="intro_screenshot.png" Source="scap-workbench\doc\user_manual\intro_screenshot.png" />
                             </Component>
-                            <Component Id="LOGO.SVG" DiskId="1" Guid="DE026BBD-9241-4004-A2EC-7A9F459C8049">
-                                <File Id="LOGO.SVG" Name="logo.svg" Source="scap-workbench\doc\user_manual\logo.svg" />
+                            <Component Id="LOGO.PNG" DiskId="1" Guid="DE026BBD-9241-4004-A2EC-7A9F459C8049">
+                                <File Id="LOGO.PNG" Name="logo.png" Source="scap-workbench\doc\user_manual\logo.png" />
                             </Component>
                             <Component Id="OPENING_TAILORING_FILE.PNG" DiskId="1" Guid="EFB14DFD-697F-4314-8476-E798EA1A1E93">
                                 <File Id="OPENING_TAILORING_FILE.PNG" Name="opening_tailoring_file.png" Source="scap-workbench\doc\user_manual\opening_tailoring_file.png" />
@@ -342,7 +342,7 @@
             <ComponentRef Id="CUSTOMIZING_SSG_PROFILE.PNG" />
             <ComponentRef Id="DEFAULT_CONTENT_OPENED.PNG" />
             <ComponentRef Id="INTRO_SCREENSHOT.PNG" />
-            <ComponentRef Id="LOGO.SVG" />
+            <ComponentRef Id="LOGO.PNG" />
             <ComponentRef Id="OPENING_TAILORING_FILE.PNG" />
             <ComponentRef Id="SAVE_AS_RPM_DIALOG.PNG" />
             <ComponentRef Id="SCANNING_REMOTE_MACHINE.PNG" />