mirror of
https://github.com/anope/anope.git
synced 2026-07-10 00:03:13 +02:00
BUILD : 1.6.0 (4) BUGS : none NOTES : File cleanup and new AnopeManager script (bin/am) to work with Anope source control. Version schema change with no impact on cpp directives.
git-svn-id: svn://svn.anope.org/anope/trunk@4 31f1291d-b8d6-0310-a050-a5561fc1590b git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@2 5417fbe8-f217-4b02-8779-1006273d7864
This commit is contained in:
dane dane@31f1291d-b8d6-0310-a050-a5561fc1590b
parent
55bf4dbcab
commit
811ce26663
Vendored
-1
@@ -1 +0,0 @@
|
||||
-kr -nut
|
||||
@@ -8,7 +8,7 @@
|
||||
* Based on the original code of Epona by Lara.
|
||||
* Based on the original code of Services by Andy Church.
|
||||
*
|
||||
* $Id: actions.c,v 1.6 2003/07/20 01:15:49 dane Exp $
|
||||
* $Id$
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
@@ -0,0 +1,421 @@
|
||||
#!/usr/bin/env perl
|
||||
|
||||
# ====================================================================
|
||||
# anomgr: Anope Manager. Used to manage anope revision on SubVersion.
|
||||
#
|
||||
# For usage, see the usage subroutine or run the script with no
|
||||
# command line arguments.
|
||||
#
|
||||
# $HeadURL: $
|
||||
# $LastChangedDate: $
|
||||
# $LastChangedBy: $
|
||||
# $LastChangedRevision: $
|
||||
#
|
||||
# ====================================================================
|
||||
require 5.6.0;
|
||||
use strict;
|
||||
use Getopt::Std;
|
||||
use Net::FTP;
|
||||
use Cwd;
|
||||
|
||||
######################################################################
|
||||
# Configuration section.
|
||||
my $myver="1.0";
|
||||
my $svnrev="http://www.zero.org/anosvn.php";
|
||||
my $fhint="version.log";
|
||||
|
||||
# Default values, change or use environment variables instead.
|
||||
my $copy="anope";
|
||||
my $svnpath="/usr/bin";
|
||||
my $svnroot="svn://zero.org/repos/$copy";
|
||||
my $editor="/usr/bin/vi";
|
||||
|
||||
# Environment variables SVNBINDIR and SVNROOT override the above
|
||||
# hardcoded values.
|
||||
$svnpath="$ENV{SVNBINDIR}" if ($ENV{SVNBINDIR});
|
||||
$svnroot="$ENV{SVNROOT}" if ($ENV{SVNROOT});
|
||||
$editor="$ENV{EDITOR}" if ($ENV{EDITOR});
|
||||
|
||||
# Svnlook path.
|
||||
my $svnlook = "$svnpath/svnlook";
|
||||
|
||||
# Svn path.
|
||||
my $svn = "$svnpath/svn";
|
||||
|
||||
# wget path. Need to change to a perl module instead...
|
||||
my $wget = "$svnpath/wget";
|
||||
|
||||
my (
|
||||
$rev,
|
||||
$branch,
|
||||
$tag,
|
||||
$ftp,
|
||||
$dst,
|
||||
$ver_major,
|
||||
$ver_minor,
|
||||
$ver_patch,
|
||||
$ver_build,
|
||||
$ver_revision,
|
||||
$ver_comment,
|
||||
$svn_comment,
|
||||
$cver,
|
||||
$nver,
|
||||
$ctrlfile,
|
||||
$tmpfile,
|
||||
@source,
|
||||
%opt
|
||||
);
|
||||
|
||||
{
|
||||
my $ok = 1;
|
||||
foreach my $program ($svnlook, $svn, $editor)
|
||||
{
|
||||
if (-e $program)
|
||||
{
|
||||
unless (-x $program)
|
||||
{
|
||||
warn "$0: required program `$program' is not executable, ",
|
||||
"edit $0.\n";
|
||||
$ok = 0;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
warn "$0: required program `$program' does not exist, edit $0.\n";
|
||||
$ok = 0;
|
||||
}
|
||||
}
|
||||
exit 1 unless $ok;
|
||||
}
|
||||
|
||||
sub usage()
|
||||
{
|
||||
# More features to add:
|
||||
# --diff N:M to produce a diff between revisions
|
||||
# --bugs CLI method to add bug number to the commit message
|
||||
# --mesg CLI methos to add the commit message
|
||||
# --create-branch to create a branch
|
||||
# --create-tag to create a tag
|
||||
# --switch to switch between branches/tags
|
||||
print "Usage: $0 <-g | -p | -f> [-r revision | -b branch | -t tag] <destination>\n";
|
||||
print " Operations:\n";
|
||||
print " -g Get Operation\n";
|
||||
print " -p Put Operation\n";
|
||||
print " -f[tar|diff] FTP Operation, retrieve latest tar or diff\n";
|
||||
print " Selector:\n";
|
||||
print " -r revision Retrieve by revision number\n";
|
||||
print " -b branch Retrieve by branch name\n";
|
||||
print " -t tag Retrieve by tag name\n";
|
||||
print " Destination:\n";
|
||||
print " The working copy to perform the operation in or to. The script will \n";
|
||||
print " try to guess where that is, unless you provide a specific path.\n";
|
||||
exit;
|
||||
}
|
||||
|
||||
sub banner() {
|
||||
|
||||
print "Anope Source Managemnt Utility - Version $myver\n\n";
|
||||
|
||||
}
|
||||
|
||||
sub getans {
|
||||
my $ans;
|
||||
while (! (($ans =~ /y/) || ($ans =~ /n/))) {
|
||||
print "*** Ready to continue? (y/n): ";
|
||||
$ans = <STDIN>;
|
||||
chomp($ans);
|
||||
$ans = lc($ans);
|
||||
# $ans = &getans();
|
||||
}
|
||||
|
||||
# return $ans;
|
||||
return ($ans eq "y") ? 1 : 0
|
||||
}
|
||||
|
||||
sub find_conflict() {
|
||||
|
||||
my $filename=shift;
|
||||
my $retval=0;
|
||||
open (IN2, "$filename") || die "Can't open $filename\n";
|
||||
while (<IN2>) {
|
||||
if (/^<<<<<<</) {
|
||||
$retval=1;
|
||||
}
|
||||
}
|
||||
close(IN2);
|
||||
|
||||
return $retval;
|
||||
}
|
||||
|
||||
sub do_ftp() {
|
||||
|
||||
my $ftpc;
|
||||
$ftpc = Net::FTP->new("ftp.zero.org");
|
||||
$ftpc->login("ftp","-anonymou@");
|
||||
$ftpc->cwd("/incoming");
|
||||
|
||||
if ( lc($ftp) eq "tar" ) {
|
||||
print "Retrieving latest tar ball...\n";
|
||||
$ftpc->get("anope.tgz");
|
||||
} elsif ( lc($ftp) eq "diff" ) {
|
||||
print "Retrieving latest patch file...\n";
|
||||
$ftpc->get("anope.diff");
|
||||
} else {
|
||||
print "Unknown type $ftp, aborting...\n";
|
||||
}
|
||||
$ftpc->quit();
|
||||
}
|
||||
|
||||
sub do_get() {
|
||||
|
||||
my $options = "" ; # Options to be passed to the svn command
|
||||
my $selector = "" ; # Selector to be passed to the svn command
|
||||
|
||||
if ($rev) {
|
||||
$options .= "-r $rev";
|
||||
$selector = "trunk";
|
||||
$copy = $copy . "-$rev";
|
||||
} elsif ($tag) {
|
||||
$selector = "tags/$tag";
|
||||
$copy = $copy . "-$tag";
|
||||
} elsif ($branch) {
|
||||
$selector = "branches/$branch";
|
||||
$copy = $copy . "-$branch";
|
||||
} else {
|
||||
$selector = "trunk";
|
||||
}
|
||||
|
||||
if ($dst eq undef) {
|
||||
my $cwd = &Cwd::cwd();
|
||||
if (-f "$cwd/$fhint") {
|
||||
system("$svn update $options $cwd");
|
||||
} elsif (-f "$cwd/$copy/$fhint") {
|
||||
system("$svn update $options $cwd/$copy");
|
||||
} else {
|
||||
system("$svn checkout $svnroot/$selector $options $cwd/$copy");
|
||||
}
|
||||
} else {
|
||||
$dst = &Cwd::cwd() if ($dst eq "\.") ;
|
||||
if (-f "$dst/$fhint") {
|
||||
system("$svn update $options $dst");
|
||||
} else {
|
||||
system("$svn checkout $svnroot/$selector $options $dst");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
sub do_put() {
|
||||
|
||||
if ($dst eq undef) {
|
||||
my $cwd = &Cwd::cwd();
|
||||
if (-f "$cwd/$fhint") {
|
||||
$dst = "$cwd";
|
||||
} elsif (-f "$cwd/$copy/$fhint") {
|
||||
$dst .= "$cwd/$copy";
|
||||
} else {
|
||||
print "Error: Unable to determine your working copy location.\n";
|
||||
exit;
|
||||
}
|
||||
} else {
|
||||
$dst = &Cwd::cwd() if ($dst eq "\.") ;
|
||||
if (! -f "$dst/$fhint") {
|
||||
print "Error: Unable to determine your working copy location.\n";
|
||||
exit;
|
||||
}
|
||||
}
|
||||
|
||||
# Check to see if we need to update our working copy first.
|
||||
my $nupdate;
|
||||
open (IN, "$svn status --show-updates --verbose $dst|");
|
||||
while (<IN>) {
|
||||
if (/\*/) {
|
||||
$nupdate .= "$_";
|
||||
}
|
||||
}
|
||||
close(IN);
|
||||
|
||||
if ($nupdate ne undef) {
|
||||
print "*** Warning: There are files modified in the repository that need\n";
|
||||
print "*** to be merged back to your working copy before the commit can\n";
|
||||
print "*** take place. These files are:\n";
|
||||
print $nupdate;
|
||||
print "Please use: $0 -g $dst\n";
|
||||
exit;
|
||||
}
|
||||
|
||||
# Get a prelim diff of the changes...
|
||||
my $dcount=0;
|
||||
my $conflict;
|
||||
# open (IN, "$svn diff $dst|");
|
||||
open (IN, "$svn status $dst|");
|
||||
while (<IN>) {
|
||||
if (!/^\?/) {
|
||||
$dcount++;
|
||||
}
|
||||
|
||||
if (/^C/) {
|
||||
$_ =~ s/^C\s+//;
|
||||
chomp($_);
|
||||
# I don't want to use grep. But my find_conflict sub
|
||||
# does not seem to work :( Too bad
|
||||
if (`grep "^<<<<<<<" $_`) {
|
||||
$conflict .= "$_\n" ;
|
||||
} else {
|
||||
system("$svn resolved $_");
|
||||
}
|
||||
}
|
||||
}
|
||||
close(IN);
|
||||
|
||||
if ($dcount == 0) {
|
||||
print "*** Warning: There are no modified files to be commited. Are you\n";
|
||||
print "*** sure you are in the right working copy? Verify changes with:\n";
|
||||
print "*** $svn diff $dst\n";
|
||||
exit;
|
||||
}
|
||||
|
||||
if ($conflict ne undef) {
|
||||
print "*** Warning: There are merge conflicts to be resolved! Please take\n";
|
||||
print "*** a look at the following files and resolve them manually:\n\n";
|
||||
print "$conflict\n";
|
||||
exit;
|
||||
}
|
||||
|
||||
$ctrlfile = "$dst/$fhint";
|
||||
# Grab the current revision number. Clunky way, I know!
|
||||
$ver_revision=`$wget -qO - $svnrev`;
|
||||
chomp($ver_revision);
|
||||
|
||||
unless ($ver_revision =~ /^\d+/ and $ver_revision > 0)
|
||||
{
|
||||
print "*** Error: Got bogus result $ver_revision from $svnrev.\n";
|
||||
exit;
|
||||
}
|
||||
|
||||
$ver_revision++;
|
||||
open (REV, "$ctrlfile") || die "Can't open $ctrlfile\n";
|
||||
while (<REV>) {
|
||||
push (@source, $_);
|
||||
$ver_major = $_ if (/VERSION_MAJOR/);
|
||||
$ver_minor = $_ if (/VERSION_MINOR/);
|
||||
$ver_patch = $_ if (/VERSION_PATCH/);
|
||||
$ver_build = $_ if (/VERSION_BUILD/);
|
||||
}
|
||||
close(REV);
|
||||
|
||||
my $junk;
|
||||
($junk, $ver_major) = split('"', $ver_major);
|
||||
($junk, $ver_minor) = split('"', $ver_minor);
|
||||
($junk, $ver_patch) = split('"', $ver_patch);
|
||||
($junk, $ver_build) = split('"', $ver_build);
|
||||
|
||||
$cver = "$ver_major.$ver_minor.$ver_patch ($ver_build)";
|
||||
$nver = "$ver_major.$ver_minor.$ver_patch ($ver_revision)";
|
||||
|
||||
# Greet the developer
|
||||
banner();
|
||||
print "*** Repository : $svnroot \n";
|
||||
print "*** Working copy : $dst \n" ;
|
||||
print "*** Current ver. : $cver \n";
|
||||
print "*** Updated ver. : $nver \n";
|
||||
print "*** Files Changed: $dcount (before indent and version change)\n";
|
||||
die ("Aborting...\n") unless &getans();
|
||||
|
||||
# Need to add a clause for -c "comment" and -b "buglist"
|
||||
|
||||
# Get developers input for commit
|
||||
$tmpfile=".commit";
|
||||
open (OUT, ">$tmpfile") or die ("*** Error! Unable to open $tmpfile file\n");
|
||||
print OUT "# Anope commit utility. Please use this template for your commits.
|
||||
# Add Bugzilla bugs separated by spaces. The note part is free form.
|
||||
BUILD : $nver
|
||||
BUGS :
|
||||
NOTES : ";
|
||||
close(OUT);
|
||||
|
||||
system("$editor $tmpfile");
|
||||
|
||||
my $tmp_comment="";
|
||||
$ver_comment="#\n";
|
||||
$svn_comment="";
|
||||
open (IN, "$tmpfile") or die ("*** Error! Unable to open $tmpfile file\n");
|
||||
while (<IN>) {
|
||||
if ( !/^#/) {
|
||||
$tmp_comment.="$_";
|
||||
chomp($_);
|
||||
$_ =~ s/\t/ /g;
|
||||
$ver_comment.="# $_\n";
|
||||
$svn_comment.="$_ ";
|
||||
}
|
||||
}
|
||||
close(IN);
|
||||
|
||||
$svn_comment =~ s/\s\s+/ /g;
|
||||
# Confirm the commit one last time...
|
||||
print "*** Ready to commit, please verify:\n";
|
||||
print "\n$tmp_comment\n";
|
||||
|
||||
die ("Aborting...\n") unless &getans();
|
||||
|
||||
print "*** Running Indent...\n";
|
||||
system("indent -kr -nut *.c");
|
||||
system("rm -f *~");
|
||||
|
||||
print "*** Bumping the revision number...\n";
|
||||
# Re-write the control file
|
||||
open(OUT, ">$ctrlfile") or die ("*** Error! Unable to open $ctrlfile ... aborting");
|
||||
foreach (@source) {
|
||||
if (/^VERSION_BUILD/) {
|
||||
$_ =~ s/\"\d+\"/\"$ver_revision\"/;
|
||||
} elsif (/# \$Log\$/) {
|
||||
$_ .= "$ver_comment";
|
||||
}
|
||||
print OUT $_;
|
||||
}
|
||||
close(OUT);
|
||||
|
||||
print "*** Starting the upload...\n\n";
|
||||
my $rval=system("$svn commit $dst --message '$svn_comment'");
|
||||
if ( $rval ) {
|
||||
print "*** Error: Unable to complete commit. Rolling back....\n\n";
|
||||
system("$svn revert $ctrlfile");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
{
|
||||
usage() if (! @ARGV);
|
||||
|
||||
my $opt = 'hgpf:r:b:t:';
|
||||
getopts ("$opt", \%opt) or usage();
|
||||
usage() if $opt{h};
|
||||
|
||||
usage() if ($opt{g} && $opt{p});
|
||||
usage() if ($opt{g} && $opt{f});
|
||||
usage() if ($opt{p} && $opt{f});
|
||||
usage() if ($opt{r} && $opt{b});
|
||||
usage() if ($opt{r} && $opt{t});
|
||||
usage() if ($opt{b} && $opt{t});
|
||||
|
||||
$rev = $opt{r} ;
|
||||
$branch = $opt{b} ;
|
||||
$tag = $opt{t} ;
|
||||
$ftp = $opt{f} ;
|
||||
$dst = shift;
|
||||
|
||||
if ($rev ne undef) {
|
||||
unless ($rev =~ /^\d+/ and $rev > 0)
|
||||
{
|
||||
print "*** Error: Revision number '$rev' must be an integer > 0.\n";
|
||||
exit;
|
||||
}
|
||||
}
|
||||
|
||||
do_ftp() if $opt{f};
|
||||
do_get() if $opt{g};
|
||||
do_put() if $opt{p};
|
||||
print "*** Done!\n";
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -1,16 +0,0 @@
|
||||
#!/bin/bash
|
||||
#
|
||||
# $Id: checklang,v 1.1 2003/07/16 04:34:04 dane Exp $
|
||||
#
|
||||
|
||||
if [ ! -f en_us.l ]; then
|
||||
echo "*** You must run this script on the lang directory."
|
||||
echo ""
|
||||
exit 1
|
||||
fi
|
||||
|
||||
for lang in $(ls *.l)
|
||||
do
|
||||
echo "*** CHECKING $lang ***"
|
||||
./obs.pl $lang
|
||||
done
|
||||
-17
@@ -1,17 +0,0 @@
|
||||
#!/bin/bash
|
||||
#
|
||||
# $Id: fixlang,v 1.1 2003/07/16 04:34:04 dane Exp $
|
||||
#
|
||||
|
||||
if [ ! -f en_us.l ]; then
|
||||
echo "*** You must run this script on the lang directory."
|
||||
echo ""
|
||||
exit 1
|
||||
fi
|
||||
|
||||
for lang in $(ls *.l)
|
||||
do
|
||||
echo "*** CHECKING $lang ***"
|
||||
./fixlang.pl $lang
|
||||
mv fixed.l $lang
|
||||
done
|
||||
@@ -1,42 +0,0 @@
|
||||
#!/bin/bash
|
||||
#
|
||||
# $Id: getanope,v 1.2 2003/11/24 20:23:28 dane Exp $
|
||||
#
|
||||
|
||||
MODULE="anope-dev"
|
||||
BRANCH=""
|
||||
|
||||
if [ "$1" == "" ]; then
|
||||
DST="$MODULE"
|
||||
else
|
||||
DST="$1"
|
||||
fi
|
||||
|
||||
let cnt="$(echo $CVSROOT | grep anope | wc -l)"
|
||||
if [ $cnt -eq 0 ]; then
|
||||
echo "*** Environment variable CVSROOT is not set. Please set it"
|
||||
echo "*** if you have a developer account with write access."
|
||||
echo ""
|
||||
echo "*** Assuming anonymous access. If prompted for a password,"
|
||||
echo "*** just press RETURN to continue."
|
||||
echo ""
|
||||
export CVSROOT=":pserver:pubcvs@zero.org:/home/cvs/anope"
|
||||
|
||||
let login="$(grep "pubcvs@zero.org" ~/.cvspass 2> /dev/null | grep anope | wc -l)"
|
||||
|
||||
if [ $login -eq 0 ]; then
|
||||
cvs -d$CVSROOT login
|
||||
fi
|
||||
fi
|
||||
|
||||
echo "Checking out $MODULE"
|
||||
|
||||
if [ "$BRANCH" == "" ]; then
|
||||
cvs -z3 -d$CVSROOT checkout -d$DST $MODULE
|
||||
else
|
||||
cvs -z3 -d$CVSROOT checkout -r$BRANCH -d$DST $MODULE
|
||||
fi
|
||||
|
||||
echo "*** All done!"
|
||||
|
||||
exit 0
|
||||
@@ -1,83 +0,0 @@
|
||||
#!/bin/bash
|
||||
# Daniel Engel (dane@zero.org)
|
||||
#
|
||||
# Creates a patch from any version of Anope to another within the
|
||||
# same CVS module (in this case, anope-rel). Usage:
|
||||
#
|
||||
# ./anope-mkpatch 1.5.1 1.5.5
|
||||
#
|
||||
# The earliest version you can use is 1.5.1 (the first CVS tag)
|
||||
#
|
||||
# Feel free to improve this script at will.
|
||||
#
|
||||
CVSROOT=":pserver:pubcvs@zero.org:/home/cvs/anope"
|
||||
MODULE="anope-dev"
|
||||
OLD="$1"
|
||||
NEW="$2"
|
||||
NAME="$1-$2.diff"
|
||||
|
||||
echo "*** Note: This script is able to create patches from one version of 1.5.x"
|
||||
echo "*** to anoter. The earliest valid version is 1.5.1, and you can only make"
|
||||
echo "*** a patch between two released versions (i.e. no -rnum versions)"
|
||||
echo ""
|
||||
|
||||
if [[ $OLD == "" ]]; then
|
||||
echo "*** Usage: $0 [OLD] [NEW]"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
|
||||
if [[ $NEW == "" ]]; then
|
||||
echo "*** Usage: $0 [OLD] [NEW]"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
OLD="anope-$OLD"
|
||||
NEW="anope-$NEW"
|
||||
|
||||
if [[ -d $OLD ]]; then
|
||||
echo "*** Directory $OLD already exists... aborting."
|
||||
exit 0
|
||||
fi
|
||||
|
||||
if [[ -d $NEW ]]; then
|
||||
echo "*** Directory $OLD already exists... aborting."
|
||||
exit 0
|
||||
fi
|
||||
|
||||
echo "*** Issuing the CVS login, when prompted for a password, just press RETURN..."
|
||||
cvs -d $CVSROOT login
|
||||
|
||||
if [[ $? -ne 0 ]]; then
|
||||
echo "*** ERROR: CVS login failed... aborting."
|
||||
exit 0
|
||||
fi
|
||||
|
||||
TOLD="$(echo $OLD | sed 's/\./_/g')"
|
||||
TNEW="$(echo $NEW | sed 's/\./_/g')"
|
||||
|
||||
echo "*** Cheking out $MODULE ($TOLD)"
|
||||
cvs -d $CVSROOT checkout -r $TOLD -d $OLD $MODULE > /dev/null 2>&1
|
||||
if [[ $? -ne 0 ]]; then
|
||||
echo "*** ERROR: Unable to checkout $MODULE ($TNEW)... aborting."
|
||||
exit 0
|
||||
fi
|
||||
|
||||
echo "*** Cheking out $MODULE ($TNEW)"
|
||||
cvs -d $CVSROOT checkout -r $TNEW -d $NEW $MODULE > /dev/null 2>&1
|
||||
if [[ $? -ne 0 ]]; then
|
||||
echo "*** ERROR: Unable to checkout $MODULE ($TNEW)... aborting."
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# I wish i could use cvsrmadm here, but not everybody has it :(
|
||||
echo "*** Removing CVS control files"
|
||||
find $OLD -name CVS -exec rm -rf {} \; > /dev/null 2>&1
|
||||
find $NEW -name CVS -exec rm -rf {} \; > /dev/null 2>&1
|
||||
|
||||
echo "*** Creating the patch..."
|
||||
diff -urN $OLD $NEW > $NAME
|
||||
|
||||
echo "*** Done! The patch is $NAME";
|
||||
echo "*** You might want to clean things up with:"
|
||||
echo "*** rm -rf $OLD $NEW"
|
||||
-104
@@ -1,104 +0,0 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# $Id: putanope,v 1.14 2003/12/02 23:02:28 joris Exp $
|
||||
#
|
||||
|
||||
CTRL="version.log"
|
||||
MODULE="anope-dev"
|
||||
TMP="/tmp/putanope.$$"
|
||||
TMP2="/tmp/putanope2.$$"
|
||||
|
||||
# We need an editor for the log entry
|
||||
if [ "$EDITOR" == "" ]; then
|
||||
EDITOR="vi"
|
||||
fi
|
||||
|
||||
# Use default target, or provided?
|
||||
if [ "$1" == "" ]; then
|
||||
DST="$MODULE"
|
||||
else
|
||||
DST="$1"
|
||||
fi
|
||||
|
||||
# Find where to run the rest of the script from.
|
||||
if [ ! -d $DST ]; then
|
||||
cd ..
|
||||
if [ ! -d $DST ]; then
|
||||
cd ..
|
||||
if [ ! -d $DST ]; then
|
||||
echo "*** Directory $DST does not exist, what's going on?"
|
||||
echo ""
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
# CVSROOT dosnt need to be set, just read it form the CVS file :-)
|
||||
CVSROOT=`cat ${DST}/CVS/Root`
|
||||
|
||||
cd $DST
|
||||
|
||||
# source control file
|
||||
. $CTRL
|
||||
|
||||
# Version arithmetics
|
||||
CVER="${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}.${VERSION_BUILD}"
|
||||
let minor="$(echo $VERSION_BUILD)"
|
||||
let new="$minor + 1"
|
||||
NVER="${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}.${new}"
|
||||
|
||||
# Greet the developer
|
||||
echo ""
|
||||
echo "*** Using CVSROOT: $CVSROOT"
|
||||
echo "*** Using module : $MODULE"
|
||||
echo "*** Current ver : $CVER"
|
||||
echo "*** Updated ver : $NVER"
|
||||
echo ""
|
||||
echo "*** Make sure you have updated Changes, Changes.conf, and"
|
||||
echo "*** Changes.lang acordingly before you proceed."
|
||||
echo -n "*** Ready to continue? (RETURN if so, CTRL-C otherwise) "
|
||||
read FOO
|
||||
|
||||
cat > $TMP2 <<EOF
|
||||
# Anope commit utility. Please use this template for your commits.
|
||||
# Add Mantis bugs separated by spaces. The note part is free form.
|
||||
BUILD : $NVER
|
||||
BUGS :
|
||||
NOTES :
|
||||
EOF
|
||||
|
||||
$EDITOR $TMP2
|
||||
|
||||
echo "*** Ready to commit, please verify:"
|
||||
echo ""
|
||||
grep -v "^#" $TMP2
|
||||
echo ""
|
||||
echo -n "*** Perform commit? (RETURN if so, CTRL-C otherwise) "
|
||||
read FOO
|
||||
|
||||
echo "*** Running indent..."
|
||||
for source in *.c
|
||||
do
|
||||
indent -kr -nut $source
|
||||
done
|
||||
|
||||
# Clean up indent backup files
|
||||
rm -f *~
|
||||
|
||||
echo "*** Bumping the version number..."
|
||||
sed "s/VERSION_BUILD=\"$VERSION_BUILD\"/VERSION_BUILD=\"$new\"/" $CTRL > $TMP
|
||||
cat $TMP > $CTRL
|
||||
|
||||
TS="$(date '+%F %R')"
|
||||
grep -v "^#" $TMP2 > $TMP
|
||||
echo "VTAG : cvs checkout -D \"$TS\" $MODULE" >> $TMP
|
||||
|
||||
cd ..
|
||||
|
||||
cvs -d$CVSROOT commit -F $TMP $DST
|
||||
|
||||
rm -f $TMP $TMP2
|
||||
|
||||
echo "*** Done!"
|
||||
|
||||
exit 0
|
||||
@@ -8,7 +8,7 @@
|
||||
* Based on the original code of Epona by Lara.
|
||||
* Based on the original code of Services by Andy Church.
|
||||
*
|
||||
* $Id: botserv.c,v 1.46 2004/03/14 14:15:34 certus Exp $
|
||||
* $Id$
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
* Based on the original code of Epona by Lara.
|
||||
* Based on the original code of Services by Andy Church.
|
||||
*
|
||||
* $Id: channels.c,v 1.36 2004/03/11 16:50:01 rob Exp $
|
||||
* $Id$
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
* Based on the original code of Epona by Lara.
|
||||
* Based on the original code of Services by Andy Church.
|
||||
*
|
||||
* $Id: chanserv.c,v 1.55 2004/03/17 20:08:49 ribosome Exp $
|
||||
* $Id$
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
* Based on the original code of Epona by Lara.
|
||||
* Based on the original code of Services by Andy Church.
|
||||
*
|
||||
* $Id: commands.c,v 1.13 2003/09/22 21:40:23 rob Exp $
|
||||
* $Id$
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
* Based on the original code of Epona by Lara.
|
||||
* Based on the original code of Services by Andy Church.
|
||||
*
|
||||
* $Id: compat.c,v 1.5 2003/07/20 01:15:49 dane Exp $
|
||||
* $Id$
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
* Based on the original code of Epona by Lara.
|
||||
* Based on the original code of Services by Andy Church.
|
||||
*
|
||||
* $Id: config.c,v 1.56 2004/03/21 14:08:53 rob Exp $
|
||||
* $Id$
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
* Based on the original code of Epona by Lara.
|
||||
* Based on the original code of Services by Andy Church.
|
||||
*
|
||||
* $Id: converter.c,v 1.5 2003/07/20 01:15:49 dane Exp $
|
||||
* $Id$
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
* Based on the original code of Epona by Lara.
|
||||
* Based on the original code of Services by Andy Church.
|
||||
*
|
||||
* $Id: datafiles.c,v 1.8 2003/07/20 01:15:49 dane Exp $
|
||||
* $Id$
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
* Based on the original code of Epona by Lara.
|
||||
* Based on the original code of Services by Andy Church.
|
||||
*
|
||||
* $Id: encrypt.c,v 1.5 2003/07/20 01:15:49 dane Exp $
|
||||
* $Id$
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
* Based on the original code of Epona by Lara.
|
||||
* Based on the original code of Services by Andy Church.
|
||||
*
|
||||
* $Id: helpserv.c,v 1.2 2004/01/18 04:33:25 dane Exp $
|
||||
* $Id$
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
* Based on the original code of Epona by Lara.
|
||||
* Based on the original code of Services by Andy Church.
|
||||
*
|
||||
* $Id: hostserv.c,v 1.53 2004/02/15 22:40:46 dane Exp $
|
||||
* $Id$
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
* Based on the original code of Epona by Lara.
|
||||
* Based on the original code of Services by Andy Church.
|
||||
*
|
||||
* $Id: init.c,v 1.40 2004/03/13 13:55:59 dane Exp $
|
||||
* $Id$
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
-118
@@ -1,118 +0,0 @@
|
||||
#!/usr/bin/perl
|
||||
#
|
||||
# Tries to fix a language file using the reference
|
||||
# language (en_us), and injecting all new strings
|
||||
# (in english) into the newly generated fixed.pl
|
||||
#
|
||||
# check the result with obs.pl then copy on top
|
||||
# of the source language file.
|
||||
#
|
||||
my $srcfile = $ARGV[0];
|
||||
my $dstfile = "fixed.l";
|
||||
my $engfile = "en_us.l";
|
||||
my %is_there= ();
|
||||
my $pos=0;
|
||||
my $wc=0;
|
||||
|
||||
my @defs;
|
||||
my @efile;
|
||||
|
||||
sub error {
|
||||
|
||||
my $msg = shift ;
|
||||
print "*** Error: $msg \n";
|
||||
exit ;
|
||||
}
|
||||
|
||||
sub not_del {
|
||||
$line = shift;
|
||||
if ($is_there{$line}) {
|
||||
return 1;
|
||||
} else {
|
||||
return 0;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
# Could not think of a worse of doing this...
|
||||
sub new_def {
|
||||
my $ndef;
|
||||
my $start=0;
|
||||
|
||||
$def = shift;
|
||||
for (@efile) {
|
||||
my $line = $_;
|
||||
chomp $line;
|
||||
|
||||
if (/^[A-Z]/) {
|
||||
$start=0;
|
||||
}
|
||||
|
||||
if ($start) {
|
||||
$ndef.=$_;
|
||||
}
|
||||
|
||||
if ($line eq $def) {
|
||||
$ndef=$_;
|
||||
$start=1;
|
||||
}
|
||||
|
||||
}
|
||||
return $ndef;
|
||||
}
|
||||
|
||||
error("Usage $0 [lang.l]") unless ($srcfile);
|
||||
error("Can't find language file: $srcfile") if (! -f $srcfile);
|
||||
error("Can't find language file: $engfile") if (! -f $engfile);
|
||||
|
||||
open (EFILE, "< $engfile");
|
||||
while (<EFILE>) {
|
||||
my $line = $_;
|
||||
push(@efile, $line);
|
||||
chomp $line;
|
||||
if (/^[A-Z]/) {
|
||||
$wc = push (@defs, $line);
|
||||
}
|
||||
}
|
||||
close(EFILE);
|
||||
|
||||
# Need to load entiry text into hash...
|
||||
for (@defs) {
|
||||
$is_there{$_} = 1;
|
||||
}
|
||||
|
||||
open (SFILE, "< $srcfile");
|
||||
open (DFILE, "> $dstfile");
|
||||
while (<SFILE>) {
|
||||
my $line = $_;
|
||||
chomp $line;
|
||||
if (/^[A-Z]/) {
|
||||
|
||||
$del = 0;
|
||||
if (not_del($line)) {
|
||||
while ($line ne $defs[$pos]) {
|
||||
print "ADD: $defs[$pos]\n";
|
||||
# Need to reference the hash...
|
||||
my $ndef = new_def($defs[$pos]);
|
||||
print DFILE $ndef;
|
||||
$pos++;
|
||||
}
|
||||
$pos++;
|
||||
} else {
|
||||
$del = 1;
|
||||
print "DEL: $line\n";
|
||||
}
|
||||
}
|
||||
|
||||
if (! $del) {
|
||||
print DFILE "$line\n";
|
||||
}
|
||||
}
|
||||
|
||||
for($pos ; $pos < $wc; $pos++) {
|
||||
print "ADD: $defs[$pos]\n";
|
||||
my $ndef = new_def($defs[$pos]);
|
||||
print DFILE $ndef;
|
||||
}
|
||||
close(SFILE);
|
||||
close(DFILE);
|
||||
-129
@@ -1,129 +0,0 @@
|
||||
#!/usr/bin/perl
|
||||
#
|
||||
# Checks a language file against the reference language (en_us), and
|
||||
# finds #define string diferences
|
||||
#
|
||||
my $srcfile = $ARGV[0];
|
||||
my $engfile = "en_us.l";
|
||||
my %is_there= ();
|
||||
my $pos=0;
|
||||
my $wc=0;
|
||||
my $edef="";
|
||||
my $sdef="";
|
||||
|
||||
my @efile;
|
||||
my @sfile;
|
||||
my @defs;
|
||||
|
||||
sub error {
|
||||
|
||||
my $msg = shift ;
|
||||
print "*** Error: $msg \n";
|
||||
exit ;
|
||||
}
|
||||
|
||||
sub not_del {
|
||||
$line = shift;
|
||||
if ($is_there{$line}) {
|
||||
return 1;
|
||||
} else {
|
||||
return 0;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
sub get_format {
|
||||
my $fmt="";
|
||||
|
||||
my $str=shift;
|
||||
|
||||
while ($str =~ m/%\w/g) {
|
||||
$fmt .= $&;
|
||||
}
|
||||
|
||||
return $fmt;
|
||||
}
|
||||
|
||||
# Could not think of a worse of doing this...
|
||||
sub get_def {
|
||||
my $ndef;
|
||||
my $start=0;
|
||||
my $found=0;
|
||||
|
||||
$buf = shift;
|
||||
$def = shift;
|
||||
for (@$buf) {
|
||||
my $line = $_;
|
||||
chomp $line;
|
||||
|
||||
if (/^[A-Z]/) {
|
||||
$start=0;
|
||||
last if $found;
|
||||
}
|
||||
|
||||
if ($start) {
|
||||
$found=1;
|
||||
$ndef.=$_;
|
||||
}
|
||||
|
||||
if ($line eq $def) {
|
||||
$start=1;
|
||||
}
|
||||
|
||||
}
|
||||
return $ndef;
|
||||
}
|
||||
|
||||
error("Usage $0 [lang.l]") unless ($srcfile);
|
||||
error("Can't find language file: $srcfile") if (! -f $srcfile);
|
||||
error("Can't find language file: $engfile") if (! -f $engfile);
|
||||
|
||||
open (EFILE, "< $engfile");
|
||||
while (<EFILE>) {
|
||||
my $line = $_;
|
||||
push(@efile, $line);
|
||||
chomp $line;
|
||||
if (/^[A-Z]/) {
|
||||
$wc = push (@defs, $line);
|
||||
$is_there{$line} = 1;
|
||||
}
|
||||
}
|
||||
close(EFILE);
|
||||
|
||||
open (SFILE, "< $srcfile");
|
||||
while (<SFILE>) {
|
||||
push(@sfile, $_);
|
||||
}
|
||||
close(SFILE);
|
||||
|
||||
#for (@defs) {
|
||||
# $is_there{$_} = 1;
|
||||
#}
|
||||
|
||||
for (@sfile) {
|
||||
my $line = $_;
|
||||
chomp $line;
|
||||
if (/^[A-Z]/) {
|
||||
if (not_del($line)) {
|
||||
while ($line ne $defs[$pos]) {
|
||||
print "ADD: $defs[$pos]\n";
|
||||
$pos++;
|
||||
}
|
||||
if (! /^STRFTIME/ ) {
|
||||
$edef = get_format(get_def(\@efile, $line)) ;
|
||||
$sdef = get_format(get_def(\@sfile, $line)) ;
|
||||
if ( $edef ne $sdef ) {
|
||||
print "FORMAT: $line (expecting '$edef' and got '$sdef')\n";
|
||||
}
|
||||
}
|
||||
$pos++;
|
||||
} else {
|
||||
print "DEL: $line\n";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
for($pos ; $pos < $wc; $pos++) {
|
||||
print "ADD: $defs[$pos]\n";
|
||||
}
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
* Based on the original code of Epona by Lara.
|
||||
* Based on the original code of Services by Andy Church.
|
||||
*
|
||||
* $Id: language.c,v 1.9 2003/12/12 16:04:57 dane Exp $
|
||||
* $Id$
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
* Based on the original code of Epona by Lara.
|
||||
* Based on the original code of Services by Andy Church.
|
||||
*
|
||||
* $Id: list.c,v 1.5 2003/07/20 01:15:49 dane Exp $
|
||||
* $Id$
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
* Based on the original code of Epona by Lara.
|
||||
* Based on the original code of Services by Andy Church.
|
||||
*
|
||||
* $Id: log.c,v 1.8 2003/07/20 01:15:49 dane Exp $
|
||||
* $Id$
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
* Based on the original code of Epona by Lara.
|
||||
* Based on the original code of Services by Andy Church.
|
||||
*
|
||||
* $Id: mail.c,v 1.9 2003/09/04 18:55:34 rob Exp $
|
||||
* $Id$
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
* along with this program (see the file COPYING); if not, write to the
|
||||
* Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*
|
||||
* $Id: main.c,v 1.23 2004/03/13 13:55:59 dane Exp $
|
||||
* $Id$
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
* Based on the original code of Epona by Lara.
|
||||
* Based on the original code of Services by Andy Church.
|
||||
*
|
||||
* $Id: memory.c,v 1.7 2003/07/20 01:15:49 dane Exp $
|
||||
* $Id$
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
* Based on the original code of Epona by Lara.
|
||||
* Based on the original code of Services by Andy Church.
|
||||
*
|
||||
* $Id: memoserv.c,v 1.30 2004/03/22 18:52:47 dane Exp $
|
||||
* $Id$
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
* Based on the original code of Epona by Lara.
|
||||
* Based on the original code of Services by Andy Church.
|
||||
*
|
||||
* $Id: messages.c,v 1.31 2004/02/15 18:34:40 dane Exp $
|
||||
* $Id$
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
* Based on the original code of Epona by Lara.
|
||||
* Based on the original code of Services by Andy Church.
|
||||
*
|
||||
* $Id: misc.c,v 1.14 2004/01/31 18:57:18 dane Exp $
|
||||
* $Id$
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
* Based on the original code of Epona by Lara.
|
||||
* Based on the original code of Services by Andy Church.
|
||||
*
|
||||
* $Id: modules.c,v 1.37 2004/03/11 16:50:01 rob Exp $
|
||||
* $Id$
|
||||
*
|
||||
*/
|
||||
#include "modules.h"
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
* Based on the original code of Epona by Lara.
|
||||
* Based on the original code of Services by Andy Church.
|
||||
*
|
||||
* $Id: mysql.c,v 1.33 2004/03/14 13:02:53 rob Exp $
|
||||
* $Id$
|
||||
*
|
||||
*/
|
||||
#include "services.h"
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
* Based on the original code of Epona by Lara.
|
||||
* Based on the original code of Services by Andy Church.
|
||||
*
|
||||
* $Id: news.c,v 1.11 2004/01/31 17:03:52 dane Exp $
|
||||
* $Id$
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
* Based on the original code of Epona by Lara.
|
||||
* Based on the original code of Services by Andy Church.
|
||||
*
|
||||
* $Id: nickserv.c,v 1.93 2004/03/13 03:25:59 dane Exp $
|
||||
* $Id$
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
* Based on the original code of Epona by Lara.
|
||||
* Based on the original code of Services by Andy Church.
|
||||
*
|
||||
* $Id: operserv.c,v 1.89 2004/03/14 22:44:47 dane Exp $
|
||||
* $Id$
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
* Based on the original code of Epona by Lara.
|
||||
* Based on the original code of Services by Andy Church.
|
||||
*
|
||||
* $Id: process.c,v 1.18 2004/01/31 18:57:18 dane Exp $
|
||||
* $Id$
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
* Based on the original code of Epona by Lara.
|
||||
* Based on the original code of Services by Andy Church.
|
||||
*
|
||||
* $Id: protocol.c,v 1.11 2003/07/20 01:15:50 dane Exp $
|
||||
* $Id$
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
* Based on the original code of Epona by Lara.
|
||||
* Based on the original code of Services by Andy Church.
|
||||
*
|
||||
* $Id: proxy.c,v 1.11 2004/02/14 21:22:55 dane Exp $
|
||||
* $Id$
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
* Based on the original code of Epona by Lara.
|
||||
* Based on the original code of Services by Andy Church.
|
||||
*
|
||||
* $Id: rdb.c,v 1.11 2003/08/04 01:09:43 dane Exp $
|
||||
* $Id$
|
||||
*
|
||||
*/
|
||||
#include "services.h"
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
* Based on the original code of Epona by Lara.
|
||||
* Based on the original code of Services by Andy Church.
|
||||
*
|
||||
* $Id: send.c,v 1.11 2004/01/18 05:10:47 dane Exp $
|
||||
* $Id$
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
* Based on the original code of Epona by Lara.
|
||||
* Based on the original code of Services by Andy Church.
|
||||
*
|
||||
* $Id: sessions.c,v 1.10 2003/07/20 01:15:50 dane Exp $
|
||||
* $Id$
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
* Based on the original code of Epona by Lara.
|
||||
* Based on the original code of Services by Andy Church.
|
||||
*
|
||||
* $Id: slist.c,v 1.6 2003/07/20 01:15:50 dane Exp $
|
||||
* $Id$
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
* Based on the original code of Epona by Lara.
|
||||
* Based on the original code of Services by Andy Church.
|
||||
*
|
||||
* $Id: sockutil.c,v 1.7 2003/07/20 01:15:50 dane Exp $
|
||||
* $Id$
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
* Based on the original code of Epona by Lara.
|
||||
* Based on the original code of Services by Andy Church.
|
||||
*
|
||||
* $Id: threads.c,v 1.5 2003/07/20 01:15:50 dane Exp $
|
||||
* $Id$
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
* Based on the original code of Epona by Lara.
|
||||
* Based on the original code of Services by Andy Church.
|
||||
*
|
||||
* $Id: timeout.c,v 1.7 2003/07/20 01:15:50 dane Exp $
|
||||
* $Id$
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
* Based on the original code of Epona by Lara.
|
||||
* Based on the original code of Services by Andy Church.
|
||||
*
|
||||
* $Id: users.c,v 1.37 2004/02/18 19:00:33 rob Exp $
|
||||
* $Id$
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
+7
-1041
File diff suppressed because it is too large
Load Diff
+4
-7
@@ -3,7 +3,7 @@
|
||||
# Build version string and increment Services build number.
|
||||
#
|
||||
|
||||
# Grab the actual version from the control file
|
||||
# Grab version information from the version control file.
|
||||
CTRL="version.log"
|
||||
if [ -f $CTRL ] ; then
|
||||
. $CTRL
|
||||
@@ -12,11 +12,7 @@ else
|
||||
exit 0
|
||||
fi
|
||||
|
||||
if [ $VERSION_BUILD -gt 0 ]; then
|
||||
VERSION="${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}.${VERSION_BUILD}${VERSION_EXTRA}"
|
||||
else
|
||||
VERSION="${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_EXTRA}"
|
||||
fi
|
||||
VERSION="${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_EXTRA} (${VERSION_BUILD})"
|
||||
|
||||
if [ -f version.h ] ; then
|
||||
BUILD=`fgrep '#define BUILD' version.h | sed 's/^#define BUILD.*"\([0-9]*\)".*$/\1/'`
|
||||
@@ -45,8 +41,8 @@ cat >version.h <<EOF
|
||||
#define VERSION_MAJOR "$VERSION_MAJOR"
|
||||
#define VERSION_MINOR "$VERSION_MINOR"
|
||||
#define VERSION_PATCH "$VERSION_PATCH"
|
||||
#define VERSION_BUILD "$VERSION_BUILD"
|
||||
#define VERSION_EXTRA "$VERSION_EXTRA"
|
||||
#define VERSION_BUILD "$VERSION_BUILD"
|
||||
|
||||
#define BUILD "$BUILD"
|
||||
|
||||
@@ -144,3 +140,4 @@ const char version_protocol[] =
|
||||
const char version_flags[] = VER_IRCD VER_DEBUG VER_ENCRYPTION VER_THREAD VER_OS VER_GHBNR VER_MYSQL VER_MODULE;
|
||||
|
||||
EOF
|
||||
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
* Based on the original code of Epona by Lara.
|
||||
* Based on the original code of Services by Andy Church.
|
||||
*
|
||||
* $Id: vsnprintf.c,v 1.5 2003/07/20 01:15:50 dane Exp $
|
||||
* $Id$
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
Reference in New Issue
Block a user