From cbd16710267989e98357aa2b0d79434297d03f0f Mon Sep 17 00:00:00 2001
From: Fred Hornsey <hornseyf@objectcomputing.com>
Date: Thu, 8 Jul 2021 19:13:48 -0500
Subject: [PATCH] TAO/TAO_IDL/regen.pl: Exit with Error

---
 TAO/TAO_IDL/.gitignore     |  1 +
 TAO/TAO_IDL/regen.pl       | 11 +++++++++--
 TAO/TAO_IDL/tao_idl_fe.mpc |  7 +++++--
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/TAO/TAO_IDL/.gitignore b/TAO/TAO_IDL/.gitignore
index 656394c8c3d..481044e39ce 100644
--- a/TAO/TAO_IDL/.gitignore
+++ b/TAO/TAO_IDL/.gitignore
@@ -1,3 +1,4 @@
 /tao_idl
 /fe/idl.output
+/fe/keywords.dat.tmp
 /bison_report
diff --git a/TAO/TAO_IDL/regen.pl b/TAO/TAO_IDL/regen.pl
index ed20f2bc56b..1124cc0b23a 100755
--- a/TAO/TAO_IDL/regen.pl
+++ b/TAO/TAO_IDL/regen.pl
@@ -9,8 +9,15 @@ my %args = map { $_ => 1 } @ARGV;
 my $debug = exists($args{'-d'});
 
 my $features = 'tao_idl_fe_gen=1';
-system "$ACE_ROOT/bin/mpc.pl -type gnuace -features $features tao_idl_fe.mpc";
+if (system "$ACE_ROOT/bin/mpc.pl -type gnuace -features $features tao_idl_fe.mpc") {
+  exit(1);
+}
 utime undef, undef, 'fe/keywords.dat';
 
 my $bison_target = $debug ? 'debug_bison' : 'y.tab';
-system "make -f GNUmakefile.TAO_IDL_GEN $features lex.yy $bison_target all";
+if (system "make -f GNUmakefile.TAO_IDL_GEN $features lex.yy $bison_target all") {
+  exit(1);
+}
+if (system("make -f GNUmakefile.TAO_IDL_GEN $features lex.yy $bison_target all")) {
+  exit(1);
+}
diff --git a/TAO/TAO_IDL/tao_idl_fe.mpc b/TAO/TAO_IDL/tao_idl_fe.mpc
index 80ed849937f..14721a95d41 100644
--- a/TAO/TAO_IDL/tao_idl_fe.mpc
+++ b/TAO/TAO_IDL/tao_idl_fe.mpc
@@ -11,8 +11,11 @@ project(TAO_IDL_GEN) {
     BISON_FLAGS := -d --feature=caret --warnings=error=deprecated --warnings=error=empty-rule --warnings=error=conflicts-rr
     all: fe/fe_lookup.cpp fe/idl.yy.cpp fe/idl.tab.cpp fe/idl.tab.hpp
     GPERF ?= $(ACE_ROOT)/bin/ace_gperf
-    fe/fe_lookup.cpp: fe/keywords.dat
-    "	$(GPERF) -M -J -c -C -D -E -T -f 0 -a -o -t -p -K keyword_ -L C++ -Z TAO_IDL_CPP_Keyword_Table -N lookup -k1,2,$$ $^ | sed -f fe/post_gperf.sed > $@"
+    fe/keywords.dat.tmp: fe/keywords.dat
+    "	$(GPERF) -M -J -c -C -D -E -T -f 0 -a -o -t -p -K keyword_ -L C++ -Z TAO_IDL_CPP_Keyword_Table -N lookup -k1,2,$$ $^ > $@"
+
+    fe/fe_lookup.cpp: fe/keywords.dat.tmp
+    "	sed -f fe/post_gperf.sed $^ > $@"
 
     fe/idl.yy.cpp: fe/idl.ll
     "	@echo 'WARNING: Potentially outdated $@'"
-- 
2.11.4.GIT