diff options
Diffstat (limited to 'bin/make_release')
| -rwxr-xr-x | bin/make_release | 42 |
1 files changed, 13 insertions, 29 deletions
diff --git a/bin/make_release b/bin/make_release index d7d52fda0bf..183af2ed167 100755 --- a/bin/make_release +++ b/bin/make_release @@ -578,9 +578,8 @@ sub update_version_files () { die "$0: unable to open ciao/Version.h\n"; print CIAO_VERSION_H - "// -*- C++ -*-\n" . - "// \$Id\$\n\n" . - "// This is file was automatically generated by \$ACE_ROOT/bin/make_release.\n\n" . + "// \$Id\$\n" . + "// This is an automatically generated file.\n\n" . "\#define CIAO_MAJOR_VERSION ${major_version}\n" . "\#define CIAO_MINOR_VERSION ${minor_version}\n" . "\#define CIAO_BETA_VERSION ${beta_version}\n" . @@ -606,9 +605,8 @@ sub update_version_files () { die "$0: unable to open tao/Version.h\n"; print TAO_VERSION_H - "// -*- C++ -*-\n" . - "// \$Id\$\n\n" . - "// This is file was automatically generated by \$ACE_ROOT/bin/make_release.\n\n" . + "// \$Id\$\n" . + "// This is an automatically generated file.\n\n" . "\#define TAO_MAJOR_VERSION ${major_version}\n" . "\#define TAO_MINOR_VERSION ${minor_version}\n" . "\#define TAO_BETA_VERSION ${beta_version}\n" . @@ -630,14 +628,12 @@ sub update_version_files () { die "$0: unable to open ace/Version.h\n"; print ACE_VERSION_H - "// -*- C++ -*-\n" . - "// \$Id\$\n\n" . - "// This is file was automatically generated by \$ACE_ROOT/bin/make_release.\n\n" . + "// \$Id\$\n" . + "// This is an automatically generated file.\n\n" . "\#define ACE_MAJOR_VERSION ${major_version}\n" . "\#define ACE_MINOR_VERSION ${minor_version}\n" . "\#define ACE_BETA_VERSION ${beta_version}\n" . - "\#define ACE_VERSION \"${version}\"\n\n"; -## "\#include \"ace/Versioned_Namespace.h\"\n"; + "\#define ACE_VERSION \"${version}\"\n"; close ACE_VERSION_H; } @@ -775,6 +771,10 @@ sub diff () { ######## sub generate_makefiles () { + # At this point, the only mwc/mpc files are in ace and tests. When more + # are available, this needs to be updated, maybe by cycling through + # all non-TAO directories looking for mwc (or mpc?) files. + # # The current ACE_ROOT setting is where this script started from, not # the staging area we want to generate files in. So, we need to # specifically set the -relative option on mwc to replace ACE_ROOT @@ -784,38 +784,22 @@ sub generate_makefiles () { my $here = Cwd::getcwd(); print "My current wok in generate makefiles $here \n"; - my $exclude_option = '-exclude TAO/TAO_*.mwc,TAO/CIAO/CIAO_*.mwc'; + my $exclude_option = '-exclude TAO/TAOACE.mwc,TAO/CIAO/CIAOTAO.mwc'; my $tmp_mpc_option = '-recurse -hierarchy -relative ACE_ROOT='; my $mpc_option = $tmp_mpc_option.$here.'/ACE_wrappers'; my $tmp_static_option = - '-static -name_modifier *_Static -apply_project -exclude TAO/CIAO,TAO/TAO_*.mwc '; + '-static -name_modifier *_Static -apply_project -exclude TAO/CIAO,TAO/TAOACE.mwc '; my $static_option = $tmp_static_option.$mpc_option; - # Visual Studio 2005 (aka VC8) uses the same file suffixes as VC7.1, so - # append _vc8 to the names. - my $vc8_option = '-name_modifier *_vc8'; - - # Additionally, VC8 can do Windows CE builds and these can be - # configured in. However, the CE builds have uses_wchar turned on, - # so we don't mix them with the Win32 VC8 files. The complete list of - # available platforms known at this point is in - # $MPC_ROOT/template/vc8_platforms.mpt - since the default is Win32 - # and we're generating only CE builds, replace it instead of adding to it. - my $tmp_ce = '-value_template platforms=\'"Pocket PC 2003 (ARMV4)"\' '; - $tmp_ce = $tmp_ce.'-value_template platforms+=\'"Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"\''; - my $ce_option = '-name_modifier *_WinCE -features "uses_wchar=1,wince=1" '.$tmp_ce; - &ex ("cd ACE_wrappers; \ bin/mwc.pl $exclude_option $mpc_option; \ find ./ -name 'GNUmake*' | /usr/bin/xargs chmod 0644"); &ex ("cd ACE_wrappers; \ - bin/mwc.pl -type vc8 $mpc_option $exclude_option $vc8_option; \ - bin/mwc.pl -type vc8 $mpc_option $exclude_option $ce_option; \ bin/mwc.pl -type vc71 $mpc_option $exclude_option; \ bin/mwc.pl -type vc6 $mpc_option $exclude_option; \ bin/mwc.pl -type borland $mpc_option $exclude_option; \ |