nmakefile build system improvements

Print the directory name being entered. Stop after first failure.

9 files changed, 63 insertions, 27 deletions

diff --git a/dist/tests/cxx/hybrid/nmakefile b/dist/tests/cxx/hybrid/nmakefile
index fefae35..b734898 100644
--- a/dist/tests/cxx/hybrid/nmakefile
+++ b/dist/tests/cxx/hybrid/nmakefile
@@ -34,8 +34,12 @@ dirs = $(dirs) choice
 
 all:
 	@for %i in ( $(dirs) ) do \
-@cmd /c "cd %i & $(MAKE) /nologo /f nmakefile"
+@cmd /c "echo entering %i && cd %i && $(MAKE) /nologo /f nmakefile" || exit 1
 
-gen test clean cleanobj:
+gen test:
 	@for %i in ( $(dirs) ) do \
-@cmd /c "cd %i & $(MAKE) /nologo /f nmakefile $@"
+@cmd /c "echo entering %i && cd %i && $(MAKE) /nologo /f nmakefile $@" || exit 1
+
+clean cleanobj:
+	@for %i in ( $(dirs) ) do \
+@cmd /c "echo entering %i && cd %i && $(MAKE) /nologo /f nmakefile $@"
diff --git a/dist/tests/cxx/nmakefile b/dist/tests/cxx/nmakefile
index 99a52a9..20c054e 100644
--- a/dist/tests/cxx/nmakefile
+++ b/dist/tests/cxx/nmakefile
@@ -10,8 +10,12 @@ dirs = $(dirs) hashmap
 
 all:
 	@for %i in ( $(dirs) ) do \
-@cmd /c "cd %i & $(MAKE) /nologo /f nmakefile"
+@cmd /c "echo entering %i && cd %i && $(MAKE) /nologo /f nmakefile" || exit 1
 
-gen test clean cleanobj:
+gen test:
 	@for %i in ( $(dirs) ) do \
-@cmd /c "cd %i & $(MAKE) /nologo /f nmakefile $@"
+@cmd /c "echo entering %i && cd %i && $(MAKE) /nologo /f nmakefile $@" || exit 1
+
+clean cleanobj:
+	@for %i in ( $(dirs) ) do \
+@cmd /c "echo entering %i && cd %i && $(MAKE) /nologo /f nmakefile $@"
diff --git a/dist/tests/cxx/parser/nmakefile b/dist/tests/cxx/parser/nmakefile
index b4e6d49..7125434 100644
--- a/dist/tests/cxx/parser/nmakefile
+++ b/dist/tests/cxx/parser/nmakefile
@@ -45,8 +45,12 @@ dirs = $(dirs) name-clash\inheritance
 
 all:
 	@for %i in ( $(dirs) ) do \
-@cmd /c "cd %i & $(MAKE) /nologo /f nmakefile"
+@cmd /c "echo entering %i && cd %i && $(MAKE) /nologo /f nmakefile" || exit 1
 
-gen test clean cleanobj:
+gen test:
 	@for %i in ( $(dirs) ) do \
-@cmd /c "cd %i & $(MAKE) /nologo /f nmakefile $@"
+@cmd /c "echo entering %i && cd %i && $(MAKE) /nologo /f nmakefile $@" || exit 1
+
+clean cleanobj:
+	@for %i in ( $(dirs) ) do \
+@cmd /c "echo entering %i && cd %i && $(MAKE) /nologo /f nmakefile $@"
diff --git a/dist/tests/cxx/parser/validation/built-in/nmakefile b/dist/tests/cxx/parser/validation/built-in/nmakefile
index 21e0040..eab59e2 100644
--- a/dist/tests/cxx/parser/validation/built-in/nmakefile
+++ b/dist/tests/cxx/parser/validation/built-in/nmakefile
@@ -20,8 +20,12 @@ dirs = $(dirs) long
 
 all:
 	@for %i in ( $(dirs) ) do \
-@cmd /c "cd %i & $(MAKE) /nologo /f nmakefile"
+@cmd /c "echo entering %i && cd %i && $(MAKE) /nologo /f nmakefile" || exit 1
 
-gen test clean cleanobj:
+gen test:
 	@for %i in ( $(dirs) ) do \
-@cmd /c "cd %i & $(MAKE) /nologo /f nmakefile $@"
+@cmd /c "echo entering %i && cd %i && $(MAKE) /nologo /f nmakefile $@" || exit 1
+
+clean cleanobj:
+	@for %i in ( $(dirs) ) do \
+@cmd /c "echo entering %i && cd %i && $(MAKE) /nologo /f nmakefile $@"
diff --git a/dist/tests/cxx/parser/validation/nmakefile b/dist/tests/cxx/parser/validation/nmakefile
index b417152..e8a2501 100644
--- a/dist/tests/cxx/parser/validation/nmakefile
+++ b/dist/tests/cxx/parser/validation/nmakefile
@@ -12,8 +12,12 @@ dirs = $(dirs) all any attribute choice restriction sequence
 
 all:
 	@for %i in ( $(dirs) ) do \
