diff options
| -rw-r--r-- | ChangeLog | 20 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 20 | ||||
| -rwxr-xr-x | bin/make_release | 51 |
3 files changed, 71 insertions, 20 deletions
diff --git a/ChangeLog b/ChangeLog index da4f4be6d4f..1807772e611 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,23 @@ +Wed Jan 15 10:48:11 2003 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> + + * bin/make_release: Did the following enhancements + + - If it is a minor release do not append the beta version. Looks + like somone broke this and the script started writing out + things as x.3.0, whcih is bad BTW. + + - We now POSIX.1 tar, instead of old tar format with the -H + option in cpio. This helps to tar files deep in the hierarchy + tree to be properly zipped. We were loosing this in many + betas. + + - Fixes for the generated filenames copied into the + previous_versions directory. + + - Fix to get the right Version.h file in TAO. + + - + Tue Jan 14 18:51:49 2003 Steve Huston <shuston@riverace.com> * ace/Auto_Ptr.h: Added pragma to disable warning 4284 for Microsoft diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index da4f4be6d4f..1807772e611 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,23 @@ +Wed Jan 15 10:48:11 2003 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> + + * bin/make_release: Did the following enhancements + + - If it is a minor release do not append the beta version. Looks + like somone broke this and the script started writing out + things as x.3.0, whcih is bad BTW. + + - We now POSIX.1 tar, instead of old tar format with the -H + option in cpio. This helps to tar files deep in the hierarchy + tree to be properly zipped. We were loosing this in many + betas. + + - Fixes for the generated filenames copied into the + previous_versions directory. + + - Fix to get the right Version.h file in TAO. + + - + Tue Jan 14 18:51:49 2003 Steve Huston <shuston@riverace.com> * ace/Auto_Ptr.h: Added pragma to disable warning 4284 for Microsoft diff --git a/bin/make_release b/bin/make_release index b4ccf4908a0..103df8f7cc4 100755 --- a/bin/make_release +++ b/bin/make_release @@ -478,7 +478,13 @@ sub get_versions () { ++$major_version; } - $version = "$major_version.$minor_version.$beta_version"; + # How much of redundancy in code thinking that we will do ACE+TAO + # releases seperately! + if ($release_type eq 'beta') { + $version = "$major_version.$minor_version.$beta_version"; + } elsif ($release_type eq 'minor' ) { + $version = "$major_version.$minor_version"; + } print "new $KIT version: $version\n"; @@ -504,8 +510,13 @@ sub get_versions () { } } close ACE_VERSION; + + if ($release_type eq 'beta') { + $ace_version = "$ace_major_version.$ace_minor_version.$ace_beta_version"; + } elsif ($release_type eq 'minor' ) { + $ace_version = "$ace_major_version.$ace_minor_version"; + } - $ace_version = "$ace_major_version.$ace_minor_version.$ace_beta_version"; } 0; @@ -610,7 +621,7 @@ sub update_changelog () { rename "ChangeLog.bak", "ChangeLog" || return 1; - my $version_h = $kit =~ /^ace/ ? 'ace/Version.h' : 'tao/Version.h'; + my $version_h = $kit =~ /^ace/ ? 'ace/Version.h' : 'TAO/tao/Version.h'; my $version_mpb = $kit =~ /^ace/ ? 'bin/MakeProjectCreator/config/aceversion.mpb' : 'bin/MakeProjectCreator/config/taoversion.mpb'; # Incase you are wondering what is all this about. We are trying to @@ -763,17 +774,17 @@ sub create_kit () { "zip ACE-lib.zip -q9@ &&" . "$find $release_lib_files $release_filter | $egrep -v $bin_files | " . "zip ACE-lib.zip -qlg9@ &&" . - "$find $release_files $release_filter | $cpio -o -H tar | " . + "$find $release_files $release_filter | $cpio -o -H ustar | " . "$gzip -9 > ACE.tar.gz && " . - "$find $release_files $release_filter | $cpio -o -H tar | " . + "$find $release_files $release_filter | $cpio -o -H ustar | " . "$bzip2 > ACE.tar.bz2 && " . - "$find $release_lib_files $release_filter | $cpio -o -H tar | " . + "$find $release_lib_files $release_filter | $cpio -o -H ustar | " . "$gzip -9 > ACE-lib.tar.gz && " . - "$find $release_lib_files $release_filter | $cpio -o -H tar | " . + "$find $release_lib_files $release_filter | $cpio -o -H ustar | " . "$bzip2 > ACE-lib.tar.bz2 && " . - "$find ACE_wrappers/html $release_filter | $cpio -o -H tar | " . + "$find ACE_wrappers/html $release_filter | $cpio -o -H ustar | " . "$gzip -9 > ACE-html.tar.gz && ". - "$find ACE_wrappers/html $release_filter | $cpio -o -H tar | " . + "$find ACE_wrappers/html $release_filter | $cpio -o -H ustar | " . "$bzip2 -9 > ACE-html.tar.bz2 && ". "$find ACE_wrappers/html $release_filter | $egrep $bin_files | " . "zip ACE-html.zip -q9@ &&" . @@ -798,9 +809,9 @@ sub create_kit () { "ACE.zip ACE-lib.zip ACE-html.zip ACE.tar.bz2 ACE-lib.tar.bz2 ACE-html.tar.bz2 "; } else { $build_command = - "$find $release_files $release_filter | $cpio -o -H tar | " . + "$find $release_files $release_filter | $cpio -o -H ustar | " . "$gzip -9 > ACE.tar.gz && " . - "$find $release_lib_files $release_filter | $cpio -o -H tar | " . + "$find $release_lib_files $release_filter | $cpio -o -H ustar | " . "$gzip -9 > ACE-lib.tar.gz && " . "$find ACE_wrappers/html $release_filter | $cpio -o -H tar | " . "$gzip -9 > ACE-html.tar.gz && ". @@ -827,30 +838,30 @@ sub create_kit () { "zip ACE+TAO.zip -q9@ &&" . "$find $release_files $release_filter | $egrep -v $bin_files | " . "zip ACE+TAO.zip -qlg9@ &&" . - "$find $release_files $release_filter | $cpio -o -H tar | " . + "$find $release_files $release_filter | $cpio -o -H ustar | " . "$gzip -9 > ACE+TAO.tar.gz && " . - "$find $release_files $release_filter | $cpio -o -H tar | " . + "$find $release_files $release_filter | $cpio -o -H ustar | " . "$bzip2 > ACE+TAO.tar.bz2 && " . "$chmod 664 ACE+TAO.tar.gz ACE+TAO.zip ACE+TAO.tar.bz2 && " . "$chgrp doc ACE+TAO.tar.gz ACE+TAO.zip ACE+TAO.tar.bz2 && " . "$dispose ACE+TAO.tar.gz ACE+TAO.zip ACE+TAO.tar.bz2 $dest &&" . - "$cp $dest/ACE+TAO.zip $old_versions_dir/ACE+TAO-$local_ace_tag+$local_tao_tag.zip &&". - "$cp $dest/ACE+TAO.tar.gz $old_versions_dir/ACE+TAO-$local_ace_tag+$local_tao_tag.tar.gz &&". - "$cp $dest/ACE+TAO.tar.bz2 $old_versions_dir/ACE+TAO-$local_ace_tag+$local_tao_tag.tar.bz2; "; + "$cp $dest/ACE+TAO.zip $old_versions_dir/$local_ace_tag+$local_tao_tag.zip &&". + "$cp $dest/ACE+TAO.tar.gz $old_versions_dir/$local_ace_tag+$local_tao_tag.tar.gz &&". + "$cp $dest/ACE+TAO.tar.bz2 $old_versions_dir/$local_ace_tag+$local_tao_tag.tar.bz2; "; $archives .= " ACE+TAO.tar.gz ACE+TAO.zip ACE+TAO.tar.bz2 "; } else { $build_command .= - "$find $release_files $release_filter | $cpio -o -H tar | " . + "$find $release_files $release_filter | $cpio -o -H ustar | " . "$gzip -9 > ACE+TAO.tar.gz && " . - "$find $release_files $release_filter | $cpio -o -H tar | " . + "$find $release_files $release_filter | $cpio -o -H ustar | " . "$bzip2 > ACE+TAO.tar.bz2 && " . "$chmod 664 ACE+TAO.tar.gz && " . "$chmod 664 ACE+TAO.tar.bz2 && " . "$chgrp doc ACE+TAO.tar.gz && " . "$chgrp doc ACE+TAO.tar.bz2 && " . "$dispose ACE+TAO.tar.gz ACE+TAO.tar.bz2 $dest &&" . - "$cp $dest/ACE+TAO.tar.gz $old_versions_dir/ACE+TAO-$local_ace_tag+$local_tao_tag.tar.gz &&" . - "$cp $dest/ACE+TAO.tar.bz2 $old_versions_dir/ACE+TAO-$local_ace_tag+$local_tao_tag.tar.bz2; "; + "$cp $dest/ACE+TAO.tar.gz $old_versions_dir/$local_ace_tag+$local_tao_tag.tar.gz &&" . + "$cp $dest/ACE+TAO.tar.bz2 $old_versions_dir/$local_ace_tag+$local_tao_tag.tar.bz2; "; $archives .= " ACE+TAO.tar.gz ACE+TAO.tar.bz2 "; } } |