From 17a683a7b6fbf55491fef6f3de083b71eae1cd6e Mon Sep 17 00:00:00 2001 From: elliott_c Date: Fri, 21 Mar 2003 15:48:57 +0000 Subject: ChangeLogTag: Fri Mar 21 09:48:33 2003 Chad Elliott --- ChangeLog | 44 +++++++++++++++++++------------- bin/MakeProjectCreator/USAGE | 9 +++++-- bin/MakeProjectCreator/modules/Driver.pm | 7 ++++- 3 files changed, 39 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index c2292af0e82..04d6f7b7577 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,38 +1,46 @@ +Fri Mar 21 09:48:33 2003 Chad Elliott + + * bin/MakeProjectCreator/USAGE: + * bin/MakeProjectCreator/modules/Driver.pm: + + Added the -static_only option back in to allow generation of + static projects only. + Thu Mar 20 19:50:36 2003 Steve Huston - * ace/OS.i (ACE_OS::recursive_mutex_cond_unlock): If on WinCE, don't - do the check for RecursionCount; WinCE's structure doesn't have that - member. Also see: - Sat Mar 15 10:55:01 2003 Douglas C. Schmidt + * ace/OS.i (ACE_OS::recursive_mutex_cond_unlock): If on WinCE, don't + do the check for RecursionCount; WinCE's structure doesn't have that + member. Also see: + Sat Mar 15 10:55:01 2003 Douglas C. Schmidt Thu Mar 20 17:51:39 2003 Steve Huston - * bin/MakeProjectCreator/templates/em3vcp.mpd: Only output a linker - /entry option if building a DLL. Let binary programs pick up the - correct entrypoint from the subsystem type. It defaults to windowsce, - requiring WinMainCRTStartup. + * bin/MakeProjectCreator/templates/em3vcp.mpd: Only output a linker + /entry option if building a DLL. Let binary programs pick up the + correct entrypoint from the subsystem type. It defaults to windowsce, + requiring WinMainCRTStartup. Thu Mar 20 14:11:01 2003 Ossama Othman - * ace/Codecs.cpp (encode, decode): + * ace/Codecs.cpp (encode, decode): - Fixed "comparison is always false due to limited range of data - type" warning by removing those comparisons and accompanying - code. + Fixed "comparison is always false due to limited range of data + type" warning by removing those comparisons and accompanying + code. Thu Mar 20 14:00:53 2003 Ossama Othman - * ace/Memory_Pool.cpp (find_seg): + * ace/Memory_Pool.cpp (find_seg): - Fixed overflow in pointer arithmetic on platforms where - sizeof(void*) is greater than sizeof(off_t). This also fixes a - "cast from pointer to integer of different size" warning. + Fixed overflow in pointer arithmetic on platforms where + sizeof(void*) is greater than sizeof(off_t). This also fixes a + "cast from pointer to integer of different size" warning. Thu Mar 20 12:56:26 2003 Ossama Othman - * tests/Recursive_Condition_Bug_Test.cpp: + * tests/Recursive_Condition_Bug_Test.cpp: - Fixed unused variable warning in single-threaded builds. + Fixed unused variable warning in single-threaded builds. Thu Mar 20 12:35:09 2003 Chad Elliott diff --git a/bin/MakeProjectCreator/USAGE b/bin/MakeProjectCreator/USAGE index 00080336dbb..bd0d3ebd4a0 100644 --- a/bin/MakeProjectCreator/USAGE +++ b/bin/MakeProjectCreator/USAGE @@ -12,7 +12,7 @@ projects for each one found. Usage: mwc.pl [-global ] [-include ] [-recurse] [-ti :] [-template ] [-relative NAME=VAR] - [-noreldefs] [-notoplevel] [-static] + [-noreldefs] [-notoplevel] [-static] [-static_only] [-value_template ] [-value_project ] [-type ] [-include ] [-recurse] -template Specifies the template name (with no extension). -static Specifies that static projects will be generated in addition to dynamic projects. + -static_only Specifies that only static projects will be generated. -recurse Recurse from the current directory and generate from all found input files. -relative Any $() variable in an mpc that is matched to NAME @@ -77,6 +78,9 @@ types specified. The -static option can be used to generate static project files in addition to dynamic project files. This currently only applies to the vc6 type. +The -static_only option can be used to avoid generating dynamic project +files. This currently only applies to the vc6 type. + The -noreldefs option says not to generate default relative definitions for ACE_ROOT and TAO_ROOT (which would come from environment variables). @@ -102,7 +106,7 @@ project in the directory from which the script was started. Usage: mpc.pl [-global ] [-include ] [-recurse] [-ti :] [-template ] [-relative NAME=VAR] - [-noreldefs] [-notoplevel] [-static] + [-noreldefs] [-notoplevel] [-static] [-static_only] [-value_template ] [-value_project ] [-type ] [-include ] [-recurse] -template Specifies the template name (with no extension). -static Specifies that static projects will be generated in addition to dynamic projects. + -static_only Specifies that only static projects will be generated. -recurse Recurse from the current directory and generate from all found input files. -relative Any $() variable in an mpc that is matched to NAME diff --git a/bin/MakeProjectCreator/modules/Driver.pm b/bin/MakeProjectCreator/modules/Driver.pm index a57858f111d..81e2c440418 100644 --- a/bin/MakeProjectCreator/modules/Driver.pm +++ b/bin/MakeProjectCreator/modules/Driver.pm @@ -61,7 +61,7 @@ sub usageAndExit { "Usage: $base [-global ] [-include ] [-recurse]\n" . $spaces . "[-ti :]\n" . $spaces . "[-template ] [-relative NAME=VAR]\n" . - $spaces . "[-noreldefs] [-notoplevel] [-static]\n" . + $spaces . "[-noreldefs] [-notoplevel] [-static] [-static_only]\n" . $spaces . "[-value_template ]\n" . $spaces . "[-value_project ]\n" . $spaces . "[-type <"; @@ -92,6 +92,7 @@ sub usageAndExit { " -template Specifies the template name (with no extension).\n" . " -static Specifies that static projects will be generated in\n" . " addition to dynamic projects.\n" . +" -static_only Specifies that only static projects will be generated.\n" . " -recurse Recurse from the current directory and generate from\n" . " all found input files.\n" . " -relative Any \$() variable in an mpc that is matched to NAME\n" . @@ -334,6 +335,10 @@ sub run { elsif ($arg eq '-static') { $static = 1; } + elsif ($arg eq '-static_only') { + $static = 1; + $dynamic = 0; + } elsif ($arg =~ /^-/) { $self->usageAndExit(); } -- cgit v1.2.1