Merge pull request #165 from Arkshine/feature/add-version-lib-and-missing-rc

Update versioning system and add missing module RC file (bug 6222)

AMBuildScript

@@ -14,6 +14,7 @@ class AMXXConfig(object):
     self.hlsdk_path = None
     self.mysql_path = None
     self.generated_headers = []
+    self.versionlib = None
     self.csx_app = None
     self.stdcxx_path = None
 
@@ -24,7 +25,6 @@ class AMXXConfig(object):
 
   def detectProductVersion(self):
     builder.AddConfigureFile('product.version')
-    builder.AddConfigureFile('.git/HEAD')
 
     # For OS X dylib versioning
     import re
@@ -255,11 +255,15 @@ class AMXXConfig(object):
     cfg.defines += [
       'AMX_NOPROPLIST',
       'PAWN_CELL_SIZE=32',
+      'AMXMODX_BUILD',
+      'AMXX_USE_VERSIONLIB',
     ]
 
     if self.use_auto_versioning():
-        cfg.defines += ['AMBUILD']
+        cfg.defines += ['AMXX_GENERATED_BUILD']
         cfg.includes += [os.path.join(builder.buildPath, 'includes')]
+        cfg.includes += [os.path.join(builder.sourcePath, 'support', 'versionlib')]
+        
     cfg.includes += [os.path.join(builder.sourcePath, 'public')]
     cfg.includes += [os.path.join(builder.sourcePath, 'public', 'sdk')]
     cfg.includes += [os.path.join(builder.sourcePath, 'public', 'amtl')]
@@ -270,9 +274,10 @@ class AMXXConfig(object):
   # Low-level compiler and binary construction.
   #
 
-  def MMCompiler(self, context):
+  def ConfigureForModule(self, context, compiler):
-    compiler = context.compiler.clone()
     compiler.cxxincludes += [
+      os.path.join(context.currentSourcePath),
+      os.path.join(context.currentSourcePath, 'sdk'),
       os.path.join(self.metamod_path, 'metamod'),
       os.path.join(self.hlsdk_path, 'common'),
       os.path.join(self.hlsdk_path, 'dlls'),
@@ -283,49 +288,22 @@ class AMXXConfig(object):
     ]
     return compiler
 
-  def LibraryBuilder(self, context, compiler, name):
+  def AddVersioning(self, binary):
-    binary = compiler.Library(name)
-    binary.compiler.cxxincludes += [os.path.join(context.currentSourcePath)]
     if builder.target_platform == 'windows':
       binary.compiler.rcdefines += [
         'BINARY_NAME="{0}"'.format(binary.outputFile),
         'RC_COMPILE',
       ]
       if self.use_auto_versioning():
-        binary.compiler.rcdefines += ['AMBUILD']
+        binary.compiler.rcdefines += ['AMXX_GENERATED_BUILD']
     elif builder.target_platform == 'mac':
       binary.compiler.postlink += [
         '-compatibility_version', '1.0.0',
         '-current_version', self.productVersion
       ]
-      if self.use_auto_versioning():
+    if self.use_auto_versioning():
-        binary.compiler.rcdefines += ['AMBUILD']
+      binary.compiler.linkflags += [self.versionlib]
-
+      binary.compiler.sourcedeps += AMXX.generated_headers
-    binary.compiler.sourcedeps += AMXX.generated_headers
-    return binary
-
-  def ModuleBuilder(self, context, compiler, name):
-    compiler.cxxincludes += [
-      os.path.join(context.currentSourcePath, 'sdk'),
-    ]
-
-    if builder.target_platform == 'mac' or builder.target_platform == 'windows':
-      name = name + '_amxx'
-    elif builder.target_platform == 'linux':
-      name = name + '_amxx_i386'
-
-    return self.LibraryBuilder(context, compiler, name)
-
-  def ProgramBuilder(self, context, compiler, name):
-    binary = compiler.Program(name)
-    binary.compiler.cxxincludes += [os.path.join(context.currentSourcePath)]
-    if builder.target_platform == 'windows':
-      binary.compiler.rcdefines += [
-        'BINARY_NAME="{0}"'.format(binary.outputFile),
-        'AMBUILD',
-        'RC_COMPILE',
-      ]
-    binary.compiler.sourcedeps += AMXX.generated_headers
     return binary
 
   #
@@ -334,30 +312,30 @@ class AMXXConfig(object):
   #
 
   def Library(self, context, name):
-    compiler = context.compiler.clone()
+    binary = context.compiler.Library(name)
-    return self.LibraryBuilder(context, compiler, name)
+    return self.AddVersioning(binary)
 
   def MetaPlugin(self, context, name):
-    compiler = self.MMCompiler(context)
-
     if builder.target_platform == 'mac' or builder.target_platform == 'windows':
       name = name + '_mm'
     elif builder.target_platform == 'linux':
       name = name + '_mm_i386'
-
+    binary = context.compiler.Library(name)
-    return self.LibraryBuilder(context, compiler, name)
+    self.ConfigureForModule(context, binary.compiler)
-
+    return self.AddVersioning(binary)
-  def Module(self, context, name):
-    compiler = context.compiler.clone()
-    return self.ModuleBuilder(context, compiler, name)
 
   def MetaModule(self, context, name):
-    compiler = self.MMCompiler(context)
+    if builder.target_platform == 'mac' or builder.target_platform == 'windows':
-    return self.ModuleBuilder(context, compiler, name)
+      name = name + '_amxx'
+    elif builder.target_platform == 'linux':
+      name = name + '_amxx_i386'
+    binary = context.compiler.Library(name)
+    self.ConfigureForModule(context, binary.compiler)
+    return self.AddVersioning(binary)
 
   def Program(self, context, name):
-    compiler = context.compiler.clone()
+    binary = context.compiler.Program(name)
-    return self.ProgramBuilder(context, compiler, name)
+    return self.AddVersioning(binary)
 
 AMXX = AMXXConfig()
 AMXX.detectProductVersion()
@@ -371,6 +349,10 @@ if AMXX.use_auto_versioning():
     'support/Versioning',
     { 'AMXX': AMXX }
   )
+  AMXX.versionlib = builder.RunScript(
+    'support/versionlib/AMBuilder',
+    { 'AMXX': AMXX }
+  )
 
 builder.RunBuildScripts(
   [

amxmodx/amxmodx.cpp

@@ -814,7 +814,7 @@ static cell AMX_NATIVE_CALL is_user_alive(AMX *amx, cell *params) /* 1 param */
 
 static cell AMX_NATIVE_CALL get_amxx_verstring(AMX *amx, cell *params) /* 2 params */
 {
-	return set_amxstring(amx, params[1], SVN_VERSION_STRING, params[2]);
+	return set_amxstring(amx, params[1], AMXX_VERSION, params[2]);
 }
 
 static cell AMX_NATIVE_CALL get_user_frags(AMX *amx, cell *params) /* 1 param */

amxmodx/amxxlog.cpp

@@ -101,7 +101,7 @@ void CLog::CreateNewFile()
 		ALERT(at_logged, "[AMXX] Unexpected fatal logging error. AMXX Logging disabled.\n");
 		SET_LOCALINFO("amxx_logging", "0");
 	} else {
-		fprintf(fp, "AMX Mod X log file started (file \"%s\") (version \"%s\")\n", name, SVN_VERSION_STRING);
+		fprintf(fp, "AMX Mod X log file started (file \"%s\") (version \"%s\")\n", name, AMXX_VERSION);
 		fclose(fp);
 	}
 }

