From 98a010efc16e1ae590b4be9d1c033d9a0e850dad Mon Sep 17 00:00:00 2001 From: David Anderson Date: Sat, 3 Mar 2007 08:40:01 +0000 Subject: [PATCH] added versioning to geoip --HG-- extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/trunk%40576 --- extensions/geoip/msvc8/geoip.vcproj | 8 +++ extensions/geoip/smsdk_config.h | 4 +- extensions/geoip/svn_version.h | 12 ++++ extensions/geoip/svn_version.tpl | 12 ++++ extensions/geoip/version.rc | 104 ++++++++++++++++++++++++++++ modules.versions | 5 ++ tools/versionchanger.pl | 1 - 7 files changed, 144 insertions(+), 2 deletions(-) create mode 100644 extensions/geoip/svn_version.h create mode 100644 extensions/geoip/svn_version.tpl create mode 100644 extensions/geoip/version.rc diff --git a/extensions/geoip/msvc8/geoip.vcproj b/extensions/geoip/msvc8/geoip.vcproj index d9132994..313793a6 100644 --- a/extensions/geoip/msvc8/geoip.vcproj +++ b/extensions/geoip/msvc8/geoip.vcproj @@ -214,12 +214,20 @@ RelativePath="..\smsdk_ext.h" > + + + + diff --git a/extensions/geoip/smsdk_config.h b/extensions/geoip/smsdk_config.h index 3356afb2..8e77d2ac 100644 --- a/extensions/geoip/smsdk_config.h +++ b/extensions/geoip/smsdk_config.h @@ -20,10 +20,12 @@ #ifndef _INCLUDE_SOURCEMOD_EXTENSION_CONFIG_H_ #define _INCLUDE_SOURCEMOD_EXTENSION_CONFIG_H_ +#include "svn_version.h" + /* Basic information exposed publically */ #define SMEXT_CONF_NAME "GeoIP" #define SMEXT_CONF_DESCRIPTION "NO IDEA WHAT THIS MODULE DOES" //:TODO: -#define SMEXT_CONF_VERSION "0.0.0.0" +#define SMEXT_CONF_VERSION SVN_FULL_VERSION #define SMEXT_CONF_AUTHOR "AlliedModders" #define SMEXT_CONF_URL "http://www.sourcemod.net/" #define SMEXT_CONF_LOGTAG "GEOIP" diff --git a/extensions/geoip/svn_version.h b/extensions/geoip/svn_version.h new file mode 100644 index 00000000..e7226735 --- /dev/null +++ b/extensions/geoip/svn_version.h @@ -0,0 +1,12 @@ +/** + * Autogenerated by build scripts + */ + +#ifndef _INCLUDE_GEOIP_VERSION_H_ +#define _INCLUDE_GEOIP_VERSION_H_ + + +#define SVN_FULL_VERSION "1.0.0.431" +#define SVN_FILE_VERSION 1,0,0,431 + +#endif //_INCLUDE_GEOIP_VERSION_H_ diff --git a/extensions/geoip/svn_version.tpl b/extensions/geoip/svn_version.tpl new file mode 100644 index 00000000..3574844e --- /dev/null +++ b/extensions/geoip/svn_version.tpl @@ -0,0 +1,12 @@ +/** + * Autogenerated by build scripts + */ + +#ifndef _INCLUDE_GEOIP_VERSION_H_ +#define _INCLUDE_GEOIP_VERSION_H_ + + +#define SVN_FULL_VERSION "$PMAJOR$.$PMINOR$.$PREVISION$.$LOCAL_BUILD$" +#define SVN_FILE_VERSION $PMAJOR$,$PMINOR$,$PREVISION$,$LOCAL_BUILD$ + +#endif //_INCLUDE_GEOIP_VERSION_H_ diff --git a/extensions/geoip/version.rc b/extensions/geoip/version.rc new file mode 100644 index 00000000..5bf02ef0 --- /dev/null +++ b/extensions/geoip/version.rc @@ -0,0 +1,104 @@ +// Microsoft Visual C++ generated resource script. +// +//#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "winres.h" + +#include "svn_version.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (U.S.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION SVN_FILE_VERSION + PRODUCTVERSION SVN_FILE_VERSION + FILEFLAGSMASK 0x17L +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x4L + FILETYPE 0x2L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "000004b0" + BEGIN + VALUE "Comments", "GeoIP Extension" + VALUE "FileDescription", "SourceMod GeoIP Extension" + VALUE "FileVersion", SVN_FULL_VERSION + VALUE "InternalName", "sourceMod GeoIP Extension" + VALUE "LegalCopyright", "Copyright (c) 2004-2007, AlliedModders LLC" + VALUE "OriginalFilename", "geoip.ext.dll" + VALUE "ProductName", "SourceMod GeoIP Extension" + VALUE "ProductVersion", SVN_FULL_VERSION + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0, 1200 + END +END + + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include ""winres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + +#endif // English (U.S.) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + diff --git a/modules.versions b/modules.versions index 671cb640..bc75a4a1 100644 --- a/modules.versions +++ b/modules.versions @@ -12,3 +12,8 @@ out = sm_version.h folder = sourcepawn/jit/x86 in = jit_version.tpl out = jit_version.h + +[geoip] +folder = extensions/geoip +in = svn_version.tpl +out = svn_version.h diff --git a/tools/versionchanger.pl b/tools/versionchanger.pl index 63004d38..a8457e93 100644 --- a/tools/versionchanger.pl +++ b/tools/versionchanger.pl @@ -151,7 +151,6 @@ sub GetRevision } else { $rev = `svnversion --committed $path`; } - print "$path $rev\n"; if ($rev =~ /exported/) { die "Path specified is not a working copy\n";