Browse Source

Build and install lamino filters for staging

Matthias Vogelgesang 10 years ago
parent
commit
f53d3099eb
2 changed files with 32 additions and 11 deletions
  1. 19 9
      roles/compute-staging/handlers/main.yml
  2. 13 2
      roles/compute-staging/tasks/main.yml

+ 19 - 9
roles/compute-staging/handlers/main.yml

@@ -1,4 +1,7 @@
 ---
+
+# Configure and build core library
+#
 - name: configure ufo-core
   command: chdir=/opt/ufo-core cmake . -DPREFIX={{ install_prefix }} -DLIBDIR={{ libdir }}
   notify:
@@ -12,18 +15,25 @@
 - name: install ufo-core
   command: chdir=/opt/ufo-core make install
 
-- name: configure ufo-filters
-  command: chdir=/opt/ufo-filters cmake . -DPREFIX={{ install_prefix }} -DLIBDIR={{ libdir }}
-  notify:
-    - build ufo-filters
 
-- name: build ufo-filters
-  command: chdir=/opt/ufo-filters make
+# Build filters
+
+- name: build filters
+  command: chdir=/opt/{{ item }} make
   notify:
-    - install ufo-filters
+    - install filters
+  with_items:
+    - ufo-filters
+    - lamino-filters
+
+- name: install filters
+  command: chdir=/opt/{{ item }} make install
+  with_items:
+    - ufo-filters
+    - lamino-filters
+
 
-- name: install ufo-filters
-  command: chdir=/opt/ufo-filters make install
+# Build auxiliary things
 
 - name: install ufo-scripts
   command: chdir=/opt/ufo-scripts python setup.py install

+ 13 - 2
roles/compute-staging/tasks/main.yml

@@ -1,14 +1,25 @@
 ---
-- name: fetch ufo base sources
+- name: fetch ufo sources
   git: repo=https://github.com/ufo-kit/{{ item }}.git
        dest=/opt/{{ item }}
   notify:
     - configure ufo-core
-    - configure ufo-filters
   with_items:
     - ufo-core
     - ufo-filters
 
+- name: fetch lamino sources
+  git: repo=http://ufo.kit.edu/git/lamino-filters.git
+       dest=/opt/lamino-filters
+
+- name: configure filters
+  command: chdir=/opt/{{ item }} cmake . -DPREFIX={{ install_prefix }} -DLIBDIR={{ libdir }}
+  notify:
+    - build filters
+  with_items:
+    - ufo-filters
+    - lamino-filters
+
 - name: fetch auxiliary ufo sources
   git: repo=https://github.com/ufo-kit/{{ item }}.git
        dest=/opt/{{ item }}