amxmodx/meta_api.cpp

@@ -36,7 +36,7 @@ plugin_info_t Plugin_info =
 {
 	META_INTERFACE_VERSION,		// ifvers
 	"AMX Mod X",				// name
-	SVN_VERSION_STRING,			// version
+	AMXX_VERSION,			// version
 	__DATE__,					// date
 	"AMX Mod X Dev Team",		// author
 	"http://www.amxmodx.org",	// url
@@ -450,7 +450,7 @@ int	C_Spawn(edict_t *pent)
 	int loaded = countModules(CountModules_Running); // Call after attachModules so all modules don't have pending stat
 	
 	// Set some info about amx version and modules
-	CVAR_SET_STRING(init_amxmodx_version.name, SVN_VERSION_STRING);
+	CVAR_SET_STRING(init_amxmodx_version.name, AMXX_VERSION);
 	char buffer[32];
 	sprintf(buffer, "%d", loaded);
 	CVAR_SET_STRING(init_amxmodx_modules.name, buffer);
@@ -1458,7 +1458,7 @@ C_DLLEXPORT	int	Meta_Attach(PLUG_LOADTIME now, META_FUNCTIONS *pFunctionTable, m
 
 	// ###### Print short GPL
 	print_srvconsole("\n   AMX Mod X version %s Copyright (c) 2004-2014 AMX Mod X Development Team \n"
-					 "   AMX Mod X comes with ABSOLUTELY NO WARRANTY; for details type `amxx gpl'.\n", SVN_VERSION_STRING);
+					 "   AMX Mod X comes with ABSOLUTELY NO WARRANTY; for details type `amxx gpl'.\n", AMXX_VERSION);
 	print_srvconsole("   This is free software and you are welcome to redistribute it under \n"
 					 "   certain conditions; type 'amxx gpl' for details.\n  \n");
 

amxmodx/srvcmd.cpp

@@ -180,8 +180,11 @@ void amx_command()
 		print_srvconsole("\tFelix \"SniperBeamer\" Geyer, Jonny \"Got His Gun\" Bergstrom\n");
 		print_srvconsole("\tLukasz \"SidLuke\" Wlasinski, Christian \"Basic-Master\" Hammacher\n");
 		print_srvconsole("\tBorja \"faluco\" Ferrer, Scott \"DS\" Ehlert\n");
-		print_srvconsole("Compiled: %s\n", __DATE__ ", " __TIME__);
+		print_srvconsole("Compiled: %s\n", AMXX_BUILD_TIME);
-		print_srvconsole("Build ID: %s\n", SVN_BUILD_ID);
+#if defined(AMXX_GENERATED_BUILD)
+		print_srvconsole("Built from: https://github.com/alliedmodders/amxmodx/commit/%s", AMXX_SHA);
+		print_srvconsole("Build ID: %s:%s", AMXX_LOCAL_REV, AMXX_SHA);
+#endif
 #if defined JIT && !defined ASM32
 		print_srvconsole("Core mode: JIT Only\n");
 #elif !defined JIT && defined ASM32

compiler/amxxpc/amx.cpp

@@ -41,7 +41,7 @@
 #include <string.h>
 #include "osdefs.h"
 #if defined LINUX || defined __FreeBSD__ || defined __OpenBSD__ || defined __APPLE__
-  #include <sclinux.h>
+  #include "sclinux.h"
   #if !defined AMX_NODYNALOAD
     #include <dlfcn.h>
   #endif

compiler/amxxpc/amx.h

@@ -23,7 +23,7 @@
   #define __FreeBSD__
 #endif
 #if defined LINUX || defined __FreeBSD__ || defined __OpenBSD__ || defined __APPLE__
-  #include <sclinux.h>
+  #include "sclinux.h"
 #endif
 
 #ifndef AMX_H_INCLUDED

compiler/amxxpc/amxxpc.cpp

@@ -82,7 +82,7 @@ int main(int argc, char **argv)
 		exit(0);
 	}
 
-	pc_printf("AMX Mod X Compiler %s\n", SVN_VERSION);
+	pc_printf("AMX Mod X Compiler %s\n", AMXX_VERSION);
 	pc_printf("Copyright (c) 1997-2006 ITB CompuPhase\n");
         pc_printf("Copyright (c) 2004-2013 AMX Mod X Team\n\n");
 	

compiler/amxxpc/amxxpc.h

@@ -10,9 +10,7 @@
 #ifndef _AMXXSC_INCLUDE_H
 #define _AMXXSC_INCLUDE_H
 
-#ifndef SVN_VERSION
 #include <amxmodx_version.h>
-#endif
 
 #define MAGIC_HEADER2		0x414D5858
 #define	MAGIC_VERSION		0x0300

compiler/amxxpc/amxxpc1.rc

@@ -1,13 +1,12 @@
 // Microsoft Visual C++ generated resource script.
 //
-#include "resource1.h"
-
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
-#include "windows.h"
+#include <winresrc.h>
+#include <amxmodx_version.h>
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
@@ -21,6 +20,44 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 #pragma code_page(1252)
 #endif //_WIN32
 
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION AMXX_VERSION_FILE
+ PRODUCTVERSION AMXX_VERSION_FILE
+ 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", "AMXXPC"
+            VALUE "FileDescription", "AMXXPC"
+            VALUE "FileVersion", AMXX_VERSION
+            VALUE "InternalName", "amxxpc"
+            VALUE "LegalCopyright", "Copyright (c) AMX Mod X Dev Team"
+            VALUE "OriginalFilename", "amxxpc.exe"
+            VALUE "ProductName", "AMXXPC"
+            VALUE "ProductVersion", AMXX_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x0, 1200
+    END
+END
+
 #ifdef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
 //

compiler/libpc300/amx.h

@@ -32,7 +32,7 @@
   #define __FreeBSD__
 #endif
 #if defined LINUX || defined __FreeBSD__ || defined __OpenBSD__ || defined __APPLE__
-  #include <sclinux.h>
+  #include "sclinux.h"
 #endif
 
 #ifndef AMX_H_INCLUDED

dlls/cstrike/cstrike/AMBuilder

@@ -6,7 +6,7 @@ binary = AMXX.MetaModule(builder, 'cstrike')
 binary.compiler.defines += [
   'HAVE_STDINT_H',
 ]
