Browse Source

Fix build dependencies of ufo-core → ufo-filters

Matthias Vogelgesang 10 years ago
parent
commit
6dc04532e8
2 changed files with 24 additions and 18 deletions
  1. 21 0
      roles/compute-staging/handlers/main.yml
  2. 3 18
      roles/compute-staging/tasks/main.yml

+ 21 - 0
roles/compute-staging/handlers/main.yml

@@ -13,10 +13,21 @@
 
 - name: install ufo-core
   command: chdir=/opt/ufo-core make install
+  notify:
+    - configure filters
+    - fetch auxiliary ufo sources
 
 
 # Build filters
 
+- name: configure filters
+  command: chdir=/opt/{{ item }} cmake . -DPREFIX={{ install_prefix }} -DLIBDIR={{ libdir }} -DCMAKE_BUILD_TYPE=Release
+  with_items:
+    - ufo-filters
+    - lamino-filters
+  notify:
+    - build filters
+
 - name: build filters
   command: chdir=/opt/{{ item }} make
   notify:
@@ -34,6 +45,16 @@
 
 # Build auxiliary things
 
+- name: fetch auxiliary ufo sources
+  git: repo=https://github.com/ufo-kit/{{ item }}.git
+       dest=/opt/{{ item }}
+  notify:
+    - install ufo-scripts
+    - install ufo-python-tools
+  with_items:
+    - ufo-scripts
+    - ufo-python-tools
+
 - name: install ufo-scripts
   command: chdir=/opt/ufo-scripts python setup.py install
 

+ 3 - 18
roles/compute-staging/tasks/main.yml

@@ -1,4 +1,7 @@
 ---
+- name: install libzmq
+  zypper: name=zeromq-devel state=latest
+
 - name: fetch ufo sources
   git: repo=https://github.com/ufo-kit/{{ item }}.git
        dest=/opt/{{ item }}
@@ -11,21 +14,3 @@
 - 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 }} -DCMAKE_BUILD_TYPE=Release
-  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 }}
-  notify:
-    - install ufo-scripts
-    - install ufo-python-tools
-  with_items:
-    - ufo-scripts
-    - ufo-python-tools