diff options
Diffstat (limited to 'ACE/bin/make_release')
| -rwxr-xr-x | ACE/bin/make_release | 128 |
1 files changed, 58 insertions, 70 deletions
diff --git a/ACE/bin/make_release b/ACE/bin/make_release index 17fd6602c9f..ed25f7b1db5 100755 --- a/ACE/bin/make_release +++ b/ACE/bin/make_release @@ -23,10 +23,9 @@ my $long_usage=" -? option prints this message\n" . " -n option prints what would be done, but doesn't do it\n" . " -v <version>, where <version> is major, minor, or beta (default)\n" . " -t Specifies the tag from which to pull components during release." . - " Uses working copy for exports if not present." . + " Uses working copy for exports if not present."; " -u to update versions\n" . - " -r to specify alternate repository root\n" . - " -d to specify destination for generated packages\n"; + " -r to specify alternate repository root\n"; ######## ######## Sanity checks. @@ -83,7 +82,7 @@ my $gnu2 = '/usr/local/bin:/usr/bin'; ####### Add the path to /usr/bin unconditionally.. $ENV{'PATH'} = "$gnu2" . ':' . $ENV{'PATH'}; -my $repo_root = 'https://svn.dre.vanderbilt.edu/DOC'; +my $repo_root = 'svn+ssh://abbarach.dre.vanderbilt.edu/build/wotte/ACE-svn/DOC'; my $export_dir = '/export/doc/latest'; my $old_versions_dir = '/export/doc/previous-versions'; my $diffs_dir = "$export_dir/diffs"; @@ -99,7 +98,7 @@ my $release_filter = '-iname build -prune -o ' . '! -name \'*.MAK\' ! -name \'.cvsignore\' -print'; my $update_versions = 0; my $create_zips = 1; -my $package_dest = "."; + ######## ######## Process command line args. ######## @@ -141,8 +140,6 @@ while ($#ARGV >= $[ && $ARGV[0] =~ /^-/) { } elsif ($ARGV[0] eq '-?') { print "$usage$long_usage"; exit; - } elsif ($ARGV[0] eq '-d') { - $package_dest = $ARGV[1]; shift; } else { print STDERR "$0: unknown option $ARGV[0]\n"; die "$usage$long_usage"; @@ -274,13 +271,14 @@ if ($update_versions) { #### If a tag was specified, export using the tag from a staging area. #### If not, create a kit from the current directory. - my $stage_dir = "../ACE_wrappers_stage-$$"; + my $stage_dir = "/export/wotte/tmp/ACE_wrappers_stage-$$"; unless ("$exec_prefix") { mkdir "$stage_dir", 0755 || die "$0: unable to mkdir $stage_dir\n"; } # Root for all tags. + if ($kit =~ /ace/) { if ("$kit_tag") { # Export ACE @@ -408,13 +406,13 @@ sub check_workspace () { sub get_and_update_versions () { # Update the version numbers for the various components. my $retval = - get_version ("ACE", 1) || + get_version ("ACE") || update_version_files ("ACE") || update_changelog ("ACE") || - get_version ("TAO", 1) || + get_version ("TAO") || update_version_files ("TAO") || update_changelog ("TAO") || - get_version ("CIAO", 1) || + get_version ("CIAO") || update_version_files ("CIAO") || update_changelog ("CIAO"); @@ -427,7 +425,6 @@ sub get_and_update_versions () { sub get_version { my $component = shift; - my $update_version = shift; print "Getting version information for $component\n"; open (VERSION, "< $component/VERSION") || @@ -454,20 +451,19 @@ sub get_version { } close VERSION; - if ($update_version) { - # Increment the version count - if ($release_type eq 'beta') { - ++$comp_versions{"$component" . "_beta"}; - } elsif ($release_type eq 'minor' ) { - $comp_versions{"$component" . "_beta"} = 0; - ++$comp_versions{"$component" . "_minor"}; - } elsif ($release_type eq 'major' ) { - $comp_versions{"$component" . "_beta"} = - $comp_versions{"$component" . "_minor"} = 0; - ++$comp_versions{"$component" . "_major"}; - } + # Increment the version count + if ($release_type eq 'beta') { + ++$comp_versions{"$component" . "_beta"}; + } elsif ($release_type eq 'minor' ) { + $comp_versions{"$component" . "_beta"} = 0; + ++$comp_versions{"$component" . "_minor"}; + } elsif ($release_type eq 'major' ) { + $comp_versions{"$component" . "_beta"} = + $comp_versions{"$component" . "_minor"} = 0; + ++$comp_versions{"$component" . "_major"}; } + if ($release_type eq 'beta') { $comp_versions{"$component" . "_version"} = $comp_versions{"$component" . "_major"} . '.' . @@ -703,13 +699,6 @@ sub bootstrap_autotools () { ######## sub create_kit { my $src_only = shift; - - get_version ("ACE_wrappers", 0); - - - # Get version but don't udpate version count - (my $local_ace_tag = $comp_versions{"ACE_wrappers_version"}) =~ s|_|.|g; - my $suffix = ""; if ($src_only) { @@ -728,9 +717,9 @@ sub create_kit { my $redirect = $install ? '>' : '\>'; my $shell_cd = $install ? 'cd' : 'echo cd'; - -# (my $local_tao_tag = $kit_tag) =~ s|_|.|g; -# (my $local_ciao_tag = $kit_tag) =~ s|_|.|g; + (my $local_ace_tag = $kit_tag) =~ s|_|.|g; + (my $local_tao_tag = $kit_tag) =~ s|_|.|g; + (my $local_ciao_tag = $kit_tag) =~ s|_|.|g; # These files don't get LF->CRLF conversions done when making the zip. my $bin_files = @@ -757,22 +746,22 @@ sub create_kit { print "RELEASE FILES from CIAO are $release_files \n"; $build_command = - "$rm $package_dest/ACE+TAO+CIAO$suffix.zip; " . + "$rm ACE+TAO+CIAO$suffix.zip; " . "$find $release_files $release_filter | $egrep $bin_files | " . - "zip $package_dest/ACE+TAO+CIAO$suffix.zip -q9@ &&" . + "zip ACE+TAO+CIAO$suffix.zip -q9@ &&" . "$find $release_files $release_filter | $egrep -v $bin_files | " . - "zip $package_dest/ACE+TAO+CIAO$suffix.zip -qlg9@ &&" . + "zip ACE+TAO+CIAO$suffix.zip -qlg9@ &&" . "$find $release_files $release_filter | $cpio -o -H ustar | " . - "$gzip -9 > $package_dest/ACE+TAO+CIAO$suffix.tar.gz && " . + "$gzip -9 > ACE+TAO+CIAO$suffix.tar.gz && " . "$find $release_files $release_filter | $cpio -o -H ustar | " . - "$bzip2 > $package_dest/ACE+TAO+CIAO$suffix.tar.bz2 && " . - "$chmod 664 $package_dest/ACE+TAO+CIAO$suffix.tar.gz $package_dest/ACE+TAO+CIAO$suffix.zip $package_dest/ACE+TAO+CIAO$suffix.tar.bz2 && " . - "$chgrp doc $package_dest/ACE+TAO+CIAO$suffix.tar.gz $package_dest/ACE+TAO+CIAO$suffix.zip $package_dest/ACE+TAO+CIAO$suffix.tar.bz2 && " . - "$dispose $package_dest/ACE+TAO+CIAO$suffix.tar.gz $package_dest/ACE+TAO+CIAO$suffix.zip $package_dest/ACE+TAO+CIAO$suffix.tar.bz2 $dest &&" . + "$bzip2 > ACE+TAO+CIAO$suffix.tar.bz2 && " . + "$chmod 664 ACE+TAO+CIAO$suffix.tar.gz ACE+TAO+CIAO$suffix.zip ACE+TAO+CIAO$suffix.tar.bz2 && " . + "$chgrp doc ACE+TAO+CIAO$suffix.tar.gz ACE+TAO+CIAO$suffix.zip ACE+TAO+CIAO$suffix.tar.bz2 && " . + "$dispose ACE+TAO+CIAO$suffix.tar.gz ACE+TAO+CIAO$suffix.zip ACE+TAO+CIAO$suffix.tar.bz2 $dest &&" . "$cp $dest/ACE+TAO+CIAO$suffix.zip $old_versions_dir/ACE+TAO+CIAO$suffix-$local_ace_tag.zip &&". "$cp $dest/ACE+TAO+CIAO$suffix.tar.gz $old_versions_dir/ACE+TAO+CIAO$suffix-$local_ace_tag.tar.gz &&". "$cp $dest/ACE+TAO+CIAO$suffix.tar.bz2 $old_versions_dir/ACE+TAO+CIAO$suffix-$local_ace_tag.tar.bz2; "; - $archives = " $package_dest/ACE+TAO+CIAO$suffix.tar.gz $package_dest/ACE+TAO+CIAO$suffix.zip $package_dest/ACE+TAO+CIAO$suffix.tar.bz2 "; + $archives = " ACE+TAO+CIAO$suffix.tar.gz ACE+TAO+CIAO$suffix.zip ACE+TAO+CIAO$suffix.tar.bz2 "; } # First dispose of ACE+TAO+CIAO. @@ -806,22 +795,22 @@ sub create_kit { print "RELEASE FILES for TAO are $release_files \n"; $build_command = - "$rm $package_dest/ACE+TAO$suffix.zip; " . + "$rm ACE+TAO$suffix.zip; " . "$find $release_files $release_filter | $egrep $bin_files | " . - "zip $package_dest/ACE+TAO$suffix.zip -q9@ &&" . + "zip ACE+TAO$suffix.zip -q9@ &&" . "$find $release_files $release_filter | $egrep -v $bin_files | " . - "zip $package_dest/ACE+TAO$suffix.zip -qlg9@ &&" . + "zip ACE+TAO$suffix.zip -qlg9@ &&" . "$find $release_files $release_filter | $cpio -o -H ustar | " . - "$gzip -9 > $package_dest/ACE+TAO$suffix.tar.gz && " . + "$gzip -9 > ACE+TAO$suffix.tar.gz && " . "$find $release_files $release_filter | $cpio -o -H ustar | " . - "$bzip2 > $package_dest/ACE+TAO$suffix.tar.bz2 && " . - "$chmod 664 $package_dest/ACE+TAO$suffix.tar.gz $package_dest/ACE+TAO$suffix.zip $package_dest/ACE+TAO$suffix.tar.bz2 && " . - "$chgrp doc $package_dest/ACE+TAO$suffix.tar.gz $package_dest/ACE+TAO$suffix.zip $package_dest/ACE+TAO$suffix.tar.bz2 && " . - "$dispose $package_dest/ACE+TAO$suffix.tar.gz $package_dest/ACE+TAO$suffix.zip $package_dest/ACE+TAO$suffix.tar.bz2 $dest &&" . + "$bzip2 > ACE+TAO$suffix.tar.bz2 && " . + "$chmod 664 ACE+TAO$suffix.tar.gz ACE+TAO$suffix.zip ACE+TAO$suffix.tar.bz2 && " . + "$chgrp doc ACE+TAO$suffix.tar.gz ACE+TAO$suffix.zip ACE+TAO$suffix.tar.bz2 && " . + "$dispose ACE+TAO$suffix.tar.gz ACE+TAO$suffix.zip ACE+TAO$suffix.tar.bz2 $dest &&" . "$cp $dest/ACE+TAO$suffix.zip $old_versions_dir/ACE+TAO$suffix-$local_ace_tag.zip &&". "$cp $dest/ACE+TAO$suffix.tar.gz $old_versions_dir/ACE+TAO$suffix-$local_ace_tag.tar.gz &&". "$cp $dest/ACE+TAO$suffix.tar.bz2 $old_versions_dir/ACE+TAO$suffix-$local_ace_tag.tar.bz2; "; - $archives = " $package_dest/ACE+TAO$suffix.tar.gz $package_dest/ACE+TAO$suffix.zip $package_dest/ACE+TAO$suffix.tar.bz2 "; + $archives = " ACE+TAO$suffix.tar.gz ACE+TAO$suffix.zip ACE+TAO$suffix.tar.bz2 "; } # Dispose of ACE+TAO now @@ -850,37 +839,37 @@ sub create_kit { chomp ($release_files = `$regmake -f $ace_root/Release show_release_files`); $build_command = - "$rm $package_dest/ACE$suffix.zip $package_dest/ACE$suffix-lib.zip; " . + "$rm ACE$suffix.zip ACE$suffix-lib.zip; " . "$find $release_files $release_filter | $egrep $bin_files | " . - "zip $package_dest/ACE$suffix.zip -q9@ &&" . + "zip ACE$suffix.zip -q9@ &&" . "$find $release_files $release_filter | $egrep -v $bin_files | " . - "zip $package_dest/ACE$suffix.zip -qlg9@ &&" . + "zip ACE$suffix.zip -qlg9@ &&" . "$find $release_lib_files $release_filter | $egrep $bin_files | " . - "zip $package_dest/ACE$suffix-lib.zip -q9@ &&" . + "zip ACE$suffix-lib.zip -q9@ &&" . "$find $release_lib_files $release_filter | $egrep -v $bin_files | " . - "zip $package_dest/ACE$suffix-lib.zip -qlg9@ &&" . + "zip ACE$suffix-lib.zip -qlg9@ &&" . "$find $release_files $release_filter | $cpio -o -H ustar | " . - "$gzip -9 > $package_dest/ACE$suffix.tar.gz && " . + "$gzip -9 > ACE$suffix.tar.gz && " . "$find $release_files $release_filter | $cpio -o -H ustar | " . - "$bzip2 > $package_dest/ACE$suffix.tar.bz2 && " . + "$bzip2 > ACE$suffix.tar.bz2 && " . "$find $release_lib_files $release_filter | $cpio -o -H ustar | " . - "$gzip -9 > $package_dest/ACE$suffix-lib.tar.gz && " . + "$gzip -9 > ACE$suffix-lib.tar.gz && " . "$find $release_lib_files $release_filter | $cpio -o -H ustar | " . - "$bzip2 > $package_dest/ACE$suffix-lib.tar.bz2 && " . - "$chmod 664 $package_dest/ACE$suffix.tar.gz $package_dest/ACE$suffix-lib.tar.gz $package_dest/ACE$suffix.tar.bz2 $package_dest/ACE$suffix-lib.tar.bz2 ". - "$package_dest/ACE$suffix.zip $package_dest/ACE$suffix-lib.zip && " . - "$chgrp doc $package_dest/ACE$suffix.tar.gz $package_dest/ACE$suffix-lib.tar.gz $package_dest/ACE$suffix.tar.bz2 $package_dest/ACE$suffix-lib.tar.bz2 ". - "$package_dest/ACE$suffix.zip $package_dest/ACE$suffix-lib.zip && " . - "$dispose $package_dest/ACE$suffix.zip $package_dest/ACE$suffix-lib.zip $dest && " . - "$dispose $package_dest/ACE$suffix.tar.gz $package_dest/ACE$suffix-lib.tar.gz $package_dest/ACE$suffix.tar.bz2 $package_dest/ACE$suffix-lib.tar.bz2 $dest && " . + "$bzip2 > ACE$suffix-lib.tar.bz2 && " . + "$chmod 664 ACE$suffix.tar.gz ACE$suffix-lib.tar.gz ACE$suffix.tar.bz2 ACE$suffix-lib.tar.bz2 ". + "ACE$suffix.zip ACE$suffix-lib.zip && " . + "$chgrp doc ACE$suffix.tar.gz ACE$suffix-lib.tar.gz ACE$suffix.tar.bz2 ACE$suffix-lib.tar.bz2 ". + "ACE$suffix.zip ACE$suffix-lib.zip && " . + "$dispose ACE$suffix.zip ACE$suffix-lib.zip $dest && " . + "$dispose ACE$suffix.tar.gz ACE$suffix-lib.tar.gz ACE$suffix.tar.bz2 ACE$suffix-lib.tar.bz2 $dest && " . "$cp $dest/ACE$suffix.zip $old_versions_dir/$local_ace_tag.zip &&". "$cp $dest/ACE$suffix-lib.zip $old_versions_dir/$local_ace_tag-lib.zip &&". "$cp $dest/ACE$suffix.tar.gz $old_versions_dir/$local_ace_tag.tar.gz &&". "$cp $dest/ACE$suffix-lib.tar.gz $old_versions_dir/$local_ace_tag-lib.tar.gz &&". "$cp $dest/ACE$suffix.tar.bz2 $old_versions_dir/$local_ace_tag.tar.bz2 &&". "$cp $dest/ACE$suffix-lib.tar.bz2 $old_versions_dir/$local_ace_tag-lib.tar.bz2;"; - $archives = " $package_dest/ACE$suffix.tar.gz $package_dest/ACE$suffix-lib.tar.gz ". - "$package_dest/ACE$suffix.zip $package_dest/ACE$suffix-lib.zip $package_dest/ACE$suffix.tar.bz2 $package_dest/ACE$suffix-lib.tar.bz2 "; + $archives = " ACE$suffix.tar.gz ACE$suffix-lib.tar.gz ". + "ACE$suffix.zip ACE$suffix-lib.zip ACE$suffix.tar.bz2 ACE$suffix-lib.tar.bz2 "; } # Now dispose of ACE in all its glory @@ -896,7 +885,6 @@ sub create_kit { } - ######## ######## Execute a command, unless -n had been specified. Return value ######## of 0 indicates success. |