Merge pull request #53 from computationalmodelling/BUG-049

BUG-049: Makes fidimag importable.

Author: mvousden

jobs/provision_virtualmicromagnetics_fidimag.yml

@@ -13,8 +13,6 @@
     - { role: rst_to_html, SOURCE_PATH: "/vagrant/extra_resources/welcome/welcome_{{ name }}.rst" }
     - fidimag
     - fidimag_examples
-    - xserver
-    - add_super_user
     - { role: xserver, when: type == "vm" }
     - { role: add_super_user, when: type == "vm" }
     - { role: copy_skeleton, TYPE: type }

roles/fidimag/tasks/make_fidimag.yml

@@ -4,10 +4,13 @@
 # SUNDIALS.
 
 # Install local dependencies.
-- name: Install FFTW and SUNDIALS from the Fidimag installation script.
-  command: bash ubuntu_install_script.sh
+- name: Install FFTW and SUNDIALS from Fidimag installation scripts.
+  command: bash {{ item }}
   args:
     chdir: "{{ FIDIMAG_INSTALL_PATH }}/bin"
+  with_items:
+    - install-fftw.sh
+    - install-sundials-2.5.sh
   sudo: yes
 
 # Build Fidimag. Makefile module?