diff options
| -rwxr-xr-x | configure | 6 | ||||
| -rw-r--r-- | src/server.cpp | 2 | ||||
| -rw-r--r-- | src/users.cpp | 4 | ||||
| -rw-r--r-- | win/configure.cpp | 7 |
4 files changed, 15 insertions, 4 deletions
@@ -848,6 +848,11 @@ sub writefiles { chomp(my $incos = `uname -n -s -r`); chomp(my $version = `sh src/version.sh`); chomp(my $revision2 = getrevision()); + my $branch = "InspIRCd-0.0"; + if ($version =~ /^(InspIRCd-[0-9]+\.[0-9]+)\.[0-9]+/) + { + $branch = $1; + } if ($writeheader == 1) { print "Writing \e[1;32minspircd_config.h\e[0m\n"; @@ -933,6 +938,7 @@ print FILEHANDLE "#define MAXBUF " . ($config{MAXBUF}+2) . "\n"; open(FILEHANDLE, ">include/inspircd_version.h.tmp"); print FILEHANDLE <<EOF; +#define BRANCH "$branch" #define VERSION "$version" #define REVISION "$revision2" #define SYSTEM "$incos" diff --git a/src/server.cpp b/src/server.cpp index 4bd81a6d1..b7e58c56b 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -72,7 +72,7 @@ std::string InspIRCd::GetVersionString(bool operstring) if (operstring) snprintf(versiondata,MAXBUF,"%s %s :%s [%s,%s,%s]",VERSION,Config->ServerName.c_str(),SYSTEM,REVISION,SE->GetName().c_str(),Config->sid.c_str()); else - snprintf(versiondata,MAXBUF,"InspIRCd-2.0 %s :%s",Config->ServerName.c_str(),Config->CustomVersion.c_str()); + snprintf(versiondata,MAXBUF,"%s %s :%s",BRANCH,Config->ServerName.c_str(),Config->CustomVersion.c_str()); return versiondata; } diff --git a/src/users.cpp b/src/users.cpp index 9c3d645f7..459b9e3ce 100644 --- a/src/users.cpp +++ b/src/users.cpp @@ -772,9 +772,9 @@ void LocalUser::FullConnect() this->WriteServ("NOTICE Auth :Welcome to \002%s\002!",ServerInstance->Config->Network.c_str()); this->WriteNumeric(RPL_WELCOME, "%s :Welcome to the %s IRC Network %s!%s@%s",this->nick.c_str(), ServerInstance->Config->Network.c_str(), this->nick.c_str(), this->ident.c_str(), this->host.c_str()); - this->WriteNumeric(RPL_YOURHOSTIS, "%s :Your host is %s, running version InspIRCd-2.0",this->nick.c_str(),ServerInstance->Config->ServerName.c_str()); + this->WriteNumeric(RPL_YOURHOSTIS, "%s :Your host is %s, running version %s",this->nick.c_str(),ServerInstance->Config->ServerName.c_str(),BRANCH); this->WriteNumeric(RPL_SERVERCREATED, "%s :This server was created %s %s", this->nick.c_str(), __TIME__, __DATE__); - this->WriteNumeric(RPL_SERVERVERSION, "%s %s InspIRCd-2.0 %s %s %s", this->nick.c_str(), ServerInstance->Config->ServerName.c_str(), ServerInstance->Modes->UserModeList().c_str(), ServerInstance->Modes->ChannelModeList().c_str(), ServerInstance->Modes->ParaModeList().c_str()); + this->WriteNumeric(RPL_SERVERVERSION, "%s %s %s %s %s %s", this->nick.c_str(), ServerInstance->Config->ServerName.c_str(), BRANCH, ServerInstance->Modes->UserModeList().c_str(), ServerInstance->Modes->ChannelModeList().c_str(), ServerInstance->Modes->ParaModeList().c_str()); ServerInstance->Config->Send005(this); this->WriteNumeric(RPL_YOURUUID, "%s %s :your unique ID", this->nick.c_str(), this->uuid.c_str()); diff --git a/win/configure.cpp b/win/configure.cpp index ee03b3659..768b68cc5 100644 --- a/win/configure.cpp +++ b/win/configure.cpp @@ -275,7 +275,11 @@ void Run() fclose(fI); } else - strcpy(version, "InspIRCD-Unknown"); + strcpy(version, "InspIRCd-0.0.0"); + + string branch(version); + branch.erase(branch.find_last_of('.')); + #ifdef WIN64 printf_c("Your operating system is: \033[1;32mwindows_x64 \033[0m\n"); #else @@ -351,6 +355,7 @@ void Run() sc(TGREEN); printf(" done\n"); sc(TNORMAL); printf("Writing inspircd_version.h..."); f = fopen("inspircd_version.h", "w"); + fprintf(f, "#define BRANCH \"%s\"\n", branch.c_str()); fprintf(f, "#define VERSION \"%s\"\n", version); fprintf(f, "#define REVISION \"%s\"\n", revision.c_str()); fprintf(f, "#define SYSTEM \"%s\"\n", machine_text); |