ChangeLogTag: Fri Mar 18 06:52:59 2005 Chad Elliott <elliott_c@ociweb.com>

1 files changed, 64 insertions, 23 deletions

diff --git a/ace/ace.mpc b/ace/ace.mpc
index 107570d6781..4ad9656e882 100644
--- a/ace/ace.mpc
+++ b/ace/ace.mpc
@@ -451,38 +451,79 @@ project(ACE) : acedefaults, core, other, codecs, token, svcconf, uuid, filecache
 
   verbatim(gnuace, local) {
     "Svc_Conf_y.cpp: Svc_Conf.y"
+    "ifeq ($(notdir $(YACC)), bison)"
     "	$(YACC) -l -d Svc_Conf.y"
     "	sed -e 's/char \\*getenv/char *ace_foo/g' \\"
-    "            -e 's/= getenv/= ACE_OS::getenv/g' \\"
-    "            -e 's/fprintf/ACE_OS::fprintf/g' \\"
-    "            -e 's/yy/ace_yy/g' \\"
-    "            -e 's/->ace_yyerrno/->yyerrno/g' \\"
-    "            -e 's/->ace_yylineno/->yylineno/g' \\"
-    "            -e 's/YY/ACE_YY/g' \\"
-    "            -e 's/Svc_Conf\\.tab\\.c/Svc_Conf_y.cpp/g' < Svc_Conf.tab.c > /tmp/$@"
+    "       -e 's/= getenv/= ACE_OS::getenv/g' \\"
+    "       -e 's/fprintf/ACE_OS::fprintf/g' \\"
+    "       -e 's/yy/ace_yy/g' \\"
+    "       -e 's/->ace_yyerrno/->yyerrno/g' \\"
+    "       -e 's/->ace_yylineno/->yylineno/g' \\"
+    "       -e 's/YY/ACE_YY/g' \\"
+    "       -e 's/^char /ACE_TCHAR /g' \\"
+    "       -e 's/ char / ACE_TCHAR /g' \\"
+    "       -e 's/(char/(ACE_TCHAR/g' \\"
+    "       -e 's/ NULL/ 0/g' \\"
+    "       -e 's/ace_yyerror[ ]*(\"/ace_yyerror (ACE_SVC_CONF_PARAM->yyerrno, ACE_SVC_CONF_PARAM->yylineno, \"/g' \\"
+    "       -e 's/ace_yyerror[ ]*(ace_yymsg/ace_yyerror (ACE_SVC_CONF_PARAM->yyerrno, ACE_SVC_CONF_PARAM->yylineno, ace_yymsg/g' \\"
+    "       -e 's/yyerror (int yyerrno, int yylineno, const ACE_TCHAR/ (int yyerrno, int yylineno, const char/' \\"
+    "       -e 's@#include <stdio\.h>@@' \\"
+    "       -e 's/Svc_Conf\\.tab\\.c/Svc_Conf_y.cpp/g' < Svc_Conf.tab.c > /tmp/$@"
     "	cp /tmp/$@ $@"
-    "	patch < ../etc/Svc_Conf_y.cpp.diff"
-    "	echo \/\/ '$$Id$$' > Svc_Conf_Tokens.h"
+    "	echo \/\/ '$$I''d$$' > Svc_Conf_Tokens.h"
     "	cat Svc_Conf.tab.h >> Svc_Conf_Tokens.h"
     "	$(RM) -f /tmp/$@ Svc_Conf.tab.c Svc_Conf.tab.h Svc_Conf_y.cpp.orig"
+    "else"
+    "	@echo 'ERROR: You must use bison 1.35 or higher to process this file'"
+    "	@/bin/false"
+    "endif"
 
     "Svc_Conf_l.cpp: Svc_Conf.l"
-    "	$(LEX) -L -t -I Svc_Conf.l > $@"
-    "	sed -e 's/unistd/stdio/g' \\"
-    "            -e 's/yy/ace_yy/g' \\"
-    "            -e 's/YY/ACE_YY/g' \\"
-    "            -e 's/->ace_yyerrno/->yyerrno/g' \\"
-    "            -e 's/->ace_yylineno/->yylineno/g' \\"
-    "            -e 's/free( ptr );/free( ACE_MALLOC_T (ptr) );/g' \\"
-    "            -e 's/exit( 1 );/ACE_OS::exit( 1 );/g' \\"
-    "            -e 's/isatty( fileno(file)/ACE_OS::isatty( fileno (file)/g' \\"
-    "            -e 's/int isatty/int nop_isatty/g' \\"
-    "            -e 's/realloc( ptr, size );/realloc( ACE_MALLOC_T (ptr), size );/g' \\"
-    "            -e 's@#include <stdio\.h>@#include /**/ \"ace/OS.h\"@' \\"
-    "            -e 's@#include <@#include /**/ <@' \\"
-    "            -e 's@ECHO@ACE_SVC_CONF_ECHO@' < $@ > /tmp/$@"
+    "ifeq ($(notdir $(LEX)), flex)"
+    "	echo '#define YY_NO_UNPUT' > $@"
+    "	echo >> $@"
+    "	echo '#include \"ace/Object_Manager.h\"' >> $@"
+    "	echo '#include \"ace/Guard_T.h\"' >> $@"
+    "	echo '#include \"ace/Recursive_Thread_Mutex.h\"' >> $@"
+    "	echo '#include \"ace/OS_NS_ctype.h\"' >> $@"
+    "	echo '#include \"ace/OS_NS_string.h\"' >> $@"
+    "	$(LEX) -L -t -I Svc_Conf.l >> $@"
+    "	echo '#endif /* ACE_USES_CLASSIC_SVC_CONF = 1 */' >> $@"
+    "	sed -e 's/yy/ace_yy/g' \\"
+    "       -e 's/YY/ACE_YY/g' \\"
+    "       -e 's@#define unput.*@#if (ACE_USES_CLASSIC_SVC_CONF == 1)@' \\"
+    "       -e 's/typedef unsigned char/typedef char/g' \\"
+    "       -e 's/	/        /g' \\"
+    "       -e 's/^char /ACE_TCHAR /g' \\"
+    "       -e 's/ char / ACE_TCHAR /g' \\"
+    "       -e 's/(char/(ACE_TCHAR/g' \\"
+    "       -e 's/ NULL/ 0/g' \\"
+    "       -e 's/->ace_yyerrno/->yyerrno/g' \\"
+    "       -e 's/->ace_yylineno/->yylineno/g' \\"
+    "       -e 's/free( ptr );/free( ACE_MALLOC_T (ptr) );/g' \\"
+    "       -e 's/exit(/ACE_OS::exit(/g' \\"
+    "       -e 's/isatty( fileno(file)/ACE_OS::isatty( fileno (file)/g' \\"
+    "       -e 's/int isatty/int nop_isatty/g' \\"
+    "       -e 's/realloc( (ACE_TCHAR \\*) ptr/realloc( (char *) ptr/g' \\"
+    "       -e 's/unsigned ACE_TCHAR/unsigned char/g' \\"
+    "       -e 's/ACE_TCHAR msg\\[\\]/char msg[]/g' \\"
+    "       -e 's/fprintf/ACE_OS::fprintf/g' \\"
+    "       -e 's/if[ ]*([ ]*num_to_read/if ( num_to_read * sizeof (ACE_TCHAR)/g' \\"
+    "       -e 's/b->ace_yy_buf_size + 2/(&) * sizeof (ACE_TCHAR)/g' \\"
+    "       -e 's@= ACE_YY_READ_BUF_SIZE@& / sizeof (ACE_TCHAR)@g' \\"
+    "       -e 's/ace_yy_flex_alloc( n /&* sizeof (ACE_TCHAR)/g' \\"
+    "       -e 's@#include <stdio\.h>@#include \"ace/OS_NS_stdio.h\"@' \\"
+    "       -e 's@#include <unistd\.h>@#include \"ace/OS_NS_unistd.h\"@' \\"
+    "       -e 's@#include <stdlib\.h>@#include \"ace/OS_NS_stdlib.h\"@' \\"
+    "       -e 's@#include <@#include /**/ <@' \\"
+    "       -e 's@ECHO@ACE_SVC_CONF_ECHO@' < $@ > /tmp/$@"
     "	cp /tmp/$@ $@"
     "	patch < ../etc/Svc_Conf_l.cpp.diff"
     "	$(RM) -f /tmp/$@ Svc_Conf_l.cpp.orig"
+    "else"
+    "	@echo 'ERROR: You must use flex 2.5.4 or higher to process this file'"
+    "	@/bin/false"
+    "endif"
+
   }
 }