UNLOZE/sourcemod
9
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Overhauled versioning information (bug 5453, r=dvander).

Browse Source
This commit is contained in:
Asher Baker
2012-08-26 01:33:54 +01:00
parent a62aeb36d8
commit bf76be5dfa
42 changed files with 157 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sourcepawn/compiler/AMBuilder
+4 -1
View File
@@ -61,8 +61,11 @@ if AMBuild.target['platform'] == 'linux':
binary.AddSourceFiles('sourcepawn/compiler', files)
if AMBuild.target['platform'] == 'windows':
env = {'RCDEFINES': ['BINARY_NAME="' + binary.binaryFile + '"']}
env = {'RCDEFINES': ['BINARY_NAME="' + binary.binaryFile + '"', 'SM_GENERATED_BUILD']}
binary.AddResourceFile('sourcepawn/compiler/libpawnc.rc', env)
elif AMBuild.target['platform'] == 'darwin' and isinstance(binary, Cpp.LibraryBuilder):
binary.compiler['POSTLINKFLAGS'].extend(['-compatibility_version', '1.0.0'])
binary.compiler['POSTLINKFLAGS'].extend(['-current_version', AMBuild.cache['version']])
binary.SendToJob()
sourcepawn/compiler/libpawnc.rc
+4 -4
View File
@@ -19,8 +19,8 @@ AppIcon ICON "pawn.ico"
#define VERSIONPRODUCTNAME "smcomp\0"
VS_VERSION_INFO VERSIONINFO
FILEVERSION SM_FILE_VERSION
PRODUCTVERSION SM_FILE_VERSION
FILEVERSION SM_VERSION_FILE
PRODUCTVERSION SM_VERSION_FILE
FILEFLAGSMASK 0x0000003FL
FILEFLAGS 0
#if defined(WIN32)
@@ -36,12 +36,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "(C)1998-2006 ITB CompuPhase, AlliedModders LLC\0"
VALUE "FileDescription", VERSIONDESCRIPTION
VALUE "FileVersion", SM_FULL_VERSION
VALUE "FileVersion", SM_VERSION_STRING
VALUE "InternalName", VERSIONNAME
VALUE "LegalCopyright", "(C)1998-2006 ITB CompuPhase, AlliedModders LLC\0"
VALUE "OriginalFilename", VERSIONNAME
VALUE "ProductName", VERSIONPRODUCTNAME
VALUE "ProductVersion", SM_FULL_VERSION
VALUE "ProductVersion", SM_VERSION_STRING
END
END
sourcepawn/compiler/sc1.c
+1 -1
View File
@@ -1233,7 +1233,7 @@ static void setconfig(char *root)
static void setcaption(void)
{
pc_printf("SourcePawn Compiler " SM_FULL_VERSION "\n");
pc_printf("SourcePawn Compiler " SM_VERSION_STRING "\n");
pc_printf("Copyright (c) 1997-2006, ITB CompuPhase, (C)2004-2008 AlliedModders, LLC\n\n");
}
sourcepawn/jit/engine2.cpp
+1 -1
View File
@@ -149,7 +149,7 @@ const char *SourcePawnEngine2::GetEngineName()
const char *SourcePawnEngine2::GetVersionString()
{
return SM_FULL_VERSION;
return SM_VERSION_STRING;
}
IProfiler *SourcePawnEngine2::GetProfiler()
sourcepawn/jit/version.rc
+4 -4
View File
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION SM_FILE_VERSION
PRODUCTVERSION SM_FILE_VERSION
FILEVERSION SM_VERSION_FILE
PRODUCTVERSION SM_VERSION_FILE
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -46,12 +46,12 @@ BEGIN
BEGIN
VALUE "Comments", "SourcePawn JIT"
VALUE "FileDescription", "SourcePawn JIT/Virtual Machine"
VALUE "FileVersion", SM_FULL_VERSION
VALUE "FileVersion", SM_VERSION_STRING
VALUE "InternalName", "sourcemod"
VALUE "LegalCopyright", "Copyright (c) 2004-2008, AlliedModders LLC"
VALUE "OriginalFilename", "sourcepawn.jit.x86.dll"
VALUE "ProductName", "SourcePawn JIT"
VALUE "ProductVersion", SM_FULL_VERSION
VALUE "ProductVersion", SM_VERSION_STRING
END
END
BLOCK "VarFileInfo"