Merge.
1.1 --- a/AMBuildScript Sun Aug 26 23:33:11 2012 -0400
1.2 +++ b/AMBuildScript Sun Aug 26 23:35:18 2012 -0400
1.3 @@ -30,7 +30,7 @@
1.4 self.possibleSdks['eye'] = {'sdk': 'HL2SDK-EYE', 'ext': '2.eye', 'def': '5',
1.5 'name': 'EYE', 'platform': ['windows']}
1.6 self.possibleSdks['csgo'] = {'sdk': 'HL2SDKCSGO', 'ext': '2.csgo', 'def': '12',
1.7 - 'name': 'CSGO', 'platform': ['windows', 'linux']}
1.8 + 'name': 'CSGO', 'platform': ['windows', 'linux', 'darwin']}
1.9 # self.possibleSdks['portal2'] = {'sdk': 'HL2SDK-PORTAL2', 'ext': '2.portal2', 'def': '11',
1.10 # 'name': 'PORTAL2', 'platform': ['windows']}
1.11
1.12 @@ -46,13 +46,13 @@
1.13 'HL2SDKOBVALVE': 'hl2sdk-ob-valve',
1.14 'HL2SDKL4D': 'hl2sdk-l4d',
1.15 'HL2SDKL4D2': 'hl2sdk-l4d2',
1.16 + 'HL2SDKCSGO': 'hl2sdk-csgo',
1.17 'MYSQL5': 'mysql-5.0'
1.18 }
1.19
1.20 if AMBuild.target['platform'] != 'darwin':
1.21 envvars['HL2SDK'] = 'hl2sdk'
1.22 envvars['HL2SDKOB'] = 'hl2sdk-ob'
1.23 - envvars['HL2SDKCSGO'] = 'hl2sdk-csgo'
1.24
1.25 #Dark Messiah is Windows-only
1.26 if AMBuild.target['platform'] == 'windows':
1.27 @@ -195,6 +195,8 @@
1.28 if self.vendor == 'clang':
1.29 self.compiler.AddToListVar('POSTLINKFLAGS', '-lgcc_eh')
1.30 elif AMBuild.target['platform'] == 'darwin':
1.31 + self.compiler.AddToListVar('CDEFINES', 'OSX')
1.32 + self.compiler.AddToListVar('CDEFINES', '_OSX')
1.33 self.compiler.AddToListVar('POSTLINKFLAGS', '-mmacosx-version-min=10.5')
1.34 self.compiler.AddToListVar('POSTLINKFLAGS', ['-arch', 'i386'])
1.35 self.compiler.AddToListVar('POSTLINKFLAGS', '-lstdc++')
2.1 --- a/core/CoreConfig.cpp Sun Aug 26 23:33:11 2012 -0400
2.2 +++ b/core/CoreConfig.cpp Sun Aug 26 23:35:18 2012 -0400
2.3 @@ -395,7 +395,7 @@
2.4 FILE *fp = fopen(file, "wt");
2.5 if (fp)
2.6 {
2.7 - fprintf(fp, "// This file was auto-generated by SourceMod (v%s)\n", SM_FULL_VERSION);
2.8 + fprintf(fp, "// This file was auto-generated by SourceMod (v%s)\n", SM_VERSION_STRING);
2.9 fprintf(fp, "// ConVars for plugin \"%s\"\n", pl->GetFilename());
2.10 fprintf(fp, "\n\n");
2.11
3.1 --- a/core/Logger.cpp Sun Aug 26 23:33:11 2012 -0400
3.2 +++ b/core/Logger.cpp Sun Aug 26 23:35:18 2012 -0400
3.3 @@ -149,7 +149,7 @@
3.4 } else {
3.5 char date[32];
3.6 strftime(date, sizeof(date), "%m/%d/%Y - %H:%M:%S", curtime);
3.7 - fprintf(fp, "L %s: SourceMod log file started (file \"L%02d%02d%03d.log\") (Version \"%s\")\n", date, curtime->tm_mon + 1, curtime->tm_mday, i, SM_FULL_VERSION);
3.8 + fprintf(fp, "L %s: SourceMod log file started (file \"L%02d%02d%03d.log\") (Version \"%s\")\n", date, curtime->tm_mon + 1, curtime->tm_mday, i, SM_VERSION_STRING);
3.9 fclose(fp);
3.10 }
3.11 }
3.12 @@ -362,7 +362,7 @@
3.13 char date[32];
3.14 m_DailyPrintHdr = false;
3.15 strftime(date, sizeof(date), "%m/%d/%Y - %H:%M:%S", curtime);
3.16 - fprintf(fp, "L %s: SourceMod log file session started (file \"L%04d%02d%02d.log\") (Version \"%s\")\n", date, curtime->tm_year + 1900, curtime->tm_mon + 1, curtime->tm_mday, SM_FULL_VERSION);
3.17 + fprintf(fp, "L %s: SourceMod log file session started (file \"L%04d%02d%02d.log\") (Version \"%s\")\n", date, curtime->tm_year + 1900, curtime->tm_mon + 1, curtime->tm_mday, SM_VERSION_STRING);
3.18 }
3.19 va_list ap;
3.20 va_start(ap, vafmt);
4.1 --- a/core/PlayerManager.cpp Sun Aug 26 23:33:11 2012 -0400
4.2 +++ b/core/PlayerManager.cpp Sun Aug 26 23:35:18 2012 -0400
4.3 @@ -793,7 +793,7 @@
4.4 }
4.5
4.6 ClientConsolePrint(pEntity,
4.7 - "SourceMod %s, by AlliedModders LLC", SM_FULL_VERSION);
4.8 + "SourceMod %s, by AlliedModders LLC", SM_VERSION_STRING);
4.9 ClientConsolePrint(pEntity,
4.10 "To see running plugins, type \"sm plugins\"");
4.11 ClientConsolePrint(pEntity,
5.1 --- a/core/logic/AMBuilder Sun Aug 26 23:33:11 2012 -0400
5.2 +++ b/core/logic/AMBuilder Sun Aug 26 23:35:18 2012 -0400
5.3 @@ -13,6 +13,7 @@
5.4 if AMBuild.target['platform'] == 'linux':
5.5 compiler['POSTLINKFLAGS'].append('-lpthread')
5.6 if AMBuild.target['platform'] == 'darwin':
5.7 + compiler['CFLAGS'].extend(['-Wno-deprecated-declarations'])
5.8 compiler['POSTLINKFLAGS'].extend(['-framework', 'CoreServices'])
5.9
5.10 extension = AMBuild.AddJob('sourcemod.logic')
6.1 --- a/core/logic/version.rc Sun Aug 26 23:33:11 2012 -0400
6.2 +++ b/core/logic/version.rc Sun Aug 26 23:35:18 2012 -0400
6.3 @@ -29,8 +29,8 @@
6.4 //
6.5
6.6 VS_VERSION_INFO VERSIONINFO
6.7 - FILEVERSION SM_FILE_VERSION
6.8 - PRODUCTVERSION SM_FILE_VERSION
6.9 + FILEVERSION SM_VERSION_FILE
6.10 + PRODUCTVERSION SM_VERSION_FILE
6.11 FILEFLAGSMASK 0x17L
6.12 #ifdef _DEBUG
6.13 FILEFLAGS 0x1L
6.14 @@ -47,12 +47,12 @@
6.15 BEGIN
6.16 VALUE "Comments", "SourceMod"
6.17 VALUE "FileDescription", "SourceMod Core Logic"
6.18 - VALUE "FileVersion", SM_FULL_VERSION
6.19 + VALUE "FileVersion", SM_VERSION_STRING
6.20 VALUE "InternalName", "sourcemod"
6.21 VALUE "LegalCopyright", "Copyright (c) 2004-2009, AlliedModders LLC"
6.22 VALUE "OriginalFilename", "sourcemod.logic.dll"
6.23 VALUE "ProductName", "SourceMod"
6.24 - VALUE "ProductVersion", SM_FULL_VERSION
6.25 + VALUE "ProductVersion", SM_VERSION_STRING
6.26 END
6.27 END
6.28 BLOCK "VarFileInfo"
7.1 --- a/core/sm_srvcmds.cpp Sun Aug 26 23:33:11 2012 -0400
7.2 +++ b/core/sm_srvcmds.cpp Sun Aug 26 23:35:18 2012 -0400
7.3 @@ -39,7 +39,7 @@
7.4
7.5 RootConsoleMenu g_RootMenu;
7.6
7.7 -ConVar sourcemod_version("sourcemod_version", SM_FULL_VERSION, FCVAR_SPONLY|FCVAR_REPLICATED|FCVAR_NOTIFY, "SourceMod Version");
7.8 +ConVar sourcemod_version("sourcemod_version", SM_VERSION_STRING, FCVAR_SPONLY|FCVAR_REPLICATED|FCVAR_NOTIFY, "SourceMod Version");
7.9
7.10 RootConsoleMenu::RootConsoleMenu()
7.11 {
7.12 @@ -339,7 +339,7 @@
7.13 else if (strcmp(cmdname, "version") == 0)
7.14 {
7.15 ConsolePrint(" SourceMod Version Information:");
7.16 - ConsolePrint(" SourceMod Version: %s", SM_FULL_VERSION);
7.17 + ConsolePrint(" SourceMod Version: %s", SM_VERSION_STRING);
7.18 ConsolePrint(" SourcePawn Engine: %s (build %s)", g_pSourcePawn2->GetEngineName(), g_pSourcePawn2->GetVersionString());
7.19 ConsolePrint(" SourcePawn API: v1 = %d, v2 = %d", g_pSourcePawn->GetEngineAPIVersion(), g_pSourcePawn2->GetAPIVersion());
7.20 ConsolePrint(" Compiled on: %s %s", __DATE__, __TIME__);
8.1 --- a/core/sourcemm_api.cpp Sun Aug 26 23:33:11 2012 -0400
8.2 +++ b/core/sourcemm_api.cpp Sun Aug 26 23:35:18 2012 -0400
8.3 @@ -145,7 +145,7 @@
8.4
8.5 const char *SourceMod_Core::GetVersion()
8.6 {
8.7 - return SM_FULL_VERSION;
8.8 + return SM_VERSION_STRING;
8.9 }
8.10
8.11 const char *SourceMod_Core::GetDate()
9.1 --- a/core/version.rc Sun Aug 26 23:33:11 2012 -0400
9.2 +++ b/core/version.rc Sun Aug 26 23:35:18 2012 -0400
9.3 @@ -29,8 +29,8 @@
9.4 //
9.5
9.6 VS_VERSION_INFO VERSIONINFO
9.7 - FILEVERSION SM_FILE_VERSION
9.8 - PRODUCTVERSION SM_FILE_VERSION
9.9 + FILEVERSION SM_VERSION_FILE
9.10 + PRODUCTVERSION SM_VERSION_FILE
9.11 FILEFLAGSMASK 0x17L
9.12 #ifdef _DEBUG
9.13 FILEFLAGS 0x1L
9.14 @@ -47,12 +47,12 @@
9.15 BEGIN
9.16 VALUE "Comments", "SourceMod"
9.17 VALUE "FileDescription", "SourceMod Core"
9.18 - VALUE "FileVersion", SM_FULL_VERSION
9.19 + VALUE "FileVersion", SM_VERSION_STRING
9.20 VALUE "InternalName", "sourcemod"
9.21 VALUE "LegalCopyright", "Copyright (c) 2004-2008, AlliedModders LLC"
9.22 VALUE "OriginalFilename", BINARY_NAME
9.23 VALUE "ProductName", "SourceMod"
9.24 - VALUE "ProductVersion", SM_FULL_VERSION
9.25 + VALUE "ProductVersion", SM_VERSION_STRING
9.26 END
9.27 END
9.28 BLOCK "VarFileInfo"
10.1 --- a/extensions/bintools/extension.cpp Sun Aug 26 23:33:11 2012 -0400
10.2 +++ b/extensions/bintools/extension.cpp Sun Aug 26 23:35:18 2012 -0400
10.3 @@ -61,7 +61,7 @@
10.4
10.5 const char *BinTools::GetExtensionVerString()
10.6 {
10.7 - return SM_FULL_VERSION;
10.8 + return SM_VERSION_STRING;
10.9 }
10.10
10.11 const char *BinTools::GetExtensionDateString()
11.1 --- a/extensions/bintools/version.rc Sun Aug 26 23:33:11 2012 -0400
11.2 +++ b/extensions/bintools/version.rc Sun Aug 26 23:35:18 2012 -0400
11.3 @@ -29,8 +29,8 @@
11.4 //
11.5
11.6 VS_VERSION_INFO VERSIONINFO
11.7 - FILEVERSION SM_FILE_VERSION
11.8 - PRODUCTVERSION SM_FILE_VERSION
11.9 + FILEVERSION SM_VERSION_FILE
11.10 + PRODUCTVERSION SM_VERSION_FILE
11.11 FILEFLAGSMASK 0x17L
11.12 #ifdef _DEBUG
11.13 FILEFLAGS 0x1L
11.14 @@ -47,12 +47,12 @@
11.15 BEGIN
11.16 VALUE "Comments", "BinTools Extension"
11.17 VALUE "FileDescription", "SourceMod BinTools Extension"
11.18 - VALUE "FileVersion", SM_FULL_VERSION
11.19 + VALUE "FileVersion", SM_VERSION_STRING
11.20 VALUE "InternalName", "SourceMod BinTools Extension"
11.21 VALUE "LegalCopyright", "Copyright (c) 2004-2008, AlliedModders LLC"
11.22 VALUE "OriginalFilename", BINARY_NAME
11.23 VALUE "ProductName", "SourceMod BinTools Extension"
11.24 - VALUE "ProductVersion", SM_FULL_VERSION
11.25 + VALUE "ProductVersion", SM_VERSION_STRING
11.26 END
11.27 END
11.28 BLOCK "VarFileInfo"
12.1 --- a/extensions/clientprefs/extension.cpp Sun Aug 26 23:33:11 2012 -0400
12.2 +++ b/extensions/clientprefs/extension.cpp Sun Aug 26 23:35:18 2012 -0400
12.3 @@ -485,7 +485,7 @@
12.4
12.5 const char *ClientPrefs::GetExtensionVerString()
12.6 {
12.7 - return SM_FULL_VERSION;
12.8 + return SM_VERSION_STRING;
12.9 }
12.10
12.11 const char *ClientPrefs::GetExtensionDateString()
13.1 --- a/extensions/clientprefs/version.rc Sun Aug 26 23:33:11 2012 -0400
13.2 +++ b/extensions/clientprefs/version.rc Sun Aug 26 23:35:18 2012 -0400
13.3 @@ -29,8 +29,8 @@
13.4 //
13.5
13.6 VS_VERSION_INFO VERSIONINFO
13.7 - FILEVERSION SM_FILE_VERSION
13.8 - PRODUCTVERSION SM_FILE_VERSION
13.9 + FILEVERSION SM_VERSION_FILE
13.10 + PRODUCTVERSION SM_VERSION_FILE
13.11 FILEFLAGSMASK 0x17L
13.12 #ifdef _DEBUG
13.13 FILEFLAGS 0x1L
13.14 @@ -47,12 +47,12 @@
13.15 BEGIN
13.16 VALUE "Comments", "Client Preferences Extension"
13.17 VALUE "FileDescription", "SourceMod Client Preferences Extension"
13.18 - VALUE "FileVersion", SM_FULL_VERSION
13.19 + VALUE "FileVersion", SM_VERSION_STRING
13.20 VALUE "InternalName", "SourceMod Client Preferences Extension"
13.21 VALUE "LegalCopyright", "Copyright (c) 2004-2008, AlliedModders LLC"
13.22 VALUE "OriginalFilename", BINARY_NAME
13.23 VALUE "ProductName", "SourceMod Client Preferences Extension"
13.24 - VALUE "ProductVersion", SM_FULL_VERSION
13.25 + VALUE "ProductVersion", SM_VERSION_STRING
13.26 END
13.27 END
13.28 BLOCK "VarFileInfo"
14.1 --- a/extensions/cstrike/CDetour/detourhelpers.h Sun Aug 26 23:33:11 2012 -0400
14.2 +++ b/extensions/cstrike/CDetour/detourhelpers.h Sun Aug 26 23:35:18 2012 -0400
14.3 @@ -34,7 +34,9 @@
14.4
14.5 #if defined PLATFORM_POSIX
14.6 #include <sys/mman.h>
14.7 +#ifndef PAGE_SIZE
14.8 #define PAGE_SIZE 4096
14.9 +#endif
14.10 #define ALIGN(ar) ((long)ar & ~(PAGE_SIZE-1))
14.11 #define PAGE_EXECUTE_READWRITE PROT_READ|PROT_WRITE|PROT_EXEC
14.12 #endif
15.1 --- a/extensions/cstrike/extension.cpp Sun Aug 26 23:33:11 2012 -0400
15.2 +++ b/extensions/cstrike/extension.cpp Sun Aug 26 23:35:18 2012 -0400
15.3 @@ -283,7 +283,7 @@
15.4
15.5 const char *CStrike::GetExtensionVerString()
15.6 {
15.7 - return SM_FULL_VERSION;
15.8 + return SM_VERSION_STRING;
15.9 }
15.10
15.11 const char *CStrike::GetExtensionDateString()
16.1 --- a/extensions/cstrike/version.rc Sun Aug 26 23:33:11 2012 -0400
16.2 +++ b/extensions/cstrike/version.rc Sun Aug 26 23:35:18 2012 -0400
16.3 @@ -29,8 +29,8 @@
16.4 //
16.5
16.6 VS_VERSION_INFO VERSIONINFO
16.7 - FILEVERSION SM_FILE_VERSION
16.8 - PRODUCTVERSION SM_FILE_VERSION
16.9 + FILEVERSION SM_VERSION_FILE
16.10 + PRODUCTVERSION SM_VERSION_FILE
16.11 FILEFLAGSMASK 0x17L
16.12 #ifdef _DEBUG
16.13 FILEFLAGS 0x1L
16.14 @@ -47,12 +47,12 @@
16.15 BEGIN
16.16 VALUE "Comments", "SourceMod CS:S Extension"
16.17 VALUE "FileDescription", "SourceMod CS:S Extension"
16.18 - VALUE "FileVersion", SM_FULL_VERSION
16.19 + VALUE "FileVersion", SM_VERSION_STRING
16.20 VALUE "InternalName", "SourceMod CS:S Extension"
16.21 VALUE "LegalCopyright", "Copyright (c) 2004-2008, AlliedModders LLC"
16.22 VALUE "OriginalFilename", BINARY_NAME
16.23 VALUE "ProductName", "SourceMod CS:S Extension"
16.24 - VALUE "ProductVersion", SM_FULL_VERSION
16.25 + VALUE "ProductVersion", SM_VERSION_STRING
16.26 END
16.27 END
16.28 BLOCK "VarFileInfo"
17.1 --- a/extensions/curl/extension.cpp Sun Aug 26 23:33:11 2012 -0400
17.2 +++ b/extensions/curl/extension.cpp Sun Aug 26 23:35:18 2012 -0400
17.3 @@ -78,7 +78,7 @@
17.4
17.5 const char *CurlExt::GetExtensionVerString()
17.6 {
17.7 - return SM_FULL_VERSION;
17.8 + return SM_VERSION_STRING;
17.9 }
17.10
17.11 const char *CurlExt::GetExtensionDateString()
18.1 --- a/extensions/curl/version.rc Sun Aug 26 23:33:11 2012 -0400
18.2 +++ b/extensions/curl/version.rc Sun Aug 26 23:35:18 2012 -0400
18.3 @@ -29,8 +29,8 @@
18.4 //
18.5
18.6 VS_VERSION_INFO VERSIONINFO
18.7 - FILEVERSION SM_FILE_VERSION
18.8 - PRODUCTVERSION SM_FILE_VERSION
18.9 + FILEVERSION SM_VERSION_FILE
18.10 + PRODUCTVERSION SM_VERSION_FILE
18.11 FILEFLAGSMASK 0x17L
18.12 #ifdef _DEBUG
18.13 FILEFLAGS 0x1L
18.14 @@ -47,12 +47,12 @@
18.15 BEGIN
18.16 VALUE "Comments", "Webternet Extension"
18.17 VALUE "FileDescription", "SourceMod Webternet Extension"
18.18 - VALUE "FileVersion", SM_FULL_VERSION
18.19 + VALUE "FileVersion", SM_VERSION_STRING
18.20 VALUE "InternalName", "SourceMod Webternet Extension"
18.21 VALUE "LegalCopyright", "Copyright (c) 2004-2009, AlliedModders LLC"
18.22 VALUE "OriginalFilename", BINARY_NAME
18.23 VALUE "ProductName", "SourceMod Webternet Extension"
18.24 - VALUE "ProductVersion", SM_FULL_VERSION
18.25 + VALUE "ProductVersion", SM_VERSION_STRING
18.26 END
18.27 END
18.28 BLOCK "VarFileInfo"
19.1 --- a/extensions/geoip/extension.cpp Sun Aug 26 23:33:11 2012 -0400
19.2 +++ b/extensions/geoip/extension.cpp Sun Aug 26 23:35:18 2012 -0400
19.3 @@ -70,7 +70,7 @@
19.4
19.5 const char *GeoIP_Extension::GetExtensionVerString()
19.6 {
19.7 - return SM_FULL_VERSION;
19.8 + return SM_VERSION_STRING;
19.9 }
19.10
19.11 const char *GeoIP_Extension::GetExtensionDateString()
20.1 --- a/extensions/geoip/version.rc Sun Aug 26 23:33:11 2012 -0400
20.2 +++ b/extensions/geoip/version.rc Sun Aug 26 23:35:18 2012 -0400
20.3 @@ -29,8 +29,8 @@
20.4 //
20.5
20.6 VS_VERSION_INFO VERSIONINFO
20.7 - FILEVERSION SM_FILE_VERSION
20.8 - PRODUCTVERSION SM_FILE_VERSION
20.9 + FILEVERSION SM_VERSION_FILE
20.10 + PRODUCTVERSION SM_VERSION_FILE
20.11 FILEFLAGSMASK 0x17L
20.12 #ifdef _DEBUG
20.13 FILEFLAGS 0x1L
20.14 @@ -47,12 +47,12 @@
20.15 BEGIN
20.16 VALUE "Comments", "GeoIP Extension"
20.17 VALUE "FileDescription", "SourceMod GeoIP Extension"
20.18 - VALUE "FileVersion", SM_FULL_VERSION
20.19 + VALUE "FileVersion", SM_VERSION_STRING
20.20 VALUE "InternalName", "SourceMod GeoIP Extension"
20.21 VALUE "LegalCopyright", "Copyright (c) 2004-2008, AlliedModders LLC"
20.22 VALUE "OriginalFilename", BINARY_NAME
20.23 VALUE "ProductName", "SourceMod GeoIP Extension"
20.24 - VALUE "ProductVersion", SM_FULL_VERSION
20.25 + VALUE "ProductVersion", SM_VERSION_STRING
20.26 END
20.27 END
20.28 BLOCK "VarFileInfo"
21.1 --- a/extensions/mysql/extension.cpp Sun Aug 26 23:33:11 2012 -0400
21.2 +++ b/extensions/mysql/extension.cpp Sun Aug 26 23:35:18 2012 -0400
21.3 @@ -62,7 +62,7 @@
21.4
21.5 const char *DBI_MySQL::GetExtensionVerString()
21.6 {
21.7 - return SM_FULL_VERSION;
21.8 + return SM_VERSION_STRING;
21.9 }
21.10
21.11 const char *DBI_MySQL::GetExtensionDateString()
22.1 --- a/extensions/mysql/version.rc Sun Aug 26 23:33:11 2012 -0400
22.2 +++ b/extensions/mysql/version.rc Sun Aug 26 23:35:18 2012 -0400
22.3 @@ -29,8 +29,8 @@
22.4 //
22.5
22.6 VS_VERSION_INFO VERSIONINFO
22.7 - FILEVERSION SM_FILE_VERSION
22.8 - PRODUCTVERSION SM_FILE_VERSION
22.9 + FILEVERSION SM_VERSION_FILE
22.10 + PRODUCTVERSION SM_VERSION_FILE
22.11 FILEFLAGSMASK 0x17L
22.12 #ifdef _DEBUG
22.13 FILEFLAGS 0x1L
22.14 @@ -47,12 +47,12 @@
22.15 BEGIN
22.16 VALUE "Comments", "MySQL Extension"
22.17 VALUE "FileDescription", "SourceMod MySQL Extension"
22.18 - VALUE "FileVersion", SM_FULL_VERSION
22.19 + VALUE "FileVersion", SM_VERSION_STRING
22.20 VALUE "InternalName", "SourceMod MySQL Extension"
22.21 VALUE "LegalCopyright", "Copyright (c) 2004-2008, AlliedModders LLC"
22.22 VALUE "OriginalFilename", BINARY_NAME
22.23 VALUE "ProductName", "SourceMod MySQL Extension"
22.24 - VALUE "ProductVersion", SM_FULL_VERSION
22.25 + VALUE "ProductVersion", SM_VERSION_STRING
22.26 END
22.27 END
22.28 BLOCK "VarFileInfo"
23.1 --- a/extensions/regex/extension.cpp Sun Aug 26 23:33:11 2012 -0400
23.2 +++ b/extensions/regex/extension.cpp Sun Aug 26 23:35:18 2012 -0400
23.3 @@ -65,7 +65,7 @@
23.4
23.5 const char *RegexExtension::GetExtensionVerString()
23.6 {
23.7 - return SM_FULL_VERSION;
23.8 + return SM_VERSION_STRING;
23.9 }
23.10
23.11 const char *RegexExtension::GetExtensionDateString()
24.1 --- a/extensions/regex/version.rc Sun Aug 26 23:33:11 2012 -0400
24.2 +++ b/extensions/regex/version.rc Sun Aug 26 23:35:18 2012 -0400
24.3 @@ -29,8 +29,8 @@
24.4 //
24.5
24.6 VS_VERSION_INFO VERSIONINFO
24.7 - FILEVERSION SM_FILE_VERSION
24.8 - PRODUCTVERSION SM_FILE_VERSION
24.9 + FILEVERSION SM_VERSION_FILE
24.10 + PRODUCTVERSION SM_VERSION_FILE
24.11 FILEFLAGSMASK 0x17L
24.12 #ifdef _DEBUG
24.13 FILEFLAGS 0x1L
24.14 @@ -47,12 +47,12 @@
24.15 BEGIN
24.16 VALUE "Comments", "SourceMod Regular Expression Extension"
24.17 VALUE "FileDescription", "SourceMod Regular Expression Extension"
24.18 - VALUE "FileVersion", SM_FULL_VERSION
24.19 + VALUE "FileVersion", SM_VERSION_STRING
24.20 VALUE "InternalName", "SourceMod Regular Expression Extension"
24.21 VALUE "LegalCopyright", "Copyright (c) 2004-2008, AlliedModders LLC"
24.22 VALUE "OriginalFilename", BINARY_NAME
24.23 VALUE "ProductName", "SourceMod Regular Expression Extension"
24.24 - VALUE "ProductVersion", SM_FULL_VERSION
24.25 + VALUE "ProductVersion", SM_VERSION_STRING
24.26 END
24.27 END
24.28 BLOCK "VarFileInfo"
25.1 --- a/extensions/sdktools/CDetour/detourhelpers.h Sun Aug 26 23:33:11 2012 -0400
25.2 +++ b/extensions/sdktools/CDetour/detourhelpers.h Sun Aug 26 23:35:18 2012 -0400
25.3 @@ -34,7 +34,9 @@
25.4
25.5 #if defined PLATFORM_POSIX
25.6 #include <sys/mman.h>
25.7 +#ifndef PAGE_SIZE
25.8 #define PAGE_SIZE 4096
25.9 +#endif
25.10 #define ALIGN(ar) ((long)ar & ~(PAGE_SIZE-1))
25.11 #define PAGE_EXECUTE_READWRITE PROT_READ|PROT_WRITE|PROT_EXEC
25.12 #endif
26.1 --- a/extensions/sdktools/extension.cpp Sun Aug 26 23:33:11 2012 -0400
26.2 +++ b/extensions/sdktools/extension.cpp Sun Aug 26 23:35:18 2012 -0400
26.3 @@ -428,7 +428,7 @@
26.4
26.5 const char *SDKTools::GetExtensionVerString()
26.6 {
26.7 - return SM_FULL_VERSION;
26.8 + return SM_VERSION_STRING;
26.9 }
26.10
26.11 const char *SDKTools::GetExtensionDateString()
27.1 --- a/extensions/sdktools/version.rc Sun Aug 26 23:33:11 2012 -0400
27.2 +++ b/extensions/sdktools/version.rc Sun Aug 26 23:35:18 2012 -0400
27.3 @@ -29,8 +29,8 @@
27.4 //
27.5
27.6 VS_VERSION_INFO VERSIONINFO
27.7 - FILEVERSION SM_FILE_VERSION
27.8 - PRODUCTVERSION SM_FILE_VERSION
27.9 + FILEVERSION SM_VERSION_FILE
27.10 + PRODUCTVERSION SM_VERSION_FILE
27.11 FILEFLAGSMASK 0x17L
27.12 #ifdef _DEBUG
27.13 FILEFLAGS 0x1L
27.14 @@ -47,12 +47,12 @@
27.15 BEGIN
27.16 VALUE "Comments", "SDKTools Extension"
27.17 VALUE "FileDescription", "SourceMod SDKTools Extension"
27.18 - VALUE "FileVersion", SM_FULL_VERSION
27.19 + VALUE "FileVersion", SM_VERSION_STRING
27.20 VALUE "InternalName", "SourceMod SDKTools Extension"
27.21 VALUE "LegalCopyright", "Copyright (c) 2004-2008, AlliedModders LLC"
27.22 VALUE "OriginalFilename", BINARY_NAME
27.23 VALUE "ProductName", "SourceMod SDKTools Extension"
27.24 - VALUE "ProductVersion", SM_FULL_VERSION
27.25 + VALUE "ProductVersion", SM_VERSION_STRING
27.26 END
27.27 END
27.28 BLOCK "VarFileInfo"
28.1 --- a/extensions/sqlite/extension.cpp Sun Aug 26 23:33:11 2012 -0400
28.2 +++ b/extensions/sqlite/extension.cpp Sun Aug 26 23:35:18 2012 -0400
28.3 @@ -74,7 +74,7 @@
28.4
28.5 const char *SqliteExt::GetExtensionVerString()
28.6 {
28.7 - return SM_FULL_VERSION;
28.8 + return SM_VERSION_STRING;
28.9 }
28.10
28.11 const char *SqliteExt::GetExtensionDateString()
29.1 --- a/extensions/sqlite/version.rc Sun Aug 26 23:33:11 2012 -0400
29.2 +++ b/extensions/sqlite/version.rc Sun Aug 26 23:35:18 2012 -0400
29.3 @@ -29,8 +29,8 @@
29.4 //
29.5
29.6 VS_VERSION_INFO VERSIONINFO
29.7 - FILEVERSION SM_FILE_VERSION
29.8 - PRODUCTVERSION SM_FILE_VERSION
29.9 + FILEVERSION SM_VERSION_FILE
29.10 + PRODUCTVERSION SM_VERSION_FILE
29.11 FILEFLAGSMASK 0x17L
29.12 #ifdef _DEBUG
29.13 FILEFLAGS 0x1L
29.14 @@ -47,12 +47,12 @@
29.15 BEGIN
29.16 VALUE "Comments", "SQLite Extension"
29.17 VALUE "FileDescription", "SourceMod SQLite Extension"
29.18 - VALUE "FileVersion", SM_FULL_VERSION
29.19 + VALUE "FileVersion", SM_VERSION_STRING
29.20 VALUE "InternalName", "SourceMod SQLite Extension"
29.21 VALUE "LegalCopyright", "Copyright (c) 2004-2008, AlliedModders LLC"
29.22 VALUE "OriginalFilename", BINARY_NAME
29.23 VALUE "ProductName", "SourceMod SQLite Extension"
29.24 - VALUE "ProductVersion", SM_FULL_VERSION
29.25 + VALUE "ProductVersion", SM_VERSION_STRING
29.26 END
29.27 END
29.28 BLOCK "VarFileInfo"
30.1 --- a/extensions/tf2/extension.cpp Sun Aug 26 23:33:11 2012 -0400
30.2 +++ b/extensions/tf2/extension.cpp Sun Aug 26 23:35:18 2012 -0400
30.3 @@ -133,7 +133,7 @@
30.4
30.5 const char *TF2Tools::GetExtensionVerString()
30.6 {
30.7 - return SM_FULL_VERSION;
30.8 + return SM_VERSION_STRING;
30.9 }
30.10
30.11 const char *TF2Tools::GetExtensionDateString()
31.1 --- a/extensions/tf2/version.rc Sun Aug 26 23:33:11 2012 -0400
31.2 +++ b/extensions/tf2/version.rc Sun Aug 26 23:35:18 2012 -0400
31.3 @@ -29,8 +29,8 @@
31.4 //
31.5
31.6 VS_VERSION_INFO VERSIONINFO
31.7 - FILEVERSION SM_FILE_VERSION
31.8 - PRODUCTVERSION SM_FILE_VERSION
31.9 + FILEVERSION SM_VERSION_FILE
31.10 + PRODUCTVERSION SM_VERSION_FILE
31.11 FILEFLAGSMASK 0x17L
31.12 #ifdef _DEBUG
31.13 FILEFLAGS 0x1L
31.14 @@ -47,12 +47,12 @@
31.15 BEGIN
31.16 VALUE "Comments", "SourceMod TF2 Extension"
31.17 VALUE "FileDescription", "SourceMod TF2 Extension"
31.18 - VALUE "FileVersion", SM_FULL_VERSION
31.19 + VALUE "FileVersion", SM_VERSION_STRING
31.20 VALUE "InternalName", "SourceMod TF2 Extension"
31.21 VALUE "LegalCopyright", "Copyright (c) 2004-2008, AlliedModders LLC"
31.22 VALUE "OriginalFilename", BINARY_NAME
31.23 VALUE "ProductName", "SourceMod TF2 Extension"
31.24 - VALUE "ProductVersion", SM_FULL_VERSION
31.25 + VALUE "ProductVersion", SM_VERSION_STRING
31.26 END
31.27 END
31.28 BLOCK "VarFileInfo"
32.1 --- a/extensions/topmenus/extension.cpp Sun Aug 26 23:33:11 2012 -0400
32.2 +++ b/extensions/topmenus/extension.cpp Sun Aug 26 23:35:18 2012 -0400
32.3 @@ -67,7 +67,7 @@
32.4
32.5 const char *TopMenuExtension::GetExtensionVerString()
32.6 {
32.7 - return SM_FULL_VERSION;
32.8 + return SM_VERSION_STRING;
32.9 }
32.10
32.11 const char *TopMenuExtension::GetExtensionDateString()
33.1 --- a/extensions/topmenus/version.rc Sun Aug 26 23:33:11 2012 -0400
33.2 +++ b/extensions/topmenus/version.rc Sun Aug 26 23:35:18 2012 -0400
33.3 @@ -29,8 +29,8 @@
33.4 //
33.5
33.6 VS_VERSION_INFO VERSIONINFO
33.7 - FILEVERSION SM_FILE_VERSION
33.8 - PRODUCTVERSION SM_FILE_VERSION
33.9 + FILEVERSION SM_VERSION_FILE
33.10 + PRODUCTVERSION SM_VERSION_FILE
33.11 FILEFLAGSMASK 0x17L
33.12 #ifdef _DEBUG
33.13 FILEFLAGS 0x1L
33.14 @@ -47,12 +47,12 @@
33.15 BEGIN
33.16 VALUE "Comments", "TopMenus Extension"
33.17 VALUE "FileDescription", "SourceMod TopMenus Extension"
33.18 - VALUE "FileVersion", SM_FULL_VERSION
33.19 + VALUE "FileVersion", SM_VERSION_STRING
33.20 VALUE "InternalName", "SourceMod TopMenus Extension"
33.21 VALUE "LegalCopyright", "Copyright (c) 2004-2008, AlliedModders LLC"
33.22 VALUE "OriginalFilename", BINARY_NAME
33.23 VALUE "ProductName", "SourceMod TopMenus Extension"
33.24 - VALUE "ProductVersion", SM_FULL_VERSION
33.25 + VALUE "ProductVersion", SM_VERSION_STRING
33.26 END
33.27 END
33.28 BLOCK "VarFileInfo"
34.1 --- a/extensions/updater/Updater.cpp Sun Aug 26 23:33:11 2012 -0400
34.2 +++ b/extensions/updater/Updater.cpp Sun Aug 26 23:35:18 2012 -0400
34.3 @@ -356,8 +356,7 @@
34.4 xfer = webternet->CreateSession();
34.5 xfer->SetFailOnHTTPError(true);
34.6
34.7 - form->AddString("version", SM_FULL_VERSION);
34.8 - form->AddString("build", SM_BUILD_UNIQUEID);
34.9 + form->AddString("version", SM_VERSION_STRING);
34.10
34.11 unsigned int num_files = 0;
34.12 add_folders(form, "gamedata", num_files);
35.1 --- a/extensions/updater/extension.cpp Sun Aug 26 23:33:11 2012 -0400
35.2 +++ b/extensions/updater/extension.cpp Sun Aug 26 23:35:18 2012 -0400
35.3 @@ -249,7 +249,7 @@
35.4
35.5 const char *SmUpdater::GetExtensionVerString()
35.6 {
35.7 - return SM_FULL_VERSION;
35.8 + return SM_VERSION_STRING;
35.9 }
35.10
35.11 const char *SmUpdater::GetExtensionDateString()
36.1 --- a/extensions/updater/version.rc Sun Aug 26 23:33:11 2012 -0400
36.2 +++ b/extensions/updater/version.rc Sun Aug 26 23:35:18 2012 -0400
36.3 @@ -29,8 +29,8 @@
36.4 //
36.5
36.6 VS_VERSION_INFO VERSIONINFO
36.7 - FILEVERSION SM_FILE_VERSION
36.8 - PRODUCTVERSION SM_FILE_VERSION
36.9 + FILEVERSION SM_VERSION_FILE
36.10 + PRODUCTVERSION SM_VERSION_FILE
36.11 FILEFLAGSMASK 0x17L
36.12 #ifdef _DEBUG
36.13 FILEFLAGS 0x1L
36.14 @@ -47,12 +47,12 @@
36.15 BEGIN
36.16 VALUE "Comments", "Automatic Updater"
36.17 VALUE "FileDescription", "SourceMod Automatic Updater"
36.18 - VALUE "FileVersion", SM_FILE_VERSION
36.19 + VALUE "FileVersion", SM_VERSION_FILE
36.20 VALUE "InternalName", "SourceMod Updater Extension"
36.21 VALUE "LegalCopyright", "Copyright (c) 2004-2009, AlliedModders LLC"
36.22 VALUE "OriginalFilename", BINARY_NAME
36.23 VALUE "ProductName", "SourceMod Updater Extension"
36.24 - VALUE "ProductVersion", SM_FULL_VERSION
36.25 + VALUE "ProductVersion", SM_VERSION_STRING
36.26 END
36.27 END
36.28 BLOCK "VarFileInfo"
37.1 --- a/gamedata/sm-cstrike.games/game.csgo.txt Sun Aug 26 23:33:11 2012 -0400
37.2 +++ b/gamedata/sm-cstrike.games/game.csgo.txt Sun Aug 26 23:35:18 2012 -0400
37.3 @@ -11,7 +11,6 @@
37.4
37.5 "Games"
37.6 {
37.7 - //No mac binary yet so no mac gamedata
37.8 "csgo"
37.9 {
37.10 "Offsets"
37.11 @@ -21,32 +20,34 @@
37.12 {
37.13 "windows" "6"
37.14 "linux" "6"
37.15 + "mac" "6"
37.16 }
37.17 "WeaponPrice"
37.18 {
37.19 "windows" "2700"
37.20 "linux" "2700"
37.21 + "mac" "2700"
37.22 }
37.23 //Offset into CheckRestartRound
37.24 - //Only Windows/Linux for now.
37.25 "CTTeamScoreOffset"
37.26 {
37.27 "windows" "97"
37.28 "linux" "124"
37.29 + "mac" "150"
37.30 }
37.31 //Offset into CheckRestartRound
37.32 - //Only Windows/Linux for now.
37.33 "TTeamScoreOffset"
37.34 {
37.35 "windows" "122"
37.36 "linux" "159"
37.37 + "mac" "185"
37.38 }
37.39 //Offset into IncrementNumMVPs to find MVP count offset from player
37.40 - //Only Windows/Linux for now.
37.41 "MVPCountOffset"
37.42 {
37.43 "windows" "46"
37.44 "linux" "47"
37.45 + "mac" "61"
37.46 }
37.47 }
37.48 "Signatures"
37.49 @@ -56,42 +57,49 @@
37.50 "library" "server"
37.51 "windows" "\x55\x8B\xEC\x83\xEC\x2A\x56\x8B\xF1\x8B\x0D\x2A\x2A\x2A\x2A\x57\xE8\x2A\x2A\x2A\x2A\x84\xC0\x75"
37.52 "linux" "@_ZN9CCSPlayer12RoundRespawnEv"
37.53 + "mac" "@_ZN9CCSPlayer12RoundRespawnEv"
37.54 }
37.55 "SwitchTeam"
37.56 {
37.57 "library" "server"
37.58 "windows" "\x55\x8B\xEC\x83\xEC\x2A\x56\x57\x8B\x7D\x2A\x57\x8B\xF1\xE8\x2A\x2A\x2A\x2A\x83\xC4"
37.59 "linux" "@_ZN9CCSPlayer10SwitchTeamEi"
37.60 + "mac" "@_ZN9CCSPlayer10SwitchTeamEi"
37.61 }
37.62 "HandleCommand_Buy_Internal"
37.63 {
37.64 "library" "server"
37.65 "windows" "\x55\x8B\xEC\x81\xEC\x2A\x2A\x00\x00\x53\x56\x8B\xF1\x80\xBE\x2A\x2A\x00\x00\x00"
37.66 "linux" "@_ZN9CCSPlayer26HandleCommand_Buy_InternalEPKc"
37.67 + "mac" "@_ZN9CCSPlayer26HandleCommand_Buy_InternalEPKc"
37.68 }
37.69 "CSWeaponDrop"//Wildcard first 6 bytes for CS:S DM
37.70 {
37.71 "library" "server"
37.72 "windows" "\x2A\x2A\x2A\x2A\x2A\x2A\x2A\x2A\x2A\x53\x56\x8B\x2A\x2A\x32\xDB\x57\x8B\xF9\x85\xF6\x0F\x84"
37.73 "linux" "@_ZN9CCSPlayer12CSWeaponDropEP17CBaseCombatWeaponbb"
37.74 + "mac" "@_ZN9CCSPlayer12CSWeaponDropEP17CBaseCombatWeaponbb"
37.75 }
37.76 "TerminateRound"
37.77 {
37.78 "library" "server"
37.79 "windows" "\x55\x8B\xEC\x83\xEC\x2A\x53\x8B\x2A\x2A\x56\x57\x33\xFF"
37.80 "linux" "@_ZN12CCSGameRules14TerminateRoundEfi"
37.81 + "mac" "@_ZN12CCSGameRules14TerminateRoundEfi"
37.82 }
37.83 "GetTranslatedWeaponAlias"
37.84 {
37.85 "library" "server"
37.86 "windows" "\x55\x8B\xEC\x56\x57\x8B\x2A\x2A\x33\xF6\x8D\x9B\x2A\x2A\x2A\x2A\x8B\x04\xF5\x2A\x2A\x2A\x2A\x57\x50\xE8\x2A\x2A\x2A\x2A\x83\xC4\x2A\x85\xC0\x74\x2A\x46\x83\xFE\x2A\x72\x2A\x8B\xC7\x5F\x5E\x5D\xC3"
37.87 "linux" "@_Z24GetTranslatedWeaponAliasPKc"
37.88 + "mac" "@_Z24GetTranslatedWeaponAliasPKc"
37.89 }
37.90 "GetWeaponInfo"
37.91 {
37.92 "library" "server"
37.93 "windows" "\x55\x8B\xEC\x8B\x4D\x2A\x33\xC0\x85\xC9\x74"
37.94 "linux" "@_Z13GetWeaponInfo10CSWeaponID"
37.95 + "mac" "@_Z13GetWeaponInfo10CSWeaponID"
37.96 }
37.97 //In CS:GO this is actually CCSGameRules::CheckRestartRound(void) but to keep same gamedata as cs:s.
37.98 "CheckWinLimit"
37.99 @@ -99,18 +107,21 @@
37.100 "library" "server"
37.101 "windows" "\x55\x8B\xEC\x83\xEC\x2A\x56\x57\x8B\xF9\x8B\x0D\x2A\x2A\x2A\x2A\x81\xF9\x2A\x2A\x2A\x2A\x75\x2A\x8B"
37.102 "linux" "@_ZN12CCSGameRules17CheckRestartRoundEv"
37.103 + "mac" "@_ZN12CCSGameRules17CheckRestartRoundEv"
37.104 }
37.105 "IncrementNumMVPs"
37.106 {
37.107 "library" "server"
37.108 "windows" "\x55\x8B\xEC\xA1\x2A\x2A\x2A\x2A\x8B\x50\x2A\x57\x8B\xF9\xB9\x2A\x2A\x2A\x2A\xFF\xD2\x85\xC0\x74\x2A\x68"
37.109 "linux" "@_ZN9CCSPlayer16IncrementNumMVPsE13CSMvpReason_t"
37.110 + "mac" "@_ZN9CCSPlayer16IncrementNumMVPsE13CSMvpReason_t"
37.111 }
37.112 "AliasToWeaponID"
37.113 {
37.114 "library" "server"
37.115 "windows" "\x55\x8B\xEC\x56\x57\x8B\x2A\x2A\x85\xFF\x74\x2A\x33\xF6\x8B\xFF"
37.116 "linux" "@_Z15AliasToWeaponIDPKc"
37.117 + "mac" "@_Z15AliasToWeaponIDPKc"
37.118 }
37.119 }
37.120 }
38.1 --- a/loader/version.rc Sun Aug 26 23:33:11 2012 -0400
38.2 +++ b/loader/version.rc Sun Aug 26 23:35:18 2012 -0400
38.3 @@ -29,8 +29,8 @@
38.4 //
38.5
38.6 VS_VERSION_INFO VERSIONINFO
38.7 - FILEVERSION SM_FILE_VERSION
38.8 - PRODUCTVERSION SM_FILE_VERSION
38.9 + FILEVERSION SM_VERSION_FILE
38.10 + PRODUCTVERSION SM_VERSION_FILE
38.11 FILEFLAGSMASK 0x17L
38.12 #ifdef _DEBUG
38.13 FILEFLAGS 0x1L
38.14 @@ -47,12 +47,12 @@
38.15 BEGIN
38.16 VALUE "Comments", "SourceMod Loader"
38.17 VALUE "FileDescription", "SourceMod Loader"
38.18 - VALUE "FileVersion", SM_FULL_VERSION
38.19 + VALUE "FileVersion", SM_VERSION_STRING
38.20 VALUE "InternalName", "sourcemod"
38.21 VALUE "LegalCopyright", "Copyright (c) 2004-2008, AlliedModders LLC"
38.22 VALUE "OriginalFilename", "sourcemod_mm.dll"
38.23 VALUE "ProductName", "SourceMod Loader"
38.24 - VALUE "ProductVersion", SM_FULL_VERSION
38.25 + VALUE "ProductVersion", SM_VERSION_STRING
38.26 END
38.27 END
38.28 BLOCK "VarFileInfo"
39.1 --- a/plugins/AMBuilder Sun Aug 26 23:33:11 2012 -0400
39.2 +++ b/plugins/AMBuilder Sun Aug 26 23:35:18 2012 -0400
39.3 @@ -36,15 +36,18 @@
39.4 includes = os.path.relpath(os.path.join(AMBuild.sourceFolder, 'plugins', 'include'),
39.5 os.path.join(AMBuild.outputFolder, 'plugins'))
39.6
39.7 +versioninc = os.path.relpath(os.path.join(AMBuild.outputFolder, 'includes'),
39.8 + os.path.join(AMBuild.outputFolder, 'plugins'))
39.9 +
39.10 #This one has to be special
39.11 sp = os.path.join(AMBuild.sourceFolder, 'plugins', 'admin-flatfile', 'admin-flatfile.sp')
39.12 -args = [spcomp, '-i' + includes, sp]
39.13 +args = [spcomp, 'SM_GENERATED_BUILD=', '-i' + versioninc, '-i' + includes, sp]
39.14 plugins.AddCommand(command.DirectCommand(args))
39.15
39.16 #Do the normal ones
39.17 for file in files:
39.18 sp = os.path.join(AMBuild.sourceFolder, 'plugins', file)
39.19 - args = [spcomp, '-i' + includes, sp]
39.20 + args = [spcomp, 'SM_GENERATED_BUILD=', '-i' + versioninc, '-i' + includes, sp]
39.21 plugins.AddCommand(command.DirectCommand(args))
39.22
39.23
40.1 --- a/plugins/include/version.inc Sun Aug 26 23:33:11 2012 -0400
40.2 +++ b/plugins/include/version.inc Sun Aug 26 23:35:18 2012 -0400
40.3 @@ -35,8 +35,15 @@
40.4 #endif
40.5 #define _version_included
40.6
40.7 +#if defined SM_GENERATED_BUILD
40.8 +#include <version_auto>
40.9 +#else
40.10 +#define SOURCEMOD_V_TAG "manual"
40.11 +#define SOURCEMOD_V_REV 0
40.12 +#define SOURCEMOD_V_CSET "0"
40.13 #define SOURCEMOD_V_MAJOR 1 /**< SourceMod Major version */
40.14 #define SOURCEMOD_V_MINOR 5 /**< SourceMod Minor version */
40.15 #define SOURCEMOD_V_RELEASE 0 /**< SourceMod Release version */
40.16
40.17 -#define SOURCEMOD_VERSION "1.5.0-dev" /**< SourceMod version string (major.minor.release.build) */
40.18 +#define SOURCEMOD_VERSION "1.5.0-manual" /**< SourceMod version string (major.minor.release.build) */
40.19 +#endif
41.1 --- a/public/mms_sample_ext/Makefile Sun Aug 26 23:33:11 2012 -0400
41.2 +++ b/public/mms_sample_ext/Makefile Sun Aug 26 23:35:18 2012 -0400
41.3 @@ -27,6 +27,7 @@
41.4 C_GCC4_FLAGS = -fvisibility=hidden
41.5 CPP_GCC4_FLAGS = -fvisibility-inlines-hidden
41.6 CPP = gcc
41.7 +CPP_OSX = clang
41.8
41.9 ##########################
41.10 ### SDK CONFIGURATIONS ###
41.11 @@ -116,7 +117,7 @@
41.12
41.13 CFLAGS += -DPOSIX -Dstricmp=strcasecmp -D_stricmp=strcasecmp -D_strnicmp=strncasecmp -Dstrnicmp=strncasecmp \
41.14 -D_snprintf=snprintf -D_vsnprintf=vsnprintf -D_alloca=alloca -Dstrcmpi=strcasecmp -DCOMPILER_GCC -Wall -Werror \
41.15 - -Wno-switch -Wno-unused -mfpmath=sse -msse -DSOURCEMOD_BUILD -DHAVE_STDINT_H -m32
41.16 + -Wno-overloaded-virtual -Wno-switch -Wno-unused -msse -DSOURCEMOD_BUILD -DHAVE_STDINT_H -m32
41.17 CPPFLAGS += -Wno-non-virtual-dtor -fno-exceptions -fno-rtti
41.18
41.19 ################################################
41.20 @@ -134,8 +135,9 @@
41.21 endif
41.22
41.23 ifeq "$(OS)" "Darwin"
41.24 + CPP = $(CPP_OSX)
41.25 LIB_EXT = dylib
41.26 - CFLAGS += -isysroot /Developer/SDKs/MacOSX10.5.sdk
41.27 + CFLAGS += -DOSX -D_OSX
41.28 LINK += -dynamiclib -lstdc++ -mmacosx-version-min=10.5
41.29 else
41.30 LIB_EXT = so
41.31 @@ -143,12 +145,37 @@
41.32 LINK += -shared
41.33 endif
41.34
41.35 -GCC_VERSION := $(shell $(CPP) -dumpversion >&1 | cut -b1)
41.36 -ifeq "$(GCC_VERSION)" "4"
41.37 +IS_CLANG := $(shell $(CPP) --version | head -1 | grep clang > /dev/null && echo "1" || echo "0")
41.38 +
41.39 +ifeq "$(IS_CLANG)" "1"
41.40 + CPP_MAJOR := $(shell $(CPP) --version | grep clang | sed "s/.*version \([0-9]\)*\.[0-9]*.*/\1/")
41.41 + CPP_MINOR := $(shell $(CPP) --version | grep clang | sed "s/.*version [0-9]*\.\([0-9]\)*.*/\1/")
41.42 +else
41.43 + CPP_MAJOR := $(shell $(CPP) -dumpversion >&1 | cut -b1)
41.44 + CPP_MINOR := $(shell $(CPP) -dumpversion >&1 | cut -b3)
41.45 +endif
41.46 +
41.47 +# If not clang
41.48 +ifeq "$(IS_CLANG)" "0"
41.49 + CFLAGS += -mfpmath=sse
41.50 +endif
41.51 +
41.52 +# Clang || GCC >= 4
41.53 +ifeq "$(shell expr $(IS_CLANG) \| $(CPP_MAJOR) \>= 4)" "1"
41.54 CFLAGS += $(C_GCC4_FLAGS)
41.55 CPPFLAGS += $(CPP_GCC4_FLAGS)
41.56 endif
41.57
41.58 +# Clang >= 3 || GCC >= 4.7
41.59 +ifeq "$(shell expr $(IS_CLANG) \& $(CPP_MAJOR) \>= 3 \| $(CPP_MAJOR) \>= 4 \& $(CPP_MINOR) \>= 7)" "1"
41.60 + CFLAGS += -Wno-delete-non-virtual-dtor
41.61 +endif
41.62 +
41.63 +# OS is Linux and not using clang
41.64 +ifeq "$(shell expr $(OS) \= Linux \& $(IS_CLANG) \= 0)" "1"
41.65 + LINK += -static-libgcc
41.66 +endif
41.67 +
41.68 OBJ_BIN := $(OBJECTS:%.cpp=$(BIN_DIR)/%.o)
41.69
41.70 # This will break if we include other Makefiles, but is fine for now. It allows
42.1 --- a/public/sample_ext/Makefile Sun Aug 26 23:33:11 2012 -0400
42.2 +++ b/public/sample_ext/Makefile Sun Aug 26 23:35:18 2012 -0400
42.3 @@ -35,6 +35,7 @@
42.4 C_GCC4_FLAGS = -fvisibility=hidden
42.5 CPP_GCC4_FLAGS = -fvisibility-inlines-hidden
42.6 CPP = gcc
42.7 +CPP_OSX = clang
42.8
42.9 ##########################
42.10 ### SDK CONFIGURATIONS ###
42.11 @@ -129,7 +130,7 @@
42.12
42.13 CFLAGS += -DPOSIX -Dstricmp=strcasecmp -D_stricmp=strcasecmp -D_strnicmp=strncasecmp -Dstrnicmp=strncasecmp \
42.14 -D_snprintf=snprintf -D_vsnprintf=vsnprintf -D_alloca=alloca -Dstrcmpi=strcasecmp -DCOMPILER_GCC -Wall -Werror \
42.15 - -Wno-switch -Wno-unused -mfpmath=sse -msse -DSOURCEMOD_BUILD -DHAVE_STDINT_H -m32
42.16 + -Wno-overloaded-virtual -Wno-switch -Wno-unused -msse -DSOURCEMOD_BUILD -DHAVE_STDINT_H -m32
42.17 CPPFLAGS += -Wno-non-virtual-dtor -fno-exceptions -fno-rtti
42.18
42.19 ################################################
42.20 @@ -151,8 +152,9 @@
42.21 endif
42.22
42.23 ifeq "$(OS)" "Darwin"
42.24 + CPP = $(CPP_OSX)
42.25 LIB_EXT = dylib
42.26 - CFLAGS += -isysroot /Developer/SDKs/MacOSX10.5.sdk
42.27 + CFLAGS += -DOSX -D_OSX
42.28 LINK += -dynamiclib -lstdc++ -mmacosx-version-min=10.5
42.29 else
42.30 LIB_EXT = so
42.31 @@ -160,12 +162,37 @@
42.32 LINK += -shared
42.33 endif
42.34
42.35 -GCC_VERSION := $(shell $(CPP) -dumpversion >&1 | cut -b1)
42.36 -ifeq "$(GCC_VERSION)" "4"
42.37 +IS_CLANG := $(shell $(CPP) --version | head -1 | grep clang > /dev/null && echo "1" || echo "0")
42.38 +
42.39 +ifeq "$(IS_CLANG)" "1"
42.40 + CPP_MAJOR := $(shell $(CPP) --version | grep clang | sed "s/.*version \([0-9]\)*\.[0-9]*.*/\1/")
42.41 + CPP_MINOR := $(shell $(CPP) --version | grep clang | sed "s/.*version [0-9]*\.\([0-9]\)*.*/\1/")
42.42 +else
42.43 + CPP_MAJOR := $(shell $(CPP) -dumpversion >&1 | cut -b1)
42.44 + CPP_MINOR := $(shell $(CPP) -dumpversion >&1 | cut -b3)
42.45 +endif
42.46 +
42.47 +# If not clang
42.48 +ifeq "$(IS_CLANG)" "0"
42.49 + CFLAGS += -mfpmath=sse
42.50 +endif
42.51 +
42.52 +# Clang || GCC >= 4
42.53 +ifeq "$(shell expr $(IS_CLANG) \| $(CPP_MAJOR) \>= 4)" "1"
42.54 CFLAGS += $(C_GCC4_FLAGS)
42.55 CPPFLAGS += $(CPP_GCC4_FLAGS)
42.56 endif
42.57
42.58 +# Clang >= 3 || GCC >= 4.7
42.59 +ifeq "$(shell expr $(IS_CLANG) \& $(CPP_MAJOR) \>= 3 \| $(CPP_MAJOR) \>= 4 \& $(CPP_MINOR) \>= 7)" "1"
42.60 + CFLAGS += -Wno-delete-non-virtual-dtor
42.61 +endif
42.62 +
42.63 +# OS is Linux and not using clang
42.64 +ifeq "$(shell expr $(OS) \= Linux \& $(IS_CLANG) \= 0)" "1"
42.65 + LINK += -static-libgcc
42.66 +endif
42.67 +
42.68 OBJ_BIN := $(OBJECTS:%.cpp=$(BIN_DIR)/%.o)
42.69
42.70 # This will break if we include other Makefiles, but is fine for now. It allows
43.1 --- a/public/sourcemod_version.h Sun Aug 26 23:33:11 2012 -0400
43.2 +++ b/public/sourcemod_version.h Sun Aug 26 23:35:18 2012 -0400
43.3 @@ -41,10 +41,17 @@
43.4 #if defined SM_GENERATED_BUILD
43.5 #include <sourcemod_version_auto.h>
43.6 #else
43.7 -#define SM_BUILD_STRING "-pdev"
43.8 -#define SM_BUILD_UNIQUEID "2650:5d34bc3edbfa" SM_BUILD_STRING
43.9 -#define SM_FULL_VERSION "1.3.0" SM_BUILD_STRING
43.10 -#define SM_FILE_VERSION 1,3,0,0
43.11 +#define SM_BUILD_TAG "manual"
43.12 +#define SM_BUILD_REV "0"
43.13 +#define SM_BUILD_CSET "0"
43.14 +#define SM_BUILD_MAJOR "1"
43.15 +#define SM_BUILD_MINOR "5"
43.16 +#define SM_BUILD_RELEASE "0"
43.17 +
43.18 +#define SM_BUILD_UNIQUEID SM_BUILD_REV ":" SM_BUILD_CSET
43.19 +
43.20 +#define SM_VERSION_STRING SM_BUILD_MAJOR "." SM_BUILD_MINOR "." SM_BUILD_RELEASE "-" SM_BUILD_TAG
43.21 +#define SM_VERSION_FILE 1,5,0,0
43.22 #endif
43.23 #define SM_BUILD_TIMESTAMP __DATE__ " " __TIME__
43.24
44.1 --- a/sourcepawn/compiler/AMBuilder Sun Aug 26 23:33:11 2012 -0400
44.2 +++ b/sourcepawn/compiler/AMBuilder Sun Aug 26 23:35:18 2012 -0400
44.3 @@ -61,8 +61,11 @@
44.4 binary.AddSourceFiles('sourcepawn/compiler', files)
44.5
44.6 if AMBuild.target['platform'] == 'windows':
44.7 - env = {'RCDEFINES': ['BINARY_NAME="' + binary.binaryFile + '"']}
44.8 + env = {'RCDEFINES': ['BINARY_NAME="' + binary.binaryFile + '"', 'SM_GENERATED_BUILD']}
44.9 binary.AddResourceFile('sourcepawn/compiler/libpawnc.rc', env)
44.10 +elif AMBuild.target['platform'] == 'darwin' and isinstance(binary, Cpp.LibraryBuilder):
44.11 + binary.compiler['POSTLINKFLAGS'].extend(['-compatibility_version', '1.0.0'])
44.12 + binary.compiler['POSTLINKFLAGS'].extend(['-current_version', AMBuild.cache['version']])
44.13
44.14 binary.SendToJob()
44.15
45.1 --- a/sourcepawn/compiler/libpawnc.rc Sun Aug 26 23:33:11 2012 -0400
45.2 +++ b/sourcepawn/compiler/libpawnc.rc Sun Aug 26 23:35:18 2012 -0400
45.3 @@ -19,8 +19,8 @@
45.4 #define VERSIONPRODUCTNAME "smcomp\0"
45.5
45.6 VS_VERSION_INFO VERSIONINFO
45.7 -FILEVERSION SM_FILE_VERSION
45.8 -PRODUCTVERSION SM_FILE_VERSION
45.9 +FILEVERSION SM_VERSION_FILE
45.10 +PRODUCTVERSION SM_VERSION_FILE
45.11 FILEFLAGSMASK 0x0000003FL
45.12 FILEFLAGS 0
45.13 #if defined(WIN32)
45.14 @@ -36,12 +36,12 @@
45.15 BEGIN
45.16 VALUE "CompanyName", "(C)1998-2006 ITB CompuPhase, AlliedModders LLC\0"
45.17 VALUE "FileDescription", VERSIONDESCRIPTION
45.18 - VALUE "FileVersion", SM_FULL_VERSION
45.19 + VALUE "FileVersion", SM_VERSION_STRING
45.20 VALUE "InternalName", VERSIONNAME
45.21 VALUE "LegalCopyright", "(C)1998-2006 ITB CompuPhase, AlliedModders LLC\0"
45.22 VALUE "OriginalFilename", VERSIONNAME
45.23 VALUE "ProductName", VERSIONPRODUCTNAME
45.24 - VALUE "ProductVersion", SM_FULL_VERSION
45.25 + VALUE "ProductVersion", SM_VERSION_STRING
45.26 END
45.27 END
45.28
46.1 --- a/sourcepawn/compiler/sc1.c Sun Aug 26 23:33:11 2012 -0400
46.2 +++ b/sourcepawn/compiler/sc1.c Sun Aug 26 23:35:18 2012 -0400
46.3 @@ -1233,7 +1233,7 @@
46.4
46.5 static void setcaption(void)
46.6 {
46.7 - pc_printf("SourcePawn Compiler " SM_FULL_VERSION "\n");
46.8 + pc_printf("SourcePawn Compiler " SM_VERSION_STRING "\n");
46.9 pc_printf("Copyright (c) 1997-2006, ITB CompuPhase, (C)2004-2008 AlliedModders, LLC\n\n");
46.10 }
46.11
47.1 --- a/sourcepawn/jit/engine2.cpp Sun Aug 26 23:33:11 2012 -0400
47.2 +++ b/sourcepawn/jit/engine2.cpp Sun Aug 26 23:35:18 2012 -0400
47.3 @@ -149,7 +149,7 @@
47.4
47.5 const char *SourcePawnEngine2::GetVersionString()
47.6 {
47.7 - return SM_FULL_VERSION;
47.8 + return SM_VERSION_STRING;
47.9 }
47.10
47.11 IProfiler *SourcePawnEngine2::GetProfiler()
48.1 --- a/sourcepawn/jit/version.rc Sun Aug 26 23:33:11 2012 -0400
48.2 +++ b/sourcepawn/jit/version.rc Sun Aug 26 23:35:18 2012 -0400
48.3 @@ -28,8 +28,8 @@
48.4 //
48.5
48.6 VS_VERSION_INFO VERSIONINFO
48.7 - FILEVERSION SM_FILE_VERSION
48.8 - PRODUCTVERSION SM_FILE_VERSION
48.9 + FILEVERSION SM_VERSION_FILE
48.10 + PRODUCTVERSION SM_VERSION_FILE
48.11 FILEFLAGSMASK 0x17L
48.12 #ifdef _DEBUG
48.13 FILEFLAGS 0x1L
48.14 @@ -46,12 +46,12 @@
48.15 BEGIN
48.16 VALUE "Comments", "SourcePawn JIT"
48.17 VALUE "FileDescription", "SourcePawn JIT/Virtual Machine"
48.18 - VALUE "FileVersion", SM_FULL_VERSION
48.19 + VALUE "FileVersion", SM_VERSION_STRING
48.20 VALUE "InternalName", "sourcemod"
48.21 VALUE "LegalCopyright", "Copyright (c) 2004-2008, AlliedModders LLC"
48.22 VALUE "OriginalFilename", "sourcepawn.jit.x86.dll"
48.23 VALUE "ProductName", "SourcePawn JIT"
48.24 - VALUE "ProductVersion", SM_FULL_VERSION
48.25 + VALUE "ProductVersion", SM_VERSION_STRING
48.26 END
48.27 END
48.28 BLOCK "VarFileInfo"
49.1 --- a/tools/buildbot/PackageScript Sun Aug 26 23:33:11 2012 -0400
49.2 +++ b/tools/buildbot/PackageScript Sun Aug 26 23:35:18 2012 -0400
49.3 @@ -228,8 +228,7 @@
49.4 AddNormalLibrary('dbi.sqlite.ext', 'extensions')
49.5
49.6 AddNormalLibrary('game.cstrike.ext.2.css', 'extensions')
49.7 -if AMBuild.target['platform'] != 'darwin':
49.8 - AddNormalLibrary('game.cstrike.ext.2.csgo', 'extensions')
49.9 +AddNormalLibrary('game.cstrike.ext.2.csgo', 'extensions')
49.10
49.11 AddNormalLibrary('game.tf2.ext.2.ep2v', 'extensions')
49.12 AddNormalLibrary('topmenus.ext', 'extensions')
50.1 --- a/tools/buildbot/Versioning Sun Aug 26 23:33:11 2012 -0400
50.2 +++ b/tools/buildbot/Versioning Sun Aug 26 23:35:18 2012 -0400
50.3 @@ -27,11 +27,17 @@
50.4 productFile = open(os.path.join(AMBuild.sourceFolder, 'product.version'), 'r')
50.5 productContents = productFile.read()
50.6 productFile.close()
50.7 - m = re.match('(\d+)\.(\d+)\.(\d+)(.*)', productContents)
50.8 + m = re.match('(\d+)\.(\d+)\.(\d+)-?(.*)', productContents)
50.9 if m == None:
50.10 raise Exception('Could not detremine product version')
50.11 major, minor, release, tag = m.groups()
50.12 -
50.13 +
50.14 + fullstring = "{0}.{1}.{2}".format(major, minor, release)
50.15 + if tag != "":
50.16 + fullstring += "-{0}".format(tag)
50.17 + if tag == "dev":
50.18 + fullstring += "+{0}".format(rev)
50.19 +
50.20 incFolder = os.path.join(AMBuild.outputFolder, 'includes')
50.21 if not os.path.isdir(incFolder):
50.22 os.makedirs(incFolder)
50.23 @@ -40,14 +46,40 @@
50.24 #ifndef _SOURCEMOD_AUTO_VERSION_INFORMATION_H_
50.25 #define _SOURCEMOD_AUTO_VERSION_INFORMATION_H_
50.26
50.27 -#define SM_BUILD_STRING \"{0}\"
50.28 -#define SM_BUILD_UNIQUEID \"{1}:{2}\" SM_BUILD_STRING
50.29 -#define SM_FULL_VERSION \"{3}.{4}.{5}\" SM_BUILD_STRING
50.30 -#define SM_FILE_VERSION {6},{7},{8},0
50.31 +#define SM_BUILD_TAG \"{0}\"
50.32 +#define SM_BUILD_REV \"{1}\"
50.33 +#define SM_BUILD_CSET \"{2}\"
50.34 +#define SM_BUILD_MAJOR \"{3}\"
50.35 +#define SM_BUILD_MINOR \"{4}\"
50.36 +#define SM_BUILD_RELEASE \"{5}\"
50.37 +
50.38 +#define SM_BUILD_UNIQUEID SM_BUILD_REV \":\" SM_BUILD_CSET
50.39 +
50.40 +#define SM_VERSION_STRING \"{6}\"
50.41 +#define SM_VERSION_FILE {7},{8},{9},0
50.42
50.43 #endif /* _SOURCEMOD_AUTO_VERSION_INFORMATION_H_ */
50.44
50.45 -""".format(tag, rev, cset, major, minor, release, major, minor, release))
50.46 +""".format(tag, rev, cset, major, minor, release, fullstring, major, minor, release))
50.47 + incFile.close()
50.48 +
50.49 + incFile = open(os.path.join(incFolder, 'version_auto.inc'), 'w')
50.50 + incFile.write("""
50.51 +#if defined _auto_version_included
50.52 + #endinput
50.53 +#endif
50.54 +#define _auto_version_included
50.55 +
50.56 +#define SOURCEMOD_V_TAG \"{0}\"
50.57 +#define SOURCEMOD_V_REV {1}
50.58 +#define SOURCEMOD_V_CSET \"{2}\"
50.59 +#define SOURCEMOD_V_MAJOR {3}
50.60 +#define SOURCEMOD_V_MINOR {4}
50.61 +#define SOURCEMOD_V_RELEASE {5}
50.62 +
50.63 +#define SOURCEMOD_VERSION \"{6}\"
50.64 +
50.65 +""".format(tag, rev, cset, major, minor, release, fullstring))
50.66 incFile.close()
50.67
50.68 cache.WriteCache()
