diff options
Diffstat (limited to 'CIAO/bin/generate_component_mpc.pl')
| -rwxr-xr-x | CIAO/bin/generate_component_mpc.pl | 133 |
1 files changed, 32 insertions, 101 deletions
diff --git a/CIAO/bin/generate_component_mpc.pl b/CIAO/bin/generate_component_mpc.pl index f4a6ec7246b..dc504157b51 100755 --- a/CIAO/bin/generate_component_mpc.pl +++ b/CIAO/bin/generate_component_mpc.pl @@ -12,15 +12,14 @@ use Getopt::Std; $flags = join (" ", @ARGV); -if (!getopts ('decnip:l:u:h') || $opt_h) { +if (!getopts ('dcnip:l:u:h') || $opt_h) { print "generate_component_mpc.pl [-d] [-h] component_name\n"; print "\n"; print " -d Turn on debug mode\n"; - print " -e Eventtype declaration in IDL\n"; print " -p Dependent component name\n"; print " -l Dependent component path\n"; print " -i Use an executor definition IDL file\n"; - print " -n Suppress component make/project\n"; + print " -n Supress component make/project\n"; print " -c Create a client makefile\n"; print " -u Unique project name prefix (if not defined, name for -p flag will be used. \n"; print "\n"; @@ -48,19 +47,10 @@ $UCOM_NAME = uc $com_name; ############################################################################## # Prologue -if (defined $opt_n) { - $svr_suffix = "_skel"; -} -else { - $svr_suffix = "_svnt"; -} - -$USVR_SUFFIX = uc $svr_suffix; - if (defined $opt_p) { $stub_depend = "after += $opt_p".'_stub'; - $svnt_depend = "$opt_p".'_skel'; - $lib_depend = "$opt_p".'_stub '."$opt_p".'_skel'; + $svnt_depend = "$opt_p".'_svnt'; + $lib_depend = "$opt_p".'_stub '."$opt_p".'_svnt'; $client_depend = "$com_name".'_stub '."$opt_p"."_stub"; } else { @@ -76,6 +66,7 @@ elsif (defined $opt_p) { $unique_prefix = "$opt_p" . "_"; } + if (defined $opt_l) { $lib_paths = "libpaths += $opt_l"; } @@ -101,12 +92,6 @@ project ('."$unique_prefix"."$com_name".'_client) : ciao_client_dnc { if (defined $opt_i) { $exec_impl_idl = "$com_name".'EI.idl'; $exec_impl_cpp = "$com_name".'EIC.cpp'; - $exec_idlflags = -' - idlflags += -SS -St \ - -Wb,export_macro='."$UCOM_NAME".'_EXEC_Export \ - -Wb,export_include='."$com_name".'_exec_export.h -'; } @@ -114,10 +99,11 @@ if (! defined $opt_n) { $component_def = ' project('."$unique_prefix"."$com_name".'_exec) : ciao_component_dnc { - after += '."$unique_prefix"."$com_name"."$svr_suffix".' + after += '."$unique_prefix"."$com_name".'_svnt sharedname = '."$com_name".'_exec - libs += '."$com_name".'_stub '."$com_name"."$svr_suffix $lib_depend - $lib_paths $exec_idlflags".' + libs += '."$com_name".'_stub '."$com_name".'_svnt'." $lib_depend + $lib_paths".' + idlflags += -Wb,export_macro='."$UCOM_NAME".'_EXEC_Export -Wb,export_include='."$com_name".'_exec_export.h dynamicflags = '."$UCOM_NAME".'_EXEC_BUILD_DLL IDL_Files {'." @@ -132,78 +118,13 @@ project('."$unique_prefix"."$com_name".'_exec) : ciao_component_dnc { '; } -$no_skel = "-SS"; -$no_anys = "-St"; -$no_tie = "idlflags -= -GT"; - -if (defined $opt_e) { - $no_anys = ""; - - if (defined $opt_n) { - $no_tie = ""; - } -} - -$cli_idlflags =' - '."$no_tie".' - idlflags += '."$no_anys".' \ - -Wb,stub_export_macro='."$UCOM_NAME".'_STUB_Export \ - -Wb,stub_export_include='."$com_name".'_stub_export.h \ - -Wb,skel_export_macro='."$UCOM_NAME"."$USVR_SUFFIX".'_Export \ - -Wb,skel_export_include='."$com_name"."$svr_suffix".'_export.h -'; - -$cli_base = "ciao_client_dnc"; -$svr_base = "ciao_servant_dnc"; - -if (defined $opt_n) { - $svr_idlflags = $cli_idlflags; - $svr_idl = "$com_name".'.idl'; - - $svr_src = -' - '."$com_name".'S.cpp -'; - - if (! defined $opt_e) { - $cli_base = "taolib_with_idl"; - $svr_base = "portableserver"; - } -} -else { - $svr_idlflags =' - '."$no_tie".' - idlflags += '."$no_anys"." $no_skel".' \ - -Wb,export_macro='."$UCOM_NAME"."$USVR_SUFFIX".'_Export \ - -Wb,export_include='."$com_name"."$svr_suffix".'_export.h -'; - - $cidl_block = -' - CIDL_Files { - '."$com_name".'.cidl - } -'; - - $svr_idl = "$com_name".'E.idl'; - - $svr_src = -' - '."$com_name".'EC.cpp - '."$com_name".'S.cpp - '."$com_name".'_svnt.cpp -'; -} - - - $mpc_template = '// $Id$ // This file is generated with "'."generate_component_mpc.pl $flags".'" -project('."$unique_prefix"."$com_name".'_stub): '."$cli_base".' {'." +project('."$unique_prefix"."$com_name".'_stub): ciao_client_dnc {'." $stub_depend".' sharedname = '."$com_name".'_stub - '."$cli_idlflags".' + idlflags += -Wb,stub_export_macro='."$UCOM_NAME".'_STUB_Export -Wb,stub_export_include='."$com_name".'_stub_export.h -Wb,skel_export_macro='."$UCOM_NAME".'_SVNT_Export -Wb,skel_export_include='."$com_name".'_svnt_export.h dynamicflags = '."$UCOM_NAME".'_STUB_BUILD_DLL IDL_Files { @@ -215,20 +136,30 @@ project('."$unique_prefix"."$com_name".'_stub): '."$cli_base".' {'." } } -project('."$unique_prefix"."$com_name"."$svr_suffix".') : '."$svr_base".' { - after += '."$svnt_depend "."$unique_prefix"."$com_name".'_stub - sharedname = '."$com_name"."$svr_suffix".' - libs += '."$com_name".'_stub'." $lib_depend - $lib_paths $svr_idlflags".' - dynamicflags = '."$UCOM_NAME"."$USVR_SUFFIX".'_BUILD_DLL - '."$cidl_block".' +project('."$unique_prefix"."$com_name".'_svnt) : ciao_servant_dnc { + after += '."$svnt_depend "."$unique_prefix"."$com_name".'_stub + sharedname = '."$com_name".'_svnt + libs += '."$com_name".'_stub'." $lib_depend + $lib_paths".' + idlflags += -Wb,export_macro='."$UCOM_NAME".'_SVNT_Export -Wb,export_include='."$com_name".'_svnt_export.h + dynamicflags = '."$UCOM_NAME".'_SVNT_BUILD_DLL + + CIDL_Files { + '."$com_name".'.cidl + } + IDL_Files { - '."$svr_idl".' + '."$com_name".'E.idl } - Source_Files {'."$svr_src".' } + Source_Files { + '."$com_name".'EC.cpp + '."$com_name".'S.cpp + '."$com_name".'_svnt.cpp + } } -'."$component_def +'." +$component_def $client_def "; @@ -252,7 +183,7 @@ $command = "generate_export_file.pl $UCOM_NAME".'_STUB > '."$com_name".'_stub_ex print "\t$command"."\n"; system ("$ACE_ROOT".'/bin/'."$command"); -$command = "generate_export_file.pl $UCOM_NAME"."$USVR_SUFFIX".' > '."$com_name"."$svr_suffix".'_export.h'; +$command = "generate_export_file.pl $UCOM_NAME".'_SVNT > '."$com_name".'_svnt_export.h'; print "\t$command"."\n"; system ("$ACE_ROOT".'/bin/'."$command"); |