diff options
| author | Adam Mitz <mitza@objectcomputing.com> | 2020-01-08 15:54:41 -0600 |
|---|---|---|
| committer | Adam Mitz <mitza@objectcomputing.com> | 2020-01-08 15:54:41 -0600 |
| commit | e75bfac7b176650dc4a9933a080d58e9ebbd9a15 (patch) | |
| tree | 47ddf95336dc8e7947bfcb4d9461211952c7bcab /TAO/TAO_IDL | |
| parent | dc125f1c8f9d0b60afbae36af9ddeb0342d90de8 (diff) | |
| download | ATCD-e75bfac7b176650dc4a9933a080d58e9ebbd9a15.tar.gz | |
Simplify how gperf is used to generate code for TAO_IDL_FE
Diffstat (limited to 'TAO/TAO_IDL')
| -rw-r--r-- | TAO/TAO_IDL/fe/lookup_starter.txt | 3 | ||||
| -rw-r--r-- | TAO/TAO_IDL/fe/post_gperf.sed | 4 | ||||
| -rw-r--r-- | TAO/TAO_IDL/tao_idl_fe.mpc | 7 |
3 files changed, 9 insertions, 5 deletions
diff --git a/TAO/TAO_IDL/fe/lookup_starter.txt b/TAO/TAO_IDL/fe/lookup_starter.txt deleted file mode 100644 index 8d8d9019c0d..00000000000 --- a/TAO/TAO_IDL/fe/lookup_starter.txt +++ /dev/null @@ -1,3 +0,0 @@ -#include "fe_private.h" -#include "ace/OS_NS_string.h" - diff --git a/TAO/TAO_IDL/fe/post_gperf.sed b/TAO/TAO_IDL/fe/post_gperf.sed index fab57954503..ca1feac53d8 100644 --- a/TAO/TAO_IDL/fe/post_gperf.sed +++ b/TAO/TAO_IDL/fe/post_gperf.sed @@ -1,2 +1,6 @@ +1i\ +#include "fe_private.h"\ +#include "ace/OS_NS_string.h"\ + s/,}/,0}/g s/\*str == \*s && !ACE_OS::strncmp/len == static_cast<unsigned int> (ACE_OS::strlen (s)) \&\& *str == *s \&\& !ACE_OS::strncmp/g diff --git a/TAO/TAO_IDL/tao_idl_fe.mpc b/TAO/TAO_IDL/tao_idl_fe.mpc index fcaad08f3f3..020936b5c89 100644 --- a/TAO/TAO_IDL/tao_idl_fe.mpc +++ b/TAO/TAO_IDL/tao_idl_fe.mpc @@ -3,13 +3,16 @@ project(TAO_IDL_GEN) { requires += tao_idl_fe_gen custom_only = 1 + verbatim(gnuace, extension, 1) { + OUTPUT_DIRECTORY = + } + verbatim(gnuace, local) { 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 - " cp fe/lookup_starter.txt $@" - " $(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 >> $@" + " $(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/idl.yy.cpp: fe/idl.ll " @echo 'WARNING: Potentially outdated $@'" |