Changeset 652 for trunk


Ignore:
Timestamp:
Jun 8, 2006, 2:15:09 PM (13 years ago)
Author:
bcornec
Message:

merge -r641:651 $SVN_M/branches/stable

Location:
trunk
Files:
4 edited
4 copied

Legend:

Unmodified
Added
Removed
  • trunk/tools/mkchangelog.pl

    r649 r652  
    1010use strict;
    1111use Date::Manip;
     12use File::Basename;
     13use English;
    1214
    1315my $log = "";
     
    1618my $pkg2;
    1719my $outfile = $ARGV[2];
    18 my $TOOLHOME = $ENV{TOOLHOME};
    1920my $chglog = "";
    2021my $ndate = "";
     
    3031        (not (defined $pkg)) || ($pkg eq "") ||
    3132        (not (defined $outfile)) || ($outfile eq ""));
     33
     34my $TOOLHOME;
     35$tmp = dirname($PROGRAM_NAME);
     36if ($tmp =~ /^\//) {
     37    $TOOLHOME = $tmp;
     38    }
     39else {
     40    $TOOLHOME = "$ENV{PWD}/$tmp";
     41    }
     42
     43die "TOOLHOME doesn't exist" if (not (defined $TOOLHOME));
    3244
    3345if (-f "$TOOLHOME/../$pkg/ChangeLog") {
     
    5264$tmp = <INPUT>;
    5365$tmp = <INPUT>;
     66if ($dtype eq "announce") {
     67    print OUTPUT $tmp;
     68}
    5469$tmp = <INPUT>;
     70if ($dtype eq "announce") {
     71    print OUTPUT $tmp;
     72}
    5573
    5674# Handle each block separated by newline
     
    5977    chomp($date);
    6078    $date =~ s/\(([0-9-]+)\)/$1/;
    61     print "**$date**\n";
     79    #print "**$date**\n";
    6280    $ndate = UnixDate($date,"%a", "%b", "%d", "%Y");
    63     print "**$ndate**\n";
     81    #print "**$ndate**\n";
    6482    if ($dtype eq "rpm") {
    65         printf OUTPUT "* $ndate Bruno Cornec <bruno\@mondorescue.org> $ver\n";
    66         printf OUTPUT "- Updated to $ver\n";
     83        print OUTPUT "* $ndate Bruno Cornec <bruno\@mondorescue.org> $ver\n";
     84        print OUTPUT "- Updated to $ver\n";
     85        }
    6786
    68         $tmp = <INPUT>;
    69         while ($tmp !~ /^$/) {
    70             printf OUTPUT $tmp;
    71             $tmp = <INPUT>;
    72         }
    73         printf OUTPUT "\n";
     87    $tmp = <INPUT>;
     88    while ($tmp !~ /^$/) {
     89        print OUTPUT $tmp;
     90        last if (eof(INPUT));
     91        $tmp = <INPUT>;
    7492    }
     93    print OUTPUT "\n";
     94    last if (eof(INPUT));
     95    last if ($dtype eq "announce");
    7596}
    7697close(OUTPUT);
  • trunk/tools/mknewtag

    r649 r652  
    88#
    99
    10 umask 022
    1110dname=`dirname $0`
    1211prem=`echo $dname |cut -c1`
     
    3938else
    4039    for p in mindi mondo; do
    41         grep -q "${VER}-${TAG}" $TOOLHOME/../$p/Changelog
     40        v=`cat $TOOLHOME/../$p/VERSION`
     41        grep -q "${v}-${TAG}" $TOOLHOME/../$p/ChangeLog
    4242        if [ $? -ne 0 ]; then
    43             echo "You'll have to document in ${p}'s Changelog for ${VER}-${TAG} related modifications"
     43            echo "You'll have to document in ${p}'s ChangeLog for ${v}-${TAG} related modifications"
    4444            exit -1
    4545        fi
  • trunk/tools/svn2build

    r649 r652  
    5454
    5555        ddd=`LANG=C ; date '+%Y-%m-%d'`
    56         cat > /tmp/mondorescue.mc << EOF
     56        cat > $TMP/mondorescue.mc << EOF
    5757define(\`TTT', ${TAG})dnl
    5858define(\`RRR', ${TAG}${suf})dnl
     
    7272            fi
    7373            echo "Using $inc customization to build SPEC file"
    74             m4 /tmp/mondorescue.mc $inc $dest/distributions/rpm/$p.spec > $dest/distributions/${ddir}-$dver/$p.spec
     74            m4 $TMP/mondorescue.mc $inc $dest/distributions/rpm/$p.spec > $dest/distributions/${ddir}-$dver/$p.spec
    7575
    76             $TOOLHOME/mkchangelog.pl $dtype $p $dest/distributions/${ddir}-$dver/$p.spec
     76            $TOOLHOME/mkchangelog.pl $dtype $p $TMP/$p.spec
    7777            if [ $? -ne 0 ]; then
    7878                echo "Unable to create changelog for ${ddir}-$dver/$p.spec"
    7979                exit -1
    8080            fi
    81 
    82             ddate=`LANG=C ; date "+%a %b %d %Y"`
    83             cat > $dest/distributions/${ddir}-$dver/$p.changelog.new << EOF
    84 * $ddate Bruno Cornec <bruno@mondorescue.org> VVV-RRR
    85 - Updated to VVV-r${REVISION}
    86 
    87 EOF
     81            cat $TMP/$p.spec >> $dest/distributions/${ddir}-$dver/$p.spec
     82            rm -f $TMP/$p.spec
    8883        elif [ "$dtype" = "ebuild" ]; then
    89             m4 /tmp/mondorescue.mc $dest/distributions/$dfam/$p.ebuild > $dest/distributions/${ddir}-$dver/$p-$v-r$TAG.ebuild
     84            m4 $TMP/mondorescue.mc $dest/distributions/$dfam/$p.ebuild > $dest/distributions/${ddir}-$dver/$p-$v-r$TAG.ebuild
    9085        elif [ "$dtype" = "deb" ]; then
    9186            # To be developped
    92             m4 /tmp/mondorescue.mc $dest/distributions/$dfam/$p > /dev/null
     87            m4 $TMP/mondorescue.mc $dest/distributions/$dfam/$p > /dev/null
    9388        else
    9489            echo "Unknown Build"
     
    9994        cd $dest
    10095        for f in mondorescue-howto.sgml *8; do
    101             m4 /tmp/mondorescue.mc $f > ${f}.new
     96            m4 $TMP/mondorescue.mc $f > ${f}.new
    10297            mv ${f}.new $f
    10398        done
     
    139134done
    140135
    141 rm -f /tmp/mondorescue.mc
     136rm -f $TMP/mondorescue.mc
    142137
    143138echo "Version delivered :"
  • trunk/website/index.shtml

    r418 r652  
    3232    <p>Original Author</p>
    3333  <p>
    34   <a href="mailto:hugo_at_mondorescue.org">Hugo Rabson</a>: Creator of Mondo Rescue. The Mondo Rescue <a href="http://oldwww.mondorescue.org">original Web site</a> made by Hugo is also still available. Note that the paypal icon there is for rewarding Hugo's work, but has nothing to do with the current deveopment of Mondo Rescue.<br>
     34  <a href="mailto:hugo_at_mondorescue.org">Hugo Rabson</a>: Creator of Mondo Rescue. The Mondo Rescue <a href="http://oldwww.mondorescue.org">original Web site</a> made by Hugo is also still available. Note that the paypal icon there is for rewarding Hugo's work, but has nothing to do with the current development of Mondo Rescue.<br>
    3535  </p>
    3636
Note: See TracChangeset for help on using the changeset viewer.