diff options
| -rw-r--r-- | ChangeLog-99b | 8 | ||||
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | TAO/ChangeLog-99c | 4 | ||||
| -rw-r--r-- | TAO/Makefile | 2 | ||||
| -rwxr-xr-x | bin/make_release | 30 |
5 files changed, 31 insertions, 17 deletions
diff --git a/ChangeLog-99b b/ChangeLog-99b index fcd6b31d601..9ace12de985 100644 --- a/ChangeLog-99b +++ b/ChangeLog-99b @@ -1,3 +1,11 @@ +Thu Jul 15 12:19:44 1999 David L. Levine <levine@cs.wustl.edu> + + * bin/make_release: added -u option, to allow updating the + version stamps from any directory. Also, added suppression + of cvs checkout warning about empty ("New") directories. + + * Makefile: added -u to make_release invocations. + Thu Jul 15 11:39:44 1999 David L. Levine <levine@cs.wustl.edu> * ACE version 4.6.45 released. @@ -161,14 +161,14 @@ release: ACE-INSTALL NEWS @$(GENERATE_MAN_PAGES) @$(ACE_ROOT)/bin/make_release $(CHECK) -k ace -t $(REL) \ -c "$(CONTROLLED_FILES)" -r "$(RELEASE_FILES)" \ - -l "$(RELEASE_LIB_FILES)" + -l "$(RELEASE_LIB_FILES)" -u #### The following target is for use by the TAO Makefile. It should not #### be called directly from the command line. The releasetao target #### creates the combined ACE-TAO kit. releasetao: @$(ACE_ROOT)/bin/make_release $(CHECK) -k ace+tao -t $(REL) \ - -c "$(CONTROLLED_FILES)" -r "$(ALL_RELEASE_FILES)" + -c "$(CONTROLLED_FILES)" -r "$(ALL_RELEASE_FILES)" -u #### The releaseall target: #### 1) Creates the ACE kit. diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c index 2e7aae31dfb..84e20f87e5c 100644 --- a/TAO/ChangeLog-99c +++ b/TAO/ChangeLog-99c @@ -1,3 +1,7 @@ +Thu Jul 15 12:19:44 1999 David L. Levine <levine@cs.wustl.edu> + + * Makefile: added -u to make_release invocation. + Thu Jul 15 11:47:08 1999 David L. Levine <levine@cs.wustl.edu> * TAO version 0.4.2 released. diff --git a/TAO/Makefile b/TAO/Makefile index 9af9addbdc7..169784a4efc 100644 --- a/TAO/Makefile +++ b/TAO/Makefile @@ -104,5 +104,5 @@ CHECK = #### Then, make releasetao is invoked to actually create the kit. release: INSTALL @$(ACE_ROOT)/bin/make_release $(CHECK) -k tao -t $(REL) \ - -c "$(CONTROLLED_FILES)" -r "$(RELEASE_FILES)" && \ + -c "$(CONTROLLED_FILES)" -r "$(RELEASE_FILES)" -u && \ cd .. && $(MAKE) releasetao diff --git a/bin/make_release b/bin/make_release index 8d1ec42cdde..cecab1730ed 100755 --- a/bin/make_release +++ b/bin/make_release @@ -1,5 +1,5 @@ eval '(exit $?0)' && eval 'exec perl -w -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' + & eval 'exec perl -w -S $0 $argv:q' if 0; # $Id$ @@ -12,16 +12,16 @@ eval '(exit $?0)' && eval 'exec perl -w -S $0 ${1+"$@"}' # Taken from perlrun man page. $usage="usage: $0 [-?] [-k <kit>] [-n] [-t <type>] " . - "[-c <controlled files>] [-r <release files>] " . - "[-l <release lib files]\n"; + "[-c <controlled files>] [-r <release files>] " . + "[-l <release lib files] [-u]\n"; $long_usage=" -? option prints this message\n" . - " -k <kit>, where <kit> is ace, tao, or ace+tao\n" . - " -n option prints what would be done, but doesn't do it\n" . - " -t <type>, where <type> is major, minor, or beta (default)\n" . - " -c <controlled files> lists the CVS-controlled files\n" . - " -r <release files> lists the files to be released\n" . - " -l <release lib files> list the files to put in the lib kit\n"; - + " -k <kit>, where <kit> is ace, tao, or ace+tao\n" . + " -n option prints what would be done, but doesn't do it\n" . + " -t <type>, where <type> is major, minor, or beta (default)\n" . + " -c <controlled files> lists the CVS-controlled files\n" . + " -r <release files> lists the files to be released\n" . + " -l <release lib files> list the files to put in the lib kit\n" . + " -u to update versions\n"; ######## ######## Configuration parameters. @@ -43,6 +43,7 @@ $release_files = ''; $release_filter = '\\( -name CVS -o -name build \\) -prune -o ' . '! -name \'.\#*\' ! -name \'\#*\' ! -name \'*~\' ' . '! -name \'*.MAK\' -print'; +$update_versions = 0; ######## @@ -90,6 +91,8 @@ while ($#ARGV >= $[ && $ARGV[0] =~ /^-/) { print STDERR "$0: must provide argument for -l option\n"; die "$usage$long_usage"; } + } elsif ($ARGV[0] eq '-u') { + $update_versions = 1; } elsif ($ARGV[0] eq '-?') { print "$usage$long_usage"; exit; @@ -101,13 +104,10 @@ while ($#ARGV >= $[ && $ARGV[0] =~ /^-/) { } die "must specify a -k option\n" unless "$kit"; -$update_versions = 0; if ($kit eq 'ace') { $KIT = 'ACE'; - $update_versions = (`pwd` eq "/project/adaptive/ACE_wrappers\n"); } elsif ($kit eq 'tao') { $KIT = 'TAO'; - $update_versions = (`pwd` eq "/project/adaptive/ACE_wrappers/TAO\n"); } else { #### Creating combined ACE+TAO kit. Don't use $KIT. }; @@ -181,10 +181,12 @@ sub check_workspace () { } my @out_of_date = (); - open (CVS, "$cvs -nq checkout -P $module |") || + open (CVS, "$cvs -nq checkout -P $module 2>&1 |") || die "$0: unable to open $cvs\n"; while (<CVS>) { next if m%^U %; #### Allow others to update the repository. + next if m%^cvs checkout: New directory `.*' -- ignored$%; #### empty dirs. + push (@out_of_date, $_) if "$_"; } close CVS; |