-
+  
 binary.sources = [
   '../../../public/sdk/amxxmodule.cpp',
   'amxx_api.cpp',
@@ -19,4 +19,7 @@ binary.sources = [
   '../../../public/memtools/CDetour/asm/asm.c',
 ]
 
+if builder.target_platform == 'windows':
+  binary.sources += ['version.rc']
+  
 AMXX.modules += [builder.Add(binary)]

dlls/cstrike/cstrike/moduleconfig.h

@@ -14,15 +14,11 @@
 #ifndef __MODULECONFIG_H__
 #define __MODULECONFIG_H__
 
-#if defined AMBUILD
+#include <amxmodx_version.h>
-# include <amxmodx_version.h>
-#else
-# define SVN_VERSION "dev-local"
-#endif
 
 // Module info
 #define MODULE_NAME "CStrike"
-#define MODULE_VERSION SVN_VERSION
+#define MODULE_VERSION AMXX_VERSION
 #define MODULE_AUTHOR "AMX Mod X Dev Team"
 #define MODULE_URL "http://www.amxmodx.org"
 #define MODULE_LOGTAG "CSTRIKE"

dlls/cstrike/cstrike/version.rc

@@ -0,0 +1,101 @@
+// Microsoft Visual C++ generated resource script.
+//
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include <winresrc.h>
+#include "moduleconfig.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 AMXX_VERSION_FILE
+ PRODUCTVERSION AMXX_VERSION_FILE
+ 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", "AMX Mod X"
+            VALUE "FileDescription", "AMX Mod X"
+            VALUE "FileVersion", AMXX_VERSION
+            VALUE "InternalName", MODULE_LIBRARY
+            VALUE "LegalCopyright", "Copyright (c) AMX Mod X Dev Team"
+            VALUE "OriginalFilename", MODULE_LIBRARY "_amxx.dll"
+            VALUE "ProductName", MODULE_NAME
+            VALUE "ProductVersion", AMXX_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
+

dlls/cstrike/csx/AMBuilder

@@ -12,4 +12,7 @@ binary.sources = [
   'usermsg.cpp',
 ]
 
+if builder.target_platform == 'windows':
+  binary.sources += ['version.rc']
+
 AMXX.modules += [builder.Add(binary)]

dlls/cstrike/csx/moduleconfig.h

@@ -14,15 +14,11 @@
 #ifndef __MODULECONFIG_H__
 #define __MODULECONFIG_H__
 
-#if defined AMBUILD
+#include <amxmodx_version.h>
-# include <amxmodx_version.h>
-#else
-# define SVN_VERSION "dev-local"
-#endif
 
 // Module info
 #define MODULE_NAME "CSX"
-#define MODULE_VERSION SVN_VERSION
+#define MODULE_VERSION AMXX_VERSION
 #define MODULE_AUTHOR "AMX Mod X Dev Team"
 #define MODULE_URL "http://www.amxmodx.org/"
 #define MODULE_LOGTAG "CSX"

dlls/cstrike/csx/version.rc

@@ -0,0 +1,101 @@
+// Microsoft Visual C++ generated resource script.
+//
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include <winresrc.h>
+#include <moduleconfig.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 AMXX_VERSION_FILE
+ PRODUCTVERSION AMXX_VERSION_FILE
+ 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", "AMX Mod X"
+            VALUE "FileDescription", "AMX Mod X"
+            VALUE "FileVersion", AMXX_VERSION
+            VALUE "InternalName", MODULE_LIBRARY
+            VALUE "LegalCopyright", "Copyright (c) AMX Mod X Dev Team"
+            VALUE "OriginalFilename", MODULE_LIBRARY "_amxx.dll"
+            VALUE "ProductName", MODULE_NAME
+            VALUE "ProductVersion", AMXX_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
+

dlls/dod/dodfun/AMBuilder

@@ -13,4 +13,7 @@ binary.sources = [
   'moduleconfig.cpp',
 ]
 
+if builder.target_platform == 'windows':
+  binary.sources += ['version.rc']
+  
 AMXX.modules += [builder.Add(binary)]

dlls/dod/dodfun/moduleconfig.h

@@ -14,15 +14,11 @@
 #ifndef __MODULECONFIG_H__
 #define __MODULECONFIG_H__
 
-#if defined AMBUILD
+#include <amxmodx_version.h>
-# include <amxmodx_version.h>
-#else
-# define SVN_VERSION "dev-local"
-#endif
 
 // Module info
 #define MODULE_NAME "DoD Fun"
-#define MODULE_VERSION SVN_VERSION
+#define MODULE_VERSION AMXX_VERSION
 #define MODULE_AUTHOR "AMX Mod X Dev Team"
 #define MODULE_URL "http://www.amxmodx.org"
 #define MODULE_LOGTAG "DODFUN"

dlls/dod/dodfun/version.rc

@@ -0,0 +1,101 @@
+// Microsoft Visual C++ generated resource script.
+//
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include <winresrc.h>
+#include <moduleconfig.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 AMXX_VERSION_FILE
+ PRODUCTVERSION AMXX_VERSION_FILE
+ 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", "AMX Mod X"
+            VALUE "FileDescription", "AMX Mod X"
+            VALUE "FileVersion", AMXX_VERSION
+            VALUE "InternalName", MODULE_LIBRARY
+            VALUE "LegalCopyright", "Copyright (c) AMX Mod X Dev Team"
+            VALUE "OriginalFilename", MODULE_LIBRARY "_amxx.dll"
+            VALUE "ProductName", MODULE_NAME
+            VALUE "ProductVersion", AMXX_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
+

dlls/dod/dodx/AMBuilder

@@ -14,4 +14,7 @@ binary.sources = [
   'moduleconfig.cpp',
 ]
 
+if builder.target_platform == 'windows':
+  binary.sources += ['version.rc']
+  
 AMXX.modules += [builder.Add(binary)]

dlls/dod/dodx/moduleconfig.h

@@ -14,15 +14,11 @@
 #ifndef __MODULECONFIG_H__
 #define __MODULECONFIG_H__
 
-#if defined AMBUILD
+#include <amxmodx_version.h>
-# include <amxmodx_version.h>
-#else
-# define SVN_VERSION "dev-local"
-#endif
 
 // Module info
 #define MODULE_NAME "DoDX"
-#define MODULE_VERSION SVN_VERSION
+#define MODULE_VERSION AMXX_VERSION
 #define MODULE_AUTHOR "AMX Mod X Dev Team"
 #define MODULE_URL "http://www.amxmodx.org"
 #define MODULE_LOGTAG "DODX"

dlls/dod/dodx/version.rc

@@ -0,0 +1,101 @@
+// Microsoft Visual C++ generated resource script.
+//
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include <winresrc.h>
+#include <moduleconfig.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 AMXX_VERSION_FILE
+ PRODUCTVERSION AMXX_VERSION_FILE
+ 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", "AMX Mod X"
+            VALUE "FileDescription", "AMX Mod X"
+            VALUE "FileVersion", AMXX_VERSION
+            VALUE "InternalName", MODULE_LIBRARY
+            VALUE "LegalCopyright", "Copyright (c) AMX Mod X Dev Team"
+            VALUE "OriginalFilename", MODULE_LIBRARY "_amxx.dll"
+            VALUE "ProductName", MODULE_NAME
+            VALUE "ProductVersion", AMXX_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
+

dlls/engine/AMBuilder

@@ -6,7 +6,7 @@ binary = AMXX.MetaModule(builder, 'engine')
 binary.compiler.defines += [
   'HAVE_STDINT_H',
 ]
-
+ 
 binary.sources = [
   '../../public/sdk/amxxmodule.cpp',
   'amxxapi.cpp',
@@ -15,5 +15,8 @@ binary.sources = [
   'globals.cpp',
   'forwards.cpp',
 ]
-
+ 
+if builder.target_platform == 'windows':
+  binary.sources += ['version.rc']
+    
 AMXX.modules += [builder.Add(binary)]

dlls/engine/moduleconfig.h

@@ -14,15 +14,11 @@
 #ifndef __MODULECONFIG_H__
 #define __MODULECONFIG_H__
 
-#if defined AMBUILD
+#include <amxmodx_version.h>
-# include <amxmodx_version.h>
-#else
-# define SVN_VERSION "dev-local"
-#endif
 
 // Module info
 #define MODULE_NAME "Engine"
-#define MODULE_VERSION SVN_VERSION
+#define MODULE_VERSION AMXX_VERSION
 #define MODULE_AUTHOR "AMX Mod X Dev Team"
 #define MODULE_URL "http://www.amxmodx.org"
 #define MODULE_LOGTAG "ENGINE"

dlls/engine/version.rc

@@ -0,0 +1,101 @@
+// Microsoft Visual C++ generated resource script.
+//
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include <winresrc.h>
+#include <moduleconfig.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 AMXX_VERSION_FILE
+ PRODUCTVERSION AMXX_VERSION_FILE
+ 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", "AMX Mod X"
+            VALUE "FileDescription", "AMX Mod X"
+            VALUE "FileVersion", AMXX_VERSION
+            VALUE "InternalName", MODULE_LIBRARY
+            VALUE "LegalCopyright", "Copyright (c) AMX Mod X Dev Team"
+            VALUE "OriginalFilename", MODULE_LIBRARY "_amxx.dll"
+            VALUE "ProductName", MODULE_NAME
+            VALUE "ProductVersion", AMXX_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
+

dlls/fakemeta/AMBuilder

@@ -21,4 +21,7 @@ binary.sources = [
   'misc.cpp',
 ]
 
+if builder.target_platform == 'windows':
+    binary.sources += ['version.rc']
+    
 AMXX.modules += [builder.Add(binary)]

dlls/fakemeta/moduleconfig.h

@@ -14,15 +14,11 @@
 #ifndef __MODULECONFIG_H__
 #define __MODULECONFIG_H__
 
-#if defined AMBUILD
+#include <amxmodx_version.h>
-# include <amxmodx_version.h>
-#else
-# define SVN_VERSION "dev-local"
-#endif
 
 // Module info
 #define MODULE_NAME "FakeMeta"
-#define MODULE_VERSION SVN_VERSION
+#define MODULE_VERSION AMXX_VERSION
 #define MODULE_AUTHOR "AMX Mod X Dev Team"
 #define MODULE_URL "http://www.amxmodx.org"
 #define MODULE_LOGTAG "FAKEMETA"

dlls/fakemeta/version.rc

@@ -0,0 +1,101 @@
+// Microsoft Visual C++ generated resource script.
+//
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include <winresrc.h>
+#include <moduleconfig.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 AMXX_VERSION_FILE
+ PRODUCTVERSION AMXX_VERSION_FILE
+ 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", "AMX Mod X"
+            VALUE "FileDescription", "AMX Mod X"
+            VALUE "FileVersion", AMXX_VERSION
+            VALUE "InternalName", MODULE_LIBRARY
+            VALUE "LegalCopyright", "Copyright (c) AMX Mod X Dev Team"
+            VALUE "OriginalFilename", MODULE_LIBRARY "_amxx.dll"
+            VALUE "ProductName", MODULE_NAME
+            VALUE "ProductVersion", AMXX_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
+

dlls/fun/AMBuilder

@@ -2,10 +2,13 @@
 import os.path
 
 binary = AMXX.MetaModule(builder, 'fun')
-
+ 
 binary.sources = [
   '../../public/sdk/amxxmodule.cpp',
   'fun.cpp',
 ]
 
+if builder.target_platform == 'windows':
+  binary.sources += ['version.rc']
+  
 AMXX.modules += [builder.Add(binary)]

dlls/fun/moduleconfig.h

@@ -15,15 +15,11 @@
 #ifndef __MODULECONFIG_H__
 #define __MODULECONFIG_H__
 
-#if defined AMBUILD
+#include <amxmodx_version.h>
-# include <amxmodx_version.h>
-#else
-# define SVN_VERSION "dev-local"
-#endif
 
 // Module info
 #define MODULE_NAME "Fun"
-#define MODULE_VERSION SVN_VERSION
+#define MODULE_VERSION AMXX_VERSION
 #define MODULE_AUTHOR "AMX Mod X Dev Team"
 #define MODULE_URL "http://www.amxmodx.org"
 #define MODULE_LOGTAG "FUN"

dlls/fun/version.rc

@@ -0,0 +1,101 @@
+// Microsoft Visual C++ generated resource script.
+//
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include <winresrc.h>
+#include <moduleconfig.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 AMXX_VERSION_FILE
+ PRODUCTVERSION AMXX_VERSION_FILE
+ 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", "AMX Mod X"
+            VALUE "FileDescription", "AMX Mod X"
+            VALUE "FileVersion", AMXX_VERSION
+            VALUE "InternalName", MODULE_LIBRARY
+            VALUE "LegalCopyright", "Copyright (c) AMX Mod X Dev Team"
+            VALUE "OriginalFilename", MODULE_LIBRARY "_amxx.dll"
+            VALUE "ProductName", MODULE_NAME
+            VALUE "ProductVersion", AMXX_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
+

dlls/geoip/AMBuilder

@@ -15,6 +15,9 @@ binary.sources = [
   'geoip_util.cpp',
 ]
 
+if builder.target_platform == 'windows':
+    binary.sources += ['version.rc']
+    
 if builder.target_platform == 'windows':
   binary.compiler.postlink += ['ws2_32.lib']
   binary.compiler.includes += [os.path.join(builder.sourcePath, 'dlls', 'geoip', 'GeoIP2')]

dlls/geoip/moduleconfig.h

@@ -14,15 +14,11 @@
 #ifndef __MODULECONFIG_H__
 #define __MODULECONFIG_H__
 
-#if defined AMBUILD
+#include <amxmodx_version.h>
-# include <amxmodx_version.h>
-#else
-# define SVN_VERSION "dev-local"
-#endif
 
 // Module info
 #define MODULE_NAME "GeoIP"
-#define MODULE_VERSION SVN_VERSION
+#define MODULE_VERSION AMXX_VERSION
 #define MODULE_AUTHOR "AMX Mod X Dev Team"
 #define MODULE_URL "http://www.amxmodx.org/"
 #define MODULE_LOGTAG "GEOIP"

dlls/geoip/version.rc

@@ -0,0 +1,101 @@
+// Microsoft Visual C++ generated resource script.
+//
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include <winresrc.h>
+#include <moduleconfig.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 AMXX_VERSION_FILE
+ PRODUCTVERSION AMXX_VERSION_FILE
+ 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", "AMX Mod X"
+            VALUE "FileDescription", "AMX Mod X"
+            VALUE "FileVersion", AMXX_VERSION
+            VALUE "InternalName", MODULE_LIBRARY
+            VALUE "LegalCopyright", "Copyright (c) AMX Mod X Dev Team"
+            VALUE "OriginalFilename", MODULE_LIBRARY "_amxx.dll"
+            VALUE "ProductName", MODULE_NAME
+            VALUE "ProductVersion", AMXX_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
+

dlls/hamsandwich/AMBuilder

@@ -21,4 +21,7 @@ binary.sources = [
   'hook_specialbot.cpp',
 ]
 
+if builder.target_platform == 'windows':
+    binary.sources += ['version.rc']
+    
 AMXX.modules += [builder.Add(binary)]

dlls/hamsandwich/moduleconfig.h

@@ -15,15 +15,11 @@
 #ifndef __MODULECONFIG_H__
 #define __MODULECONFIG_H__
 
-#if defined AMBUILD
+#include <amxmodx_version.h>
-# include <amxmodx_version.h>
-#else
-# define SVN_VERSION "dev-local"
-#endif
 
 // Module info
 #define MODULE_NAME "Ham Sandwich"
-#define MODULE_VERSION SVN_VERSION
+#define MODULE_VERSION AMXX_VERSION
 #define MODULE_AUTHOR "AMX Mod X Dev Team"
 #define MODULE_URL "http://www.amxmodx.org"
 #define MODULE_LOGTAG "HAMSANDWICH"

dlls/hamsandwich/version.rc

@@ -0,0 +1,101 @@
+// Microsoft Visual C++ generated resource script.
+//
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include <winresrc.h>
+#include <moduleconfig.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 AMXX_VERSION_FILE
+ PRODUCTVERSION AMXX_VERSION_FILE
+ 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", "AMX Mod X"
+            VALUE "FileDescription", "AMX Mod X"
+            VALUE "FileVersion", AMXX_VERSION
+            VALUE "InternalName", MODULE_LIBRARY
+            VALUE "LegalCopyright", "Copyright (c) AMX Mod X Dev Team"
+            VALUE "OriginalFilename", MODULE_LIBRARY "_amxx.dll"
+            VALUE "ProductName", MODULE_NAME
+            VALUE "ProductVersion", AMXX_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
+

dlls/mysqlx/AMBuilder

@@ -45,6 +45,9 @@ if AMXX.mysql_path:
     'mysql/MysqlDriver.cpp',
   ]
 
+  if builder.target_platform == 'windows':
+    binary.sources += ['version.rc']
+    
   if builder.target_platform == 'windows':
     binary.sources += [
       'thread/WinThreads.cpp',

dlls/mysqlx/moduleconfig.h

@@ -14,11 +14,7 @@
 #ifndef __MODULECONFIG_H__
 #define __MODULECONFIG_H__
 
-#if defined AMBUILD
+#include <amxmodx_version.h>
-# include <amxmodx_version.h>
-#else
-# define SVN_VERSION "dev-local"
-#endif
 
 /** Module info
  * -The logtag is the tag that the module's log messages will be
@@ -32,7 +28,7 @@
  *   to add multiple entries.
  */
 #define MODULE_NAME "MySQL"
-#define MODULE_VERSION SVN_VERSION
+#define MODULE_VERSION AMXX_VERSION
 #define MODULE_AUTHOR "AMX Mod X Dev Team"
 #define MODULE_URL "http://www.amxmodx.org/"
 #define MODULE_LOGTAG "MySQL"

dlls/mysqlx/version.rc

@@ -0,0 +1,101 @@
+// Microsoft Visual C++ generated resource script.
+//
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include <winresrc.h>
+#include <moduleconfig.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 AMXX_VERSION_FILE
+ PRODUCTVERSION AMXX_VERSION_FILE
+ 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", "AMX Mod X"
+            VALUE "FileDescription", "AMX Mod X"
+            VALUE "FileVersion", AMXX_VERSION
+            VALUE "InternalName", MODULE_LIBRARY
+            VALUE "LegalCopyright", "Copyright (c) AMX Mod X Dev Team"
+            VALUE "OriginalFilename", MODULE_LIBRARY "_amxx.dll"
+            VALUE "ProductName", MODULE_NAME
+            VALUE "ProductVersion", AMXX_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
+

dlls/ns/AMBuilder

@@ -26,4 +26,7 @@ binary.sources = [
   'natives/memberfuncs.cpp',
 ]
 
+if builder.target_platform == 'windows':
+  binary.sources += ['version.rc']
+  
 AMXX.modules += [builder.Add(binary)]

dlls/ns/moduleconfig.h

@@ -14,15 +14,11 @@
 #ifndef __MODULECONFIG_H__
 #define __MODULECONFIG_H__
 
-#if defined AMBUILD
+#include <amxmodx_version.h>
-# include <amxmodx_version.h>
-#else
-# define SVN_VERSION "dev-local"
-#endif
 
 // Module info
 #define MODULE_NAME "NS"
-#define MODULE_VERSION SVN_VERSION
+#define MODULE_VERSION AMXX_VERSION
 #define MODULE_AUTHOR "AMX Mod X Dev Team"
 #define MODULE_URL "http://www.amxmodx.org/"
 #define MODULE_LOGTAG "NS"

dlls/ns/version.rc

@@ -0,0 +1,101 @@
+// Microsoft Visual C++ generated resource script.
+//
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include <winresrc.h>
+#include <moduleconfig.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 AMXX_VERSION_FILE
+ PRODUCTVERSION AMXX_VERSION_FILE
+ 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", "AMX Mod X"
+            VALUE "FileDescription", "AMX Mod X"
+            VALUE "FileVersion", AMXX_VERSION
+            VALUE "InternalName", MODULE_LIBRARY
+            VALUE "LegalCopyright", "Copyright (c) AMX Mod X Dev Team"
+            VALUE "OriginalFilename", MODULE_LIBRARY "_amxx.dll"
+            VALUE "ProductName", MODULE_NAME
+            VALUE "ProductVersion", AMXX_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
+

dlls/nvault/AMBuilder

@@ -1,7 +1,7 @@
 # vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:
 import os.path
 
-binary = AMXX.Module(builder, 'nvault')
+binary = AMXX.MetaModule(builder, 'nvault')
 
 binary.compiler.defines += [
   'HAVE_STDINT_H',
@@ -15,4 +15,7 @@ binary.sources = [
   'NVault.cpp',
 ]
 
+if builder.target_platform == 'windows':
+  binary.sources += ['version.rc']
+
 AMXX.modules += [builder.Add(binary)]

dlls/nvault/moduleconfig.h

@@ -14,15 +14,11 @@
 #ifndef __MODULECONFIG_H__
 #define __MODULECONFIG_H__
 
-#if defined AMBUILD
+#include <amxmodx_version.h>
-# include <amxmodx_version.h>
-#else
-# define SVN_VERSION "dev-local"
-#endif
 
 // Module info
 #define MODULE_NAME "nVault"
-#define MODULE_VERSION SVN_VERSION
+#define MODULE_VERSION AMXX_VERSION
 #define MODULE_AUTHOR "AMX Mod X Dev Team"
 #define MODULE_URL "http://www.amxmodx.org/"
 #define MODULE_LOGTAG "nVault"

dlls/nvault/version.rc

@@ -0,0 +1,101 @@
+// Microsoft Visual C++ generated resource script.
+//
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include <winresrc.h>
+#include <moduleconfig.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 AMXX_VERSION_FILE
+ PRODUCTVERSION AMXX_VERSION_FILE
+ 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", "AMX Mod X"
+            VALUE "FileDescription", "AMX Mod X"
+            VALUE "FileVersion", AMXX_VERSION
+            VALUE "InternalName", MODULE_LIBRARY
+            VALUE "LegalCopyright", "Copyright (c) AMX Mod X Dev Team"
+            VALUE "OriginalFilename", MODULE_LIBRARY "_amxx.dll"
+            VALUE "ProductName", MODULE_NAME
+            VALUE "ProductVersion", AMXX_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
+

dlls/regex/AMBuilder

@@ -1,7 +1,7 @@
 # vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:
 import os.path
 
-binary = AMXX.Module(builder, 'regex')
+binary = AMXX.MetaModule(builder, 'regex')
 
 if builder.target_platform == 'linux':
   binary.compiler.postlink += [binary.Dep('lib_linux/libpcre.a')]
@@ -14,6 +14,7 @@ binary.compiler.defines += [
   'PCRE_STATIC',
   'HAVE_STDINT_H',
 ]
+
 binary.sources = [
   '../../public/sdk/amxxmodule.cpp',
   'module.cpp',
@@ -21,4 +22,7 @@ binary.sources = [
   'utils.cpp',
 ]
 
+if builder.target_platform == 'windows':
+  binary.sources += ['version.rc']
+
 AMXX.modules += [builder.Add(binary)]

dlls/regex/moduleconfig.h

@@ -14,15 +14,11 @@
 #ifndef __MODULECONFIG_H__
 #define __MODULECONFIG_H__
 
-#if defined AMBUILD
+#include <amxmodx_version.h>
-# include <amxmodx_version.h>
-#else
-# define SVN_VERSION "dev-local"
-#endif
 
 // Module info
 #define MODULE_NAME "RegEx"
-#define MODULE_VERSION SVN_VERSION
+#define MODULE_VERSION AMXX_VERSION
 #define MODULE_AUTHOR "AMX Mod X Dev Team"
 #define MODULE_URL "http://www.amxmodx.org/"
 #define MODULE_LOGTAG "REGEX"

dlls/regex/version.rc

@@ -0,0 +1,101 @@
+// Microsoft Visual C++ generated resource script.
+//
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include <winresrc.h>
+#include <moduleconfig.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 AMXX_VERSION_FILE
+ PRODUCTVERSION AMXX_VERSION_FILE
+ 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", "AMX Mod X"
+            VALUE "FileDescription", "AMX Mod X"
+            VALUE "FileVersion", AMXX_VERSION
+            VALUE "InternalName", MODULE_LIBRARY
+            VALUE "LegalCopyright", "Copyright (c) AMX Mod X Dev Team"
+            VALUE "OriginalFilename", MODULE_LIBRARY "_amxx.dll"
+            VALUE "ProductName", MODULE_NAME
+            VALUE "ProductVersion", AMXX_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
+

dlls/sockets/AMBuilder

@@ -1,13 +1,16 @@
 # vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:
 import os.path
 
-binary = AMXX.Module(builder, 'sockets')
+binary = AMXX.MetaModule(builder, 'sockets')
 
 binary.sources = [
   '../../public/sdk/amxxmodule.cpp',
   'sockets.cpp',
 ]
 
+if builder.target_platform == 'windows':
+  binary.sources += ['version.rc']
+  
 if builder.target_platform == 'windows':
   binary.compiler.postlink += ['wsock32.lib', 'ws2_32.lib']
 

dlls/sockets/moduleconfig.h

@@ -14,15 +14,11 @@
 #ifndef __MODULECONFIG_H__
 #define __MODULECONFIG_H__
 
-#if defined AMBUILD
+#include <amxmodx_version.h>
-# include <amxmodx_version.h>
-#else
-# define SVN_VERSION "dev-local"
-#endif
 
 // Module info
 #define MODULE_NAME "Sockets"
-#define MODULE_VERSION SVN_VERSION
+#define MODULE_VERSION AMXX_VERSION
 #define MODULE_AUTHOR "HLSW Dev Team"
 #define MODULE_URL "http://www.hlsw.net/"
 #define MODULE_LOGTAG "SOCKET"

dlls/sockets/version.rc

@@ -0,0 +1,101 @@
+// Microsoft Visual C++ generated resource script.
+//
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include <winresrc.h>
+#include <moduleconfig.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 AMXX_VERSION_FILE
+ PRODUCTVERSION AMXX_VERSION_FILE
+ 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", "AMX Mod X"
+            VALUE "FileDescription", "AMX Mod X"
+            VALUE "FileVersion", AMXX_VERSION
+            VALUE "InternalName", MODULE_LIBRARY
+            VALUE "LegalCopyright", "Copyright (c) AMX Mod X Dev Team"
+            VALUE "OriginalFilename", MODULE_LIBRARY "_amxx.dll"
+            VALUE "ProductName", MODULE_NAME
+            VALUE "ProductVersion", AMXX_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
+

dlls/sqlite/AMBuilder

@@ -82,5 +82,7 @@ else:
     'sqlite-source/os_unix.c',
   ]
 
+if builder.target_platform == 'windows':
+  binary.sources += ['version.rc']
 
 AMXX.modules += [builder.Add(binary)]

dlls/sqlite/moduleconfig.h

@@ -14,15 +14,11 @@
 #ifndef __MODULECONFIG_H__
 #define __MODULECONFIG_H__
 
-#if defined AMBUILD
+#include <amxmodx_version.h>
-# include <amxmodx_version.h>
-#else
-# define SVN_VERSION "dev-local"
-#endif
 
 // Module info
 #define MODULE_NAME "SQLite"
-#define MODULE_VERSION SVN_VERSION
+#define MODULE_VERSION AMXX_VERSION
 #define MODULE_AUTHOR "AMX Mod X Dev Team"
 #define MODULE_URL "http://www.amxmodx.org/"
 #define MODULE_LOGTAG "SQLITE"

dlls/sqlite/version.rc

@@ -0,0 +1,101 @@
+// Microsoft Visual C++ generated resource script.
+//
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include <winresrc.h>
+#include <moduleconfig.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 AMXX_VERSION_FILE
+ PRODUCTVERSION AMXX_VERSION_FILE
+ 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", "AMX Mod X"
+            VALUE "FileDescription", "AMX Mod X"
+            VALUE "FileVersion", AMXX_VERSION
+            VALUE "InternalName", MODULE_LIBRARY
+            VALUE "LegalCopyright", "Copyright (c) AMX Mod X Dev Team"
+            VALUE "OriginalFilename", MODULE_LIBRARY "_amxx.dll"
+            VALUE "ProductName", MODULE_NAME
+            VALUE "ProductVersion", AMXX_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
+

dlls/tfcx/AMBuilder

@@ -14,4 +14,7 @@ binary.sources = [
   'moduleconfig.cpp',
 ]
 
+if builder.target_platform == 'windows':
+  binary.sources += ['version.rc']
+  
 AMXX.modules += [builder.Add(binary)]

dlls/tfcx/moduleconfig.h

@@ -15,15 +15,11 @@
 #ifndef __MODULECONFIG_H__
 #define __MODULECONFIG_H__
 
-#if defined AMBUILD
+#include <amxmodx_version.h>
-# include <amxmodx_version.h>
-#else
-# define SVN_VERSION "dev-local"
-#endif
 
 // Module info
 #define MODULE_NAME "TfcX"
-#define MODULE_VERSION SVN_VERSION
+#define MODULE_VERSION AMXX_VERSION
 #define MODULE_AUTHOR "AMX Mod X Dev Team"
 #define MODULE_URL "http://www.amxmodx.org"
 #define MODULE_LOGTAG "TFCX"

dlls/tfcx/version.rc

@@ -0,0 +1,101 @@
+// Microsoft Visual C++ generated resource script.
+//
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include <winresrc.h>
+#include <moduleconfig.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 AMXX_VERSION_FILE
+ PRODUCTVERSION AMXX_VERSION_FILE
+ 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", "AMX Mod X"
+            VALUE "FileDescription", "AMX Mod X"
+            VALUE "FileVersion", AMXX_VERSION
+            VALUE "InternalName", MODULE_LIBRARY
+            VALUE "LegalCopyright", "Copyright (c) AMX Mod X Dev Team"
+            VALUE "OriginalFilename", MODULE_LIBRARY "_amxx.dll"
+            VALUE "ProductName", MODULE_NAME
+            VALUE "ProductVersion", AMXX_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
+

dlls/ts/tsfun/AMBuilder

@@ -7,4 +7,7 @@ binary.sources = [
   '../../../public/sdk/amxxmodule.cpp',
 ]
 
+if builder.target_platform == 'windows':
+  binary.sources += ['version.rc']
+  
 AMXX.modules += [builder.Add(binary)]

dlls/ts/tsfun/moduleconfig.h

@@ -15,15 +15,11 @@
 #ifndef __MODULECONFIG_H__
 #define __MODULECONFIG_H__
 
-#if defined AMBUILD
+#include <amxmodx_version.h>
-# include <amxmodx_version.h>
-#else
-# define SVN_VERSION "dev-local"
-#endif
 
 // Module info
 #define MODULE_NAME "TSFun Wrapper"
-#define MODULE_VERSION SVN_VERSION
+#define MODULE_VERSION AMXX_VERSION
 #define MODULE_AUTHOR "AMX Mod X Dev Team"
 #define MODULE_URL "http://www.amxmodx.org"
 #define MODULE_LOGTAG "TSFUN"

dlls/ts/tsfun/version.rc

@@ -0,0 +1,101 @@
+// Microsoft Visual C++ generated resource script.
+//
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include <winresrc.h>
+#include <moduleconfig.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 AMXX_VERSION_FILE
+ PRODUCTVERSION AMXX_VERSION_FILE
+ 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", "AMX Mod X"
+            VALUE "FileDescription", "AMX Mod X"
+            VALUE "FileVersion", AMXX_VERSION
+            VALUE "InternalName", MODULE_LIBRARY
+            VALUE "LegalCopyright", "Copyright (c) AMX Mod X Dev Team"
+            VALUE "OriginalFilename", MODULE_LIBRARY "_amxx.dll"
+            VALUE "ProductName", MODULE_NAME
+            VALUE "ProductVersion", AMXX_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
+

dlls/ts/tsx/AMBuilder

@@ -14,4 +14,7 @@ binary.sources = [
   'usermsg.cpp',
 ]
 
+if builder.target_platform == 'windows':
+  binary.sources += ['version.rc']
+  
 AMXX.modules += [builder.Add(binary)]

dlls/ts/tsx/moduleconfig.h

@@ -15,15 +15,11 @@
 #ifndef __MODULECONFIG_H__
 #define __MODULECONFIG_H__
 
-#if defined AMBUILD
+#include <amxmodx_version.h>
-# include <amxmodx_version.h>
-#else
-# define SVN_VERSION "dev-local"
-#endif
 
 // Module info
 #define MODULE_NAME "TSX"
-#define MODULE_VERSION SVN_VERSION
+#define MODULE_VERSION AMXX_VERSION
 #define MODULE_AUTHOR "AMX Mod X Dev Team"
 #define MODULE_URL "http://www.amxmodx.org/"
 #define MODULE_LOGTAG "TSX"

dlls/ts/tsx/version.rc

@@ -0,0 +1,101 @@
+// Microsoft Visual C++ generated resource script.
+//
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include <winresrc.h>
+#include <moduleconfig.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 AMXX_VERSION_FILE
+ PRODUCTVERSION AMXX_VERSION_FILE
+ 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", "AMX Mod X"
+            VALUE "FileDescription", "AMX Mod X"
+            VALUE "FileVersion", AMXX_VERSION
+            VALUE "InternalName", MODULE_LIBRARY
+            VALUE "LegalCopyright", "Copyright (c) AMX Mod X Dev Team"
+            VALUE "OriginalFilename", MODULE_LIBRARY "_amxx.dll"
+            VALUE "ProductName", MODULE_NAME
+            VALUE "ProductVersion", AMXX_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
+

public/amxmodx_version.h

@@ -0,0 +1,42 @@
+#ifndef _INCLUDE_AMXX_VERSION_INFORMATION_H_
+#define _INCLUDE_AMXX_VERSION_INFORMATION_H_
+
+/**
+ * @file Contains AMX Mod X version information.
+ * @brief This file will redirect to an autogenerated version if being compiled via
+ * the build scripts.
+ */
+
+#if defined AMXX_GENERATED_BUILD
+	#if defined RC_COMPILE
+		#undef AMXX_USE_VERSIONLIB
+	#endif
+	#if defined AMXX_USE_VERSIONLIB
+		#include <versionlib.h>
+	#else 
+		#include <amxmodx_version_auto.h>
+	#endif
+#else
+	#define AMXX_BUILD_TAG        "manual"
+	#define AMXX_BUILD_LOCAL_REV  "0"
+	#define AMXX_BUILD_CSET       "0"
+	#define AMXX_BUILD_MAJOR      "1"
+	#define AMXX_BUILD_MINOR      "8"
+	#define AMXX_BUILD_RELEASE    "3"
+
+	#define AMXX_BUILD_UNIQUEID AMXX_BUILD_LOCAL_REV ":" AMXX_BUILD_CSET
+
+	#define AMXX_VERSION_STRING   AMXX_BUILD_MAJOR "." AMXX_BUILD_MINOR "." AMXX_BUILD_RELEASE "-" AMXX_BUILD_TAG
+	#define AMXX_VERSION_FILE     1,8,3,0
+#endif
+
+#define AMXX_BUILD_TIMESTAMP  __DATE__ " " __TIME__
+
+#if !defined(AMXX_GENERATED_BUILD) || !defined(AMXX_USE_VERSIONLIB)
+	#define AMXX_VERSION      AMXX_VERSION_STRING
+	#define AMXX_BUILD_ID     AMXX_BUILD_UNIQUEID
+	#define AMXX_BUILD_TIME   AMXX_BUILD_TIMESTAMP
+#endif
+
+#endif /* _INCLUDE_AMXX_VERSION_INFORMATION_H_ */
+

support/Versioning

@@ -13,7 +13,7 @@ argv = [
   os.path.join(builder.buildPath, 'includes'),
 ]
 outputs = [
-  os.path.join(builder.buildFolder, 'includes', 'amxmodx_version.h'),
+  os.path.join(builder.buildFolder, 'includes', 'amxmodx_version_auto.h'),
   os.path.join(builder.buildFolder, 'includes', 'amxmodx_version.inc'),
 ]
 

support/generate_headers.py

@@ -60,29 +60,27 @@ def output_version_headers():
   if tag != "":
     fullstring += "-{0}".format(tag)
     if tag == "dev":
-      fullstring += "+{0}".format(shorthash)
+      fullstring += "+{0}".format(count)
 
-  with open(os.path.join(OutputFolder, 'amxmodx_version.h'), 'w') as fp:
+  with open(os.path.join(OutputFolder, 'amxmodx_version_auto.h'), 'w') as fp:
     fp.write("""
 #ifndef _AMXMODX_AUTO_VERSION_INFORMATION_H_
 #define _AMXMODX_AUTO_VERSION_INFORMATION_H_
 
-#define SVN_VERSION_STRING  "{fullstring}"
+#define AMXX_BUILD_TAG        \"{0}\"
-#define SVN_VERSION_DWORD   {major}, {minor}, {release}, 0
+#define AMXX_BUILD_CSET       \"{1}\"
-#define SVN_VERSION_PRODUCT "{product}"
+#define AMXX_BUILD_MAJOR      \"{2}\"
-#define SVN_VERSION         SVN_VERSION_STRING
+#define AMXX_BUILD_MINOR      \"{3}\"
-#define SVN_BUILD_ID        "{count}:{longhash}"
+#define AMXX_BUILD_RELEASE    \"{4}\"
+#define AMXX_BUILD_LOCAL_REV  \"{6}\"
+
+#define AMXX_BUILD_UNIQUEID   "{6}:" AMXX_BUILD_CSET
+
+#define AMXX_VERSION_STRING   \"{5}\"
+#define AMXX_VERSION_FILE     {2},{3},{4},0
 
 #endif // _AMXMODX_AUTO_VERSION_INFORMATION_H_
-    """.format(
+    """.format(tag, shorthash, major, minor, release, fullstring, count))
-      fullstring = fullstring,
-      major = major,
-      minor = minor,
-      release = release,
-      product = product,
-      count = count,
-      longhash = longhash
-    ))
 
   version_num = int(major) * 100 + int(minor) * 10 + int(release)
   with open(os.path.join(OutputFolder, 'amxmodx_version.inc'), 'w') as fp:
@@ -92,13 +90,23 @@ def output_version_headers():
 #endif
 #define _amxmodx_version_included
 
-#define AMXX_VERSION        {major}.{minor}{release}
+#define AMXX_VERSION_TAG        \"{tag}\"
-#define AMXX_VERSION_NUM    {version_num}
+#define AMXX_VERSION_CSET       \"{shorthash}\"
+#define AMXX_VERSION_MAJOR      \"{major}\"
+#define AMXX_VERSION_MINOR      \"{minor}\"
+#define AMXX_VERSION_RELEASE    \"{release}\"
+#define AMXX_VERSION_LOCAL_REV  \"{count}\"
+#define AMXX_VERSION            {major}.{minor}{release}
+#define AMXX_VERSION_NUM        {version_num}
+
 stock const AMXX_VERSION_STR[] = "{fullstring}";
     """.format(
+      tag = tag,
+      shorthash = shorthash,
       major = major,
       minor = minor,
       release = release,
+      count = count,
       version_num = version_num,
       fullstring = fullstring
     ))

support/versionlib/AMBuilder

@@ -0,0 +1,15 @@
+# vim: sts=2 ts=8 sw=2 tw=99 et ft=python:
+import os
+
+lib = builder.compiler.StaticLibrary('version')
+lib.compiler.includes += [
+  os.path.join(builder.sourcePath, 'public'),
+]
+lib.compiler.defines.remove('AMXX_USE_VERSIONLIB')
+lib.compiler.sourcedeps += AMXX.generated_headers
+lib.sources += [
+  'versionlib.cpp'
+]
+task = builder.Add(lib)
+
+rvalue = task.binary

support/versionlib/versionlib.cpp

@@ -0,0 +1,8 @@
+
+#include <amxmodx_version.h>
+#include <versionlib.h>
+
+const char *AMXX_LOCAL_REV  = AMXX_BUILD_LOCAL_REV;
+const char *AMXX_SHA        = AMXX_BUILD_CSET;
+const char *AMXX_VERSION    = AMXX_VERSION_STRING;
+const char *AMXX_BUILD_TIME = __DATE__ " " __TIME__;

support/versionlib/versionlib.h

@@ -0,0 +1,24 @@
+#ifndef _INCLUDE_AMXX_VERSIONLIB_H_
+#define _INCLUDE_AMXX_VERSIONLIB_H_
+
+#if !defined(AMXX_USE_VERSIONLIB)
+// These get defined in amxmodx_version.h since
+// versionlib does not use versionlib.
+    #undef AMXX_LOCAL_REV
+    #undef AMXX_CSET
+    #undef AMXX_VERSION
+    #undef AMXX_BUILD_TIME
+#endif
+
+#ifdef __cplusplus
+    #define EXTERN_C extern "C"
+#else
+    #define EXTERN_C extern
+#endif
+
+EXTERN_C const char *AMXX_LOCAL_REV;
+EXTERN_C const char *AMXX_SHA;
+EXTERN_C const char *AMXX_VERSION;
+EXTERN_C const char *AMXX_BUILD_TIME;
+
+#endif // _INCLUDE_AMXX_VERSIONLIB_H_