From cca7b8bf95d33550603e6dbb93f3e1f3c75bce70 Mon Sep 17 00:00:00 2001 From: Denis Barbier Date: Thu, 3 Jun 2010 22:51:09 +0200 Subject: [PATCH 3/5] Abort when a module cannot be configured This helps debugging FTBFS, it is better to abort as soon as an error happens. --- debian/rules | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/debian/rules b/debian/rules index 8f2e047..fe9b9b8 100755 --- a/debian/rules +++ b/debian/rules @@ -103,9 +103,9 @@ configure-stamp: patch-stamp cp -fp debian/runSalome.in debian/killSalome.in KERNEL_SRC_$(SALOME_VERSION)/bin/ cp -fp debian/envProducts.sh.in KERNEL_SRC_$(SALOME_VERSION)/bin/appliskel/env.d/ - for salomodule in $(SALOME_MODULES); do \ + set -e; for salomodule in $(SALOME_MODULES); do \ echo; echo CONFIGURING SALOME MODULE $$salomodule; echo; \ - (cd $$salomodule && \ + cd $$salomodule; \ KERNEL_ROOT_DIR=$(CURDIR)/KERNEL_SRC_$(SALOME_VERSION) \ GUI_ROOT_DIR=$(CURDIR)/GUI_SRC_$(SALOME_VERSION) \ MED_ROOT_DIR=$(CURDIR)/MED_SRC_$(SALOME_VERSION) \ @@ -116,7 +116,7 @@ configure-stamp: patch-stamp PYCALCULATOR_ROOT_DIR=$(CURDIR)/PYCALCULATOR_SRC_$(SALOME_VERSION) \ SMESH_ROOT_DIR=$(CURDIR)/SMESH_SRC_$(SALOME_VERSION) \ SIERPINSKY_ROOT_DIR=$(CURDIR)/SMESH_SRC_$(SALOME_VERSION) \ - ./build_configure && \ + ./build_configure; \ ./configure --prefix=/usr CASROOT=/usr VTKSUFFIX=-5.4 \ NETGENHOME=/usr \ --with-mpi=/usr --with-mpi_include=/usr/include/mpi \ @@ -129,7 +129,8 @@ configure-stamp: patch-stamp CALCULATOR_ROOT_DIR=$(CURDIR)/CALCULATOR_SRC_$(SALOME_VERSION) \ PYCALCULATOR_ROOT_DIR=$(CURDIR)/PYCALCULATOR_SRC_$(SALOME_VERSION) \ SMESH_ROOT_DIR=$(CURDIR)/SMESH_SRC_$(SALOME_VERSION) \ - SIERPINSKY_ROOT_DIR=$(CURDIR)/SMESH_SRC_$(SALOME_VERSION)); \ + SIERPINSKY_ROOT_DIR=$(CURDIR)/SMESH_SRC_$(SALOME_VERSION); \ + cd ..; \ done # Restore these when the XDATA clean target actually works # echo; echo CONFIGURING SALOME MODULE XDATA; echo -- 1.7.1