Skip to content

Commit c477c0e

Browse files
committed
Begin restructuring of doc-building roles with OOMMF. We use the rst_to_html role to build documentation now, and all documentation lives in guest_resources, which should be shared with the virtual machine.
1 parent aa99abf commit c477c0e

File tree

6 files changed

+11
-34
lines changed

6 files changed

+11
-34
lines changed
File renamed without changes.

roles/oommf_examples/meta/main.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
---
22
dependencies:
3-
- { role: oommf }
3+
- { role: oommf }
4+
- { role: rst_to_html, BUILD_DIR: "{{ EXAMPLES_DOC_FOLDER }}", SOURCE_PATH: "{{ EXAMPLES_RST_FILE }}", BUILD_NAME: "{{ EXAMPLES_OUTPUT_NAME }}" }

roles/oommf_examples/tasks/build_documentation.yml

Lines changed: 0 additions & 23 deletions
This file was deleted.

roles/oommf_examples/tasks/main.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,9 @@
22
# This Ansible role prepares OOMMF examples and places some documentation on
33
# the Desktop.
44

5-
- include: oommf_examples.yml
6-
- include: build_documentation.yml
5+
# This task is not very robust, but I can't think of a better way of doing
6+
# this.
7+
- name: Copy oommf examples to a more accessible location.
8+
command: cp -r /opt/oommf/oommf-1.2a5bis/app/oxs/examples {{ OOMMF_EXAMPLES_FOLDER }}
9+
creates={{ OOMMF_EXAMPLES_FOLDER }}
10+
sudo: yes

roles/oommf_examples/tasks/oommf_examples.yml

Lines changed: 0 additions & 6 deletions
This file was deleted.

roles/oommf_examples/vars/main.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22
EXAMPLES_FOLDER: /etc/skel
33
OOMMF_EXAMPLES_FOLDER: "{{ EXAMPLES_FOLDER }}/oommf-oxs-examples"
44

5-
# Name of the RST template to generate HTML examples from.
6-
EXAMPLES_RST_FILE: oommf_examples.rst
5+
# Path of the RST template to generate HTML examples from.
6+
EXAMPLES_RST_FILE: /vagrant/extra_resources/oommf/oommf_examples.rst
7+
EXAMPLES_OUTPUT_NAME: OOMMF_examples.html
78

89
# Location to place the HTML documentation.
910
EXAMPLES_DOC_FOLDER: "{{ EXAMPLES_FOLDER }}/Desktop"

0 commit comments

Comments
 (0)