From 59c3e271dba83df43378b34d29909bfc3f42acdf Mon Sep 17 00:00:00 2001 From: David Anderson Date: Sat, 8 Feb 2014 16:26:40 -0800 Subject: [PATCH] Remove all files related to SVN versioning. Former-commit-id: 57a320bfe97fcf87cf2adc6a5ee3ae07814f798d --- amxmodx/svn_version.h | 9 -- dlls/cstrike/cstrike/svn_version.h | 9 -- dlls/cstrike/csx/svn_version.h | 9 -- dlls/dod/dodfun/svn_version.h | 9 -- dlls/dod/dodx/svn_version.h | 9 -- dlls/engine/svn_version.h | 9 -- dlls/fakemeta/svn_version.h | 9 -- dlls/fun/svn_version.h | 9 -- dlls/geoip/svn_version.h | 9 -- dlls/hamsandwich/svn_version.h | 9 -- dlls/mysqlx/svn_version.h | 9 -- dlls/ns/svn_version.h | 9 -- dlls/nvault/svn_version.h | 9 -- dlls/regex/svn_version.h | 9 -- dlls/sockets/svn_version.h | 9 -- dlls/sqlite/svn_version.h | 9 -- dlls/tfcx/svn_version.h | 9 -- dlls/ts/tsfun/svn_version.h | 9 -- dlls/ts/tsx/svn_version.h | 9 -- modules.versions | 104 --------------------- support/PackageScript | 1 - support/versionchanger.pl | 140 ----------------------------- 22 files changed, 416 deletions(-) delete mode 100644 amxmodx/svn_version.h delete mode 100644 dlls/cstrike/cstrike/svn_version.h delete mode 100644 dlls/cstrike/csx/svn_version.h delete mode 100644 dlls/dod/dodfun/svn_version.h delete mode 100644 dlls/dod/dodx/svn_version.h delete mode 100644 dlls/engine/svn_version.h delete mode 100644 dlls/fakemeta/svn_version.h delete mode 100644 dlls/fun/svn_version.h delete mode 100644 dlls/geoip/svn_version.h delete mode 100644 dlls/hamsandwich/svn_version.h delete mode 100644 dlls/mysqlx/svn_version.h delete mode 100644 dlls/ns/svn_version.h delete mode 100644 dlls/nvault/svn_version.h delete mode 100644 dlls/regex/svn_version.h delete mode 100644 dlls/sockets/svn_version.h delete mode 100644 dlls/sqlite/svn_version.h delete mode 100644 dlls/tfcx/svn_version.h delete mode 100644 dlls/ts/tsfun/svn_version.h delete mode 100644 dlls/ts/tsx/svn_version.h delete mode 100644 modules.versions delete mode 100755 support/versionchanger.pl diff --git a/amxmodx/svn_version.h b/amxmodx/svn_version.h deleted file mode 100644 index 5a0af9d4..00000000 --- a/amxmodx/svn_version.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef _INCLUDE_SVN_VERSION_H_ -#define _INCLUDE_SVN_VERSION_H_ - -#define SVN_VERSION_STRING "1.8.2-dev" -#define SVN_VERSION_DWORD 1,8,2,0 -#define SVN_VERSION_PRODUCT "1.8.2" -#define SVN_BUILD_ID SVN_VERSION_STRING " 9:7ff502465eae" - -#endif //_INCLUDE_SVN_VERSION_H_ diff --git a/dlls/cstrike/cstrike/svn_version.h b/dlls/cstrike/cstrike/svn_version.h deleted file mode 100644 index 707c452e..00000000 --- a/dlls/cstrike/cstrike/svn_version.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef _INCLUDE_SVN_VERSION_H_ -#define _INCLUDE_SVN_VERSION_H_ - -/** This file is auto-generated by build scripts. Do not edit it unless you know what you're doing. */ -/** Do not commit the generated .h file, as it will only mess up SVN revision numbers. */ - -#define SVN_VERSION "1.8.2-dev" - -#endif //_INCLUDE_SVN_VERSION_H_ diff --git a/dlls/cstrike/csx/svn_version.h b/dlls/cstrike/csx/svn_version.h deleted file mode 100644 index 707c452e..00000000 --- a/dlls/cstrike/csx/svn_version.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef _INCLUDE_SVN_VERSION_H_ -#define _INCLUDE_SVN_VERSION_H_ - -/** This file is auto-generated by build scripts. Do not edit it unless you know what you're doing. */ -/** Do not commit the generated .h file, as it will only mess up SVN revision numbers. */ - -#define SVN_VERSION "1.8.2-dev" - -#endif //_INCLUDE_SVN_VERSION_H_ diff --git a/dlls/dod/dodfun/svn_version.h b/dlls/dod/dodfun/svn_version.h deleted file mode 100644 index 707c452e..00000000 --- a/dlls/dod/dodfun/svn_version.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef _INCLUDE_SVN_VERSION_H_ -#define _INCLUDE_SVN_VERSION_H_ - -/** This file is auto-generated by build scripts. Do not edit it unless you know what you're doing. */ -/** Do not commit the generated .h file, as it will only mess up SVN revision numbers. */ - -#define SVN_VERSION "1.8.2-dev" - -#endif //_INCLUDE_SVN_VERSION_H_ diff --git a/dlls/dod/dodx/svn_version.h b/dlls/dod/dodx/svn_version.h deleted file mode 100644 index 707c452e..00000000 --- a/dlls/dod/dodx/svn_version.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef _INCLUDE_SVN_VERSION_H_ -#define _INCLUDE_SVN_VERSION_H_ - -/** This file is auto-generated by build scripts. Do not edit it unless you know what you're doing. */ -/** Do not commit the generated .h file, as it will only mess up SVN revision numbers. */ - -#define SVN_VERSION "1.8.2-dev" - -#endif //_INCLUDE_SVN_VERSION_H_ diff --git a/dlls/engine/svn_version.h b/dlls/engine/svn_version.h deleted file mode 100644 index 707c452e..00000000 --- a/dlls/engine/svn_version.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef _INCLUDE_SVN_VERSION_H_ -#define _INCLUDE_SVN_VERSION_H_ - -/** This file is auto-generated by build scripts. Do not edit it unless you know what you're doing. */ -/** Do not commit the generated .h file, as it will only mess up SVN revision numbers. */ - -#define SVN_VERSION "1.8.2-dev" - -#endif //_INCLUDE_SVN_VERSION_H_ diff --git a/dlls/fakemeta/svn_version.h b/dlls/fakemeta/svn_version.h deleted file mode 100644 index 707c452e..00000000 --- a/dlls/fakemeta/svn_version.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef _INCLUDE_SVN_VERSION_H_ -#define _INCLUDE_SVN_VERSION_H_ - -/** This file is auto-generated by build scripts. Do not edit it unless you know what you're doing. */ -/** Do not commit the generated .h file, as it will only mess up SVN revision numbers. */ - -#define SVN_VERSION "1.8.2-dev" - -#endif //_INCLUDE_SVN_VERSION_H_ diff --git a/dlls/fun/svn_version.h b/dlls/fun/svn_version.h deleted file mode 100644 index 707c452e..00000000 --- a/dlls/fun/svn_version.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef _INCLUDE_SVN_VERSION_H_ -#define _INCLUDE_SVN_VERSION_H_ - -/** This file is auto-generated by build scripts. Do not edit it unless you know what you're doing. */ -/** Do not commit the generated .h file, as it will only mess up SVN revision numbers. */ - -#define SVN_VERSION "1.8.2-dev" - -#endif //_INCLUDE_SVN_VERSION_H_ diff --git a/dlls/geoip/svn_version.h b/dlls/geoip/svn_version.h deleted file mode 100644 index 707c452e..00000000 --- a/dlls/geoip/svn_version.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef _INCLUDE_SVN_VERSION_H_ -#define _INCLUDE_SVN_VERSION_H_ - -/** This file is auto-generated by build scripts. Do not edit it unless you know what you're doing. */ -/** Do not commit the generated .h file, as it will only mess up SVN revision numbers. */ - -#define SVN_VERSION "1.8.2-dev" - -#endif //_INCLUDE_SVN_VERSION_H_ diff --git a/dlls/hamsandwich/svn_version.h b/dlls/hamsandwich/svn_version.h deleted file mode 100644 index 707c452e..00000000 --- a/dlls/hamsandwich/svn_version.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef _INCLUDE_SVN_VERSION_H_ -#define _INCLUDE_SVN_VERSION_H_ - -/** This file is auto-generated by build scripts. Do not edit it unless you know what you're doing. */ -/** Do not commit the generated .h file, as it will only mess up SVN revision numbers. */ - -#define SVN_VERSION "1.8.2-dev" - -#endif //_INCLUDE_SVN_VERSION_H_ diff --git a/dlls/mysqlx/svn_version.h b/dlls/mysqlx/svn_version.h deleted file mode 100644 index 707c452e..00000000 --- a/dlls/mysqlx/svn_version.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef _INCLUDE_SVN_VERSION_H_ -#define _INCLUDE_SVN_VERSION_H_ - -/** This file is auto-generated by build scripts. Do not edit it unless you know what you're doing. */ -/** Do not commit the generated .h file, as it will only mess up SVN revision numbers. */ - -#define SVN_VERSION "1.8.2-dev" - -#endif //_INCLUDE_SVN_VERSION_H_ diff --git a/dlls/ns/svn_version.h b/dlls/ns/svn_version.h deleted file mode 100644 index 707c452e..00000000 --- a/dlls/ns/svn_version.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef _INCLUDE_SVN_VERSION_H_ -#define _INCLUDE_SVN_VERSION_H_ - -/** This file is auto-generated by build scripts. Do not edit it unless you know what you're doing. */ -/** Do not commit the generated .h file, as it will only mess up SVN revision numbers. */ - -#define SVN_VERSION "1.8.2-dev" - -#endif //_INCLUDE_SVN_VERSION_H_ diff --git a/dlls/nvault/svn_version.h b/dlls/nvault/svn_version.h deleted file mode 100644 index 707c452e..00000000 --- a/dlls/nvault/svn_version.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef _INCLUDE_SVN_VERSION_H_ -#define _INCLUDE_SVN_VERSION_H_ - -/** This file is auto-generated by build scripts. Do not edit it unless you know what you're doing. */ -/** Do not commit the generated .h file, as it will only mess up SVN revision numbers. */ - -#define SVN_VERSION "1.8.2-dev" - -#endif //_INCLUDE_SVN_VERSION_H_ diff --git a/dlls/regex/svn_version.h b/dlls/regex/svn_version.h deleted file mode 100644 index 707c452e..00000000 --- a/dlls/regex/svn_version.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef _INCLUDE_SVN_VERSION_H_ -#define _INCLUDE_SVN_VERSION_H_ - -/** This file is auto-generated by build scripts. Do not edit it unless you know what you're doing. */ -/** Do not commit the generated .h file, as it will only mess up SVN revision numbers. */ - -#define SVN_VERSION "1.8.2-dev" - -#endif //_INCLUDE_SVN_VERSION_H_ diff --git a/dlls/sockets/svn_version.h b/dlls/sockets/svn_version.h deleted file mode 100644 index 707c452e..00000000 --- a/dlls/sockets/svn_version.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef _INCLUDE_SVN_VERSION_H_ -#define _INCLUDE_SVN_VERSION_H_ - -/** This file is auto-generated by build scripts. Do not edit it unless you know what you're doing. */ -/** Do not commit the generated .h file, as it will only mess up SVN revision numbers. */ - -#define SVN_VERSION "1.8.2-dev" - -#endif //_INCLUDE_SVN_VERSION_H_ diff --git a/dlls/sqlite/svn_version.h b/dlls/sqlite/svn_version.h deleted file mode 100644 index 707c452e..00000000 --- a/dlls/sqlite/svn_version.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef _INCLUDE_SVN_VERSION_H_ -#define _INCLUDE_SVN_VERSION_H_ - -/** This file is auto-generated by build scripts. Do not edit it unless you know what you're doing. */ -/** Do not commit the generated .h file, as it will only mess up SVN revision numbers. */ - -#define SVN_VERSION "1.8.2-dev" - -#endif //_INCLUDE_SVN_VERSION_H_ diff --git a/dlls/tfcx/svn_version.h b/dlls/tfcx/svn_version.h deleted file mode 100644 index 707c452e..00000000 --- a/dlls/tfcx/svn_version.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef _INCLUDE_SVN_VERSION_H_ -#define _INCLUDE_SVN_VERSION_H_ - -/** This file is auto-generated by build scripts. Do not edit it unless you know what you're doing. */ -/** Do not commit the generated .h file, as it will only mess up SVN revision numbers. */ - -#define SVN_VERSION "1.8.2-dev" - -#endif //_INCLUDE_SVN_VERSION_H_ diff --git a/dlls/ts/tsfun/svn_version.h b/dlls/ts/tsfun/svn_version.h deleted file mode 100644 index 707c452e..00000000 --- a/dlls/ts/tsfun/svn_version.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef _INCLUDE_SVN_VERSION_H_ -#define _INCLUDE_SVN_VERSION_H_ - -/** This file is auto-generated by build scripts. Do not edit it unless you know what you're doing. */ -/** Do not commit the generated .h file, as it will only mess up SVN revision numbers. */ - -#define SVN_VERSION "1.8.2-dev" - -#endif //_INCLUDE_SVN_VERSION_H_ diff --git a/dlls/ts/tsx/svn_version.h b/dlls/ts/tsx/svn_version.h deleted file mode 100644 index 707c452e..00000000 --- a/dlls/ts/tsx/svn_version.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef _INCLUDE_SVN_VERSION_H_ -#define _INCLUDE_SVN_VERSION_H_ - -/** This file is auto-generated by build scripts. Do not edit it unless you know what you're doing. */ -/** Do not commit the generated .h file, as it will only mess up SVN revision numbers. */ - -#define SVN_VERSION "1.8.2-dev" - -#endif //_INCLUDE_SVN_VERSION_H_ diff --git a/modules.versions b/modules.versions deleted file mode 100644 index 519a5b2d..00000000 --- a/modules.versions +++ /dev/null @@ -1,104 +0,0 @@ -[PRODUCT] -major = 1 -minor = 8 -revision = 3 - -[core] -folder = amxmodx -in = svn_version.tpl -out = svn_version.h - -[plugins] -folder = plugins/include -in = svn_version.tpl -out = svn_version.inc - -[cstrike] -folder = dlls/cstrike/cstrike -in = svn_version.tpl -out = svn_version.h - -[csx] -folder = dlls/cstrike/csx -in = svn_version.tpl -out = svn_version.h - -[dodfun] -folder = dlls/dod/dodfun -in = svn_version.tpl -out = svn_version.h - -[dodx] -folder = dlls/dod/dodx -in = svn_version.tpl -out = svn_version.h - -[engine] -folder = dlls/engine -in = svn_version.tpl -out = svn_version.h - -[fakemeta] -folder = dlls/fakemeta -in = svn_version.tpl -out = svn_version.h - -[fun] -folder = dlls/fun -in = svn_version.tpl -out = svn_version.h - -[geoip] -folder = dlls/geoip -in = svn_version.tpl -out = svn_version.h - -[mysqlx] -folder = dlls/mysqlx -in = svn_version.tpl -out = svn_version.h - -[ns] -folder = dlls/ns -in = svn_version.tpl -out = svn_version.h - -[nvault] -folder = dlls/nvault -in = svn_version.tpl -out = svn_version.h - -[regex] -folder = dlls/regex -in = svn_version.tpl -out = svn_version.h - -[sockets] -folder = dlls/sockets -in = svn_version.tpl -out = svn_version.h - -[sqlite] -folder = dlls/sqlite -in = svn_version.tpl -out = svn_version.h - -[tfcx] -folder = dlls/tfcx -in = svn_version.tpl -out = svn_version.h - -[tsx] -folder = dlls/ts/tsx -in = svn_version.tpl -out = svn_version.h - -[tsfun] -folder = dlls/ts/tsfun -in = svn_version.tpl -out = svn_version.h - -[hamsandwich] -folder = dlls/hamsandwich -in = svn_version.tpl -out = svn_version.h diff --git a/support/PackageScript b/support/PackageScript index 61faf522..f25cc3a5 100644 --- a/support/PackageScript +++ b/support/PackageScript @@ -276,7 +276,6 @@ scripting_files = [ 'include/sorting.inc', 'include/sqlx.inc', 'include/svn_version.inc', - 'include/svn_version.tpl', 'include/time.inc', 'include/vector.inc', 'include/amxmod_compat/VexdUM.inc', diff --git a/support/versionchanger.pl b/support/versionchanger.pl deleted file mode 100755 index ce5f6f62..00000000 --- a/support/versionchanger.pl +++ /dev/null @@ -1,140 +0,0 @@ -#!/usr/bin/perl - -our %arguments = -( - 'config' => 'modules.versions', - 'major' => '1', - 'minor' => '0', - 'revision' => '0', - 'build' => undef, - 'path' => '', - 'buildstring' => '', -); - -my $arg; -foreach $arg (@ARGV) -{ - $arg =~ s/--//; - @arg = split(/=/, $arg); - $arguments{$arg[0]} = $arg[1]; -} - -#Set up path info -if ($arguments{'path'} ne "") -{ - if (!(-d $arguments{'path'})) - { - die "Unable to find path: " . $arguments{'path'} ."\n"; - } - chdir($arguments{'path'}); -} - -if (!open(CONFIG, $arguments{'config'})) -{ - die "Unable to open config file for reading: " . $arguments{'config'} . "\n"; -} - -our %modules; -my $cur_module = undef; -my $line; -while () -{ - chomp; - $line = $_; - if ($line =~ /^\[([^\]]+)\]$/) - { - $cur_module = $1; - next; - } - if (!$cur_module) - { - next; - } - if ($line =~ /^([^=]+) = (.+)$/) - { - $modules{$cur_module}{$1} = $2; - } -} - -close(CONFIG); - -#Copy global configuration options... -if (exists($modules{'PRODUCT'})) -{ - if (exists($modules{'PRODUCT'}{'major'})) - { - $arguments{'major'} = $modules{'PRODUCT'}{'major'}; - } - if (exists($modules{'PRODUCT'}{'minor'})) - { - $arguments{'minor'} = $modules{'PRODUCT'}{'minor'}; - } - if (exists($modules{'PRODUCT'}{'revision'})) - { - $arguments{'revision'} = $modules{'PRODUCT'}{'revision'}; - } -} - -#Get the global SVN revision if we have none -my $rev; -if ($arguments{'build'} == undef) -{ - my ($text); - $text = `hg identif -n -i`; - chomp $text; - $text =~ s/\+//g; - my ($id,$num) = split(/ /, $text); - $rev = "$num:$id"; -} -else -{ - $rev = int($arguments{'build'}); -} - -my $major = $arguments{'major'}; -my $minor = $arguments{'minor'}; -my $revision = $arguments{'revision'}; -my $buildstr = $arguments{'buildstring'}; - -#Go through everything now -my $mod_i; -while ( ($cur_module, $mod_i) = each(%modules) ) -{ - #Skip the magic one - if ($cur_module eq "PRODUCT") - { - next; - } - #Prepare path - my %mod = %{$mod_i}; - my $infile = $mod{'in'}; - my $outfile = $mod{'out'}; - if ($mod{'folder'}) - { - if (!(-d $mod{'folder'})) - { - die "Folder " . $mod{'folder'} . " not found.\n"; - } - $infile = $mod{'folder'} . '/' . $infile; - $outfile = $mod{'folder'} . '/' . $outfile; - } - if (!(-f $infile)) - { - die "File $infile is not a file.\n"; - } - #Start rewriting - open(INFILE, $infile) or die "Could not open file for reading: $infile\n"; - open(OUTFILE, '>'.$outfile) or die "Could not open file for writing: $outfile\n"; - while () - { - s/\$PMAJOR\$/$major/g; - s/\$PMINOR\$/$minor/g; - s/\$PREVISION\$/$revision/g; - s/\$BUILD_ID\$/$rev/g; - s/\$BUILD_STRING\$/$buildstr/g; - print OUTFILE $_; - } - close(OUTFILE); - close(INFILE); -} -