-@cmd /c "cd %i & $(MAKE) /nologo /f nmakefile"
+@cmd /c "echo entering %i && cd %i && $(MAKE) /nologo /f nmakefile" || exit 1
 
-gen test clean cleanobj:
+gen test:
 	@for %i in ( $(dirs) ) do \
-@cmd /c "cd %i & $(MAKE) /nologo /f nmakefile $@"
+@cmd /c "echo entering %i && cd %i && $(MAKE) /nologo /f nmakefile $@" || exit 1
+
+clean cleanobj:
+	@for %i in ( $(dirs) ) do \
+@cmd /c "echo entering %i && cd %i && $(MAKE) /nologo /f nmakefile $@"
diff --git a/dist/tests/cxx/serializer/nmakefile b/dist/tests/cxx/serializer/nmakefile
index 60f98e2..2709886 100644
--- a/dist/tests/cxx/serializer/nmakefile
+++ b/dist/tests/cxx/serializer/nmakefile
@@ -46,8 +46,12 @@ dirs = $(dirs) validation
 
 all:
 	@for %i in ( $(dirs) ) do \
-@cmd /c "cd %i & $(MAKE) /nologo /f nmakefile"
+@cmd /c "echo entering %i && cd %i && $(MAKE) /nologo /f nmakefile" || exit 1
 
-gen test clean cleanobj:
+gen test:
 	@for %i in ( $(dirs) ) do \
-@cmd /c "cd %i & $(MAKE) /nologo /f nmakefile $@"
+@cmd /c "echo entering %i && cd %i && $(MAKE) /nologo /f nmakefile $@" || exit 1
+
+clean cleanobj:
+	@for %i in ( $(dirs) ) do \
+@cmd /c "echo entering %i && cd %i && $(MAKE) /nologo /f nmakefile $@"
diff --git a/dist/tests/cxx/serializer/validation/built-in/nmakefile b/dist/tests/cxx/serializer/validation/built-in/nmakefile
index dc56ec7..c1edc1b 100644
--- a/dist/tests/cxx/serializer/validation/built-in/nmakefile
+++ b/dist/tests/cxx/serializer/validation/built-in/nmakefile
@@ -6,8 +6,12 @@ dirs = date-time decimal integer qname string
 
 all:
 	@for %i in ( $(dirs) ) do \
-@cmd /c "cd %i & $(MAKE) /nologo /f nmakefile"
+@cmd /c "echo entering %i && cd %i && $(MAKE) /nologo /f nmakefile" || exit 1
 
-gen test clean cleanobj:
+gen test:
 	@for %i in ( $(dirs) ) do \
-@cmd /c "cd %i & $(MAKE) /nologo /f nmakefile $@"
+@cmd /c "echo entering %i && cd %i && $(MAKE) /nologo /f nmakefile $@" || exit 1
+
+clean cleanobj:
+	@for %i in ( $(dirs) ) do \
+@cmd /c "echo entering %i && cd %i && $(MAKE) /nologo /f nmakefile $@"
diff --git a/dist/tests/cxx/serializer/validation/nmakefile b/dist/tests/cxx/serializer/validation/nmakefile
index 278f188..b63d446 100644
--- a/dist/tests/cxx/serializer/validation/nmakefile
+++ b/dist/tests/cxx/serializer/validation/nmakefile
@@ -10,8 +10,12 @@ dirs = $(dirs) any attribute choice element sequence
 
 all:
 	@for %i in ( $(dirs) ) do \
-@cmd /c "cd %i & $(MAKE) /nologo /f nmakefile"
+@cmd /c "echo entering %i && cd %i && $(MAKE) /nologo /f nmakefile" || exit 1
 
-gen test clean cleanobj:
+gen test:
 	@for %i in ( $(dirs) ) do \
-@cmd /c "cd %i & $(MAKE) /nologo /f nmakefile $@"
+@cmd /c "echo entering %i && cd %i && $(MAKE) /nologo /f nmakefile $@" || exit 1
+
+clean cleanobj:
+	@for %i in ( $(dirs) ) do \
+@cmd /c "echo entering %i && cd %i && $(MAKE) /nologo /f nmakefile $@"
diff --git a/dist/tests/nmakefile b/dist/tests/nmakefile
index 2dea67e..b0cd59f 100644
--- a/dist/tests/nmakefile
+++ b/dist/tests/nmakefile
@@ -2,8 +2,12 @@ dirs = cxx
 
 all:
 	@for %i in ( $(dirs) ) do \
-@cmd /c "cd %i & $(MAKE) /nologo /f nmakefile"
+@cmd /c "echo entering %i && cd %i && $(MAKE) /nologo /f nmakefile" || exit 1
 
-gen test clean cleanobj:
+gen test:
 	@for %i in ( $(dirs) ) do \
-@cmd /c "cd %i & $(MAKE) /nologo /f nmakefile $@"
+@cmd /c "echo entering %i && cd %i && $(MAKE) /nologo /f nmakefile $@" || exit 1
+
+clean cleanobj:
+	@for %i in ( $(dirs) ) do \
+@cmd /c "echo entering %i && cd %i && $(MAKE) /nologo /f nmakefile $@"