diff options
| author | Fred Hornsey <hornseyf@objectcomputing.com> | 2021-07-08 19:31:41 -0500 |
|---|---|---|
| committer | Fred Hornsey <hornseyf@objectcomputing.com> | 2021-07-08 19:31:41 -0500 |
| commit | 2100bb4d9d73a251171b0d3808c059483314b885 (patch) | |
| tree | b0e4df4f63ef4b78e73bbab2ff57d6b595ebc834 | |
| parent | 860746a594bf7bd04ee2501a8d8b5c7d678934c7 (diff) | |
| download | ATCD-2100bb4d9d73a251171b0d3808c059483314b885.tar.gz | |
TAO/TAO_IDL/regen.pl: Exit with Error
| -rw-r--r-- | TAO/TAO_IDL/.gitignore | 1 | ||||
| -rwxr-xr-x | TAO/TAO_IDL/regen.pl | 8 | ||||
| -rw-r--r-- | TAO/TAO_IDL/tao_idl_fe.mpc | 7 |
3 files changed, 12 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..28e79188c71 100755 --- a/TAO/TAO_IDL/regen.pl +++ b/TAO/TAO_IDL/regen.pl @@ -9,8 +9,12 @@ 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); +} diff --git a/TAO/TAO_IDL/tao_idl_fe.mpc b/TAO/TAO_IDL/tao_idl_fe.mpc index 020936b5c89..6875856ee17 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 $@'" |