new versioning stuff
authorDavid Anderson <dvander@alliedmods.net>
Sat Mar 03 07:50:01 2007 +0000 (2007-03-03)
changeset 5667640076104f5
parent 565 343e1ea4eae2
child 567 38cd0381710e
new versioning stuff
core/CLogger.cpp
core/msvc8/sourcemod_mm.vcproj
core/sm_srvcmds.cpp
core/sm_version.h
core/sm_version.tpl
core/sourcemm_api.cpp
core/svn_version.h
core/version.rc
modules.versions
sourcepawn/jit/x86/jit_version.h
sourcepawn/jit/x86/jit_version.tpl
sourcepawn/jit/x86/jit_x86.cpp
sourcepawn/jit/x86/msvc8/jit-x86.vcproj
sourcepawn/jit/x86/svn_version.h
sourcepawn/jit/x86/version.rc
     1.1 --- a/core/CLogger.cpp	Sat Mar 03 00:56:01 2007 +0000
     1.2 +++ b/core/CLogger.cpp	Sat Mar 03 07:50:01 2007 +0000
     1.3 @@ -71,7 +71,7 @@
     1.4  	} else {
     1.5  		char date[32];
     1.6  		strftime(date, sizeof(date), "%m/%d/%Y - %H:%M:%S", curtime);
     1.7 -		fprintf(fp, "L %s: SourceMod log file started (file \"logs_%02d%02d%03d.log\") (Version \"%s\")\n", date, curtime->tm_mon + 1, curtime->tm_mday, i, SOURCEMOD_VERSION);
     1.8 +		fprintf(fp, "L %s: SourceMod log file started (file \"logs_%02d%02d%03d.log\") (Version \"%s\")\n", date, curtime->tm_mon + 1, curtime->tm_mday, i, SVN_FULL_VERSION);
     1.9  		fclose(fp);
    1.10  	}
    1.11  }
    1.12 @@ -218,8 +218,8 @@
    1.13  		if (m_DailyPrintHdr)
    1.14  		{
    1.15  			m_DailyPrintHdr = false;
    1.16 -			fprintf(fp, "L %s: SourceMod log file session started (file \"logs_%02d%02d.log\") (Version \"%s\")\n", date, curtime->tm_mon + 1, curtime->tm_mday, SOURCEMOD_VERSION);
    1.17 -		}
    1.18 +			fprintf(fp, "L %s: SourceMod log file session started (file \"logs_%02d%02d.log\") (Version \"%s\")\n", date, curtime->tm_mon + 1, curtime->tm_mday, SVN_FULL_VERSION);
    1.19 +	 	}
    1.20  		fprintf(fp, "L %s: %s\n", date, msg);
    1.21  		fclose(fp);
    1.22  	} else {
     2.1 --- a/core/msvc8/sourcemod_mm.vcproj	Sat Mar 03 00:56:01 2007 +0000
     2.2 +++ b/core/msvc8/sourcemod_mm.vcproj	Sat Mar 03 07:50:01 2007 +0000
     2.3 @@ -357,10 +357,6 @@
     2.4  				RelativePath="..\sourcemod.h"
     2.5  				>
     2.6  			</File>
     2.7 -			<File
     2.8 -				RelativePath="..\svn_version.h"
     2.9 -				>
    2.10 -			</File>
    2.11  		</Filter>
    2.12  		<Filter
    2.13  			Name="Interfaces"
     3.1 --- a/core/sm_srvcmds.cpp	Sat Mar 03 00:56:01 2007 +0000
     3.2 +++ b/core/sm_srvcmds.cpp	Sat Mar 03 07:50:01 2007 +0000
     3.3 @@ -17,7 +17,7 @@
     3.4  
     3.5  RootConsoleMenu g_RootMenu;
     3.6  
     3.7 -ConVar sourcemod_version("sourcemod_version", SOURCEMOD_VERSION, FCVAR_SPONLY|FCVAR_REPLICATED|FCVAR_NOTIFY, "SourceMod Version");
     3.8 +ConVar sourcemod_version("sourcemod_version", SVN_FULL_VERSION, FCVAR_SPONLY|FCVAR_REPLICATED|FCVAR_NOTIFY, "SourceMod Version");
     3.9  
    3.10  RootConsoleMenu::RootConsoleMenu()
    3.11  {
    3.12 @@ -223,7 +223,7 @@
    3.13  		ConsolePrint(" http://www.sourcemod.net/");
    3.14  	} else if (strcmp(cmd, "version") == 0) {
    3.15  		ConsolePrint(" SourceMod Version Information:");
    3.16 -		ConsolePrint("    SourceMod Version: %s", SOURCEMOD_VERSION);
    3.17 +		ConsolePrint("    SourceMod Version: %s", SVN_FULL_VERSION);
    3.18  		ConsolePrint("    JIT Version: %s, %s", g_pVM->GetVMName(), g_pVM->GetVersionString());
    3.19  		ConsolePrint("    JIT Settings: %s", g_pVM->GetCPUOptimizations());
    3.20  		ConsolePrint("    http://www.sourcemod.net/");
     4.1 --- a/core/sm_version.h	Sat Mar 03 00:56:01 2007 +0000
     4.2 +++ b/core/sm_version.h	Sat Mar 03 07:50:01 2007 +0000
     4.3 @@ -18,13 +18,7 @@
     4.4   * @file Contains SourceMod version information.
     4.5   */
     4.6  
     4.7 -#include "svn_version.h"
     4.8 -
     4.9 -#define SOURCEMOD_V_MAJOR	1
    4.10 -#define SOURCEMOD_V_MINOR	0
    4.11 -#define SOURCEMOD_V_REV		0
    4.12 -
    4.13 -#define SOURCEMOD_VERSION	"1.0.0." SVN_REVISION_STRING
    4.14 -#define SOURCEMOD_FILEVERS	1,0,0,0
    4.15 +#define SVN_FULL_VERSION	"1.0.0.571"
    4.16 +#define SVN_FILE_VERSION	1,0,0,571
    4.17  
    4.18  #endif //_INCLUDE_SOURCEMOD_VERSION_H_
     5.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.2 +++ b/core/sm_version.tpl	Sat Mar 03 07:50:01 2007 +0000
     5.3 @@ -0,0 +1,24 @@
     5.4 +/**
     5.5 + * ===============================================================
     5.6 + * SourceMod (C)2004-2007 AlliedModders LLC.  All rights reserved.
     5.7 + * ===============================================================
     5.8 + *
     5.9 + * This file is not open source and may not be copied without explicit
    5.10 + * written permission of AlliedModders LLC.  This file may not be redistributed 
    5.11 + * in whole or significant part.
    5.12 + * For information, see LICENSE.txt or http://www.sourcemod.net/license.php
    5.13 + *
    5.14 + * Version: $Id$
    5.15 + */
    5.16 +
    5.17 +#ifndef _INCLUDE_SOURCEMOD_VERSION_H_
    5.18 +#define _INCLUDE_SOURCEMOD_VERSION_H_
    5.19 +
    5.20 +/**
    5.21 + * @file Contains SourceMod version information.
    5.22 + */
    5.23 +
    5.24 +#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$.$GLOBAL_BUILD$"
    5.25 +#define SVN_FILE_VERSION	$PMAJOR$,$PMINOR$,$PREVISION$,$GLOBAL_BUILD$
    5.26 +
    5.27 +#endif //_INCLUDE_SOURCEMOD_VERSION_H_
     6.1 --- a/core/sourcemm_api.cpp	Sat Mar 03 00:56:01 2007 +0000
     6.2 +++ b/core/sourcemm_api.cpp	Sat Mar 03 07:50:01 2007 +0000
     6.3 @@ -102,7 +102,7 @@
     6.4  
     6.5  const char *SourceMod_Core::GetVersion()
     6.6  {
     6.7 -	return SOURCEMOD_VERSION;
     6.8 +	return SVN_FULL_VERSION;
     6.9  }
    6.10  
    6.11  const char *SourceMod_Core::GetDate()
     7.1 --- a/core/svn_version.h	Sat Mar 03 00:56:01 2007 +0000
     7.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     7.3 @@ -1,11 +0,0 @@
     7.4 -/** This file is autogenerated by build scripts */
     7.5 -
     7.6 -#ifndef _INCLUDE_SVN_VERSION_H_
     7.7 -#define _INCLUDE_SVN_VERSION_H_
     7.8 -
     7.9 -#define SVN_REVISION			468
    7.10 -#define SVN_REVISION_STRING	"468"
    7.11 -#define SVN_FILE_VERSION		1,0,0,468
    7.12 -
    7.13 -#endif //_INCLUDE_SVN_VERSION_H_
    7.14 -
     8.1 --- a/core/version.rc	Sat Mar 03 00:56:01 2007 +0000
     8.2 +++ b/core/version.rc	Sat Mar 03 07:50:01 2007 +0000
     8.3 @@ -47,12 +47,12 @@
     8.4          BEGIN
     8.5              VALUE "Comments", "SourceMod"
     8.6              VALUE "FileDescription", "SourceMod Core"
     8.7 -            VALUE "FileVersion", SVN_REVISION_STRING
     8.8 +            VALUE "FileVersion", SVN_FULL_VERSION
     8.9              VALUE "InternalName", "sourcemod"
    8.10              VALUE "LegalCopyright", "Copyright (c) 2004-2007, AlliedModders LLC"
    8.11              VALUE "OriginalFilename", "sourcemod_mm.dll"
    8.12              VALUE "ProductName", "SourceMod"
    8.13 -            VALUE "ProductVersion", SOURCEMOD_VERSION
    8.14 +            VALUE "ProductVersion", SVN_FULL_VERSION
    8.15          END
    8.16      END
    8.17      BLOCK "VarFileInfo"
     9.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     9.2 +++ b/modules.versions	Sat Mar 03 07:50:01 2007 +0000
     9.3 @@ -0,0 +1,14 @@
     9.4 +[PRODUCT]
     9.5 +major = 1
     9.6 +minor = 0
     9.7 +revision = 0
     9.8 +
     9.9 +[core]
    9.10 +folder = core
    9.11 +in = sm_version.tpl
    9.12 +out = sm_version.h
    9.13 +
    9.14 +[jitx86]
    9.15 +folder = sourcepawn/jit/x86
    9.16 +in = jit_version.tpl
    9.17 +out = jit_version.h
    10.1 --- a/sourcepawn/jit/x86/jit_version.h	Sat Mar 03 00:56:01 2007 +0000
    10.2 +++ b/sourcepawn/jit/x86/jit_version.h	Sat Mar 03 07:50:01 2007 +0000
    10.3 @@ -15,8 +15,7 @@
    10.4  #ifndef _INCLUDE_JIT_VERSION_H_
    10.5  #define _INCLUDE_JIT_VERSION_H_
    10.6  
    10.7 -#include "svn_version.h"
    10.8 -
    10.9 -#define JIT_VERSION			"1.0.0." SVN_REVISION_STRING
   10.10 +#define SVN_FULL_VERSION	"1.0.0.431"
   10.11 +#define SVN_FILE_VERSION	1,0,0,431
   10.12  
   10.13  #endif //_INCLUDE_JIT_VERSION_H_
    11.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    11.2 +++ b/sourcepawn/jit/x86/jit_version.tpl	Sat Mar 03 07:50:01 2007 +0000
    11.3 @@ -0,0 +1,21 @@
    11.4 +/**
    11.5 + * ================================================================
    11.6 + * SourcePawn (C)2004-2007 AlliedModders LLC.  All rights reserved.
    11.7 + * ================================================================
    11.8 + *
    11.9 + * This file is not open source and may not be copied without explicit
   11.10 + * written permission of AlliedModders LLC.  This file may not be redistributed 
   11.11 + * in whole or significant part.
   11.12 + * For information, see LICENSE.txt or http://www.sourcemod.net/license.php
   11.13 + *
   11.14 + * Version: $Id$
   11.15 + */
   11.16 +
   11.17 +
   11.18 +#ifndef _INCLUDE_JIT_VERSION_H_
   11.19 +#define _INCLUDE_JIT_VERSION_H_
   11.20 +
   11.21 +#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$.$LOCAL_BUILD$"
   11.22 +#define SVN_FILE_VERSION	$PMAJOR$,$PMINOR$,$PREVISION$,$LOCAL_BUILD$
   11.23 +
   11.24 +#endif //_INCLUDE_JIT_VERSION_H_
    12.1 --- a/sourcepawn/jit/x86/jit_x86.cpp	Sat Mar 03 00:56:01 2007 +0000
    12.2 +++ b/sourcepawn/jit/x86/jit_x86.cpp	Sat Mar 03 07:50:01 2007 +0000
    12.3 @@ -2332,7 +2332,7 @@
    12.4  
    12.5  const char *JITX86::GetVersionString()
    12.6  {
    12.7 -	return JIT_VERSION;
    12.8 +	return SVN_FULL_VERSION;
    12.9  }
   12.10  
   12.11  const char *JITX86::GetCPUOptimizations()
    13.1 --- a/sourcepawn/jit/x86/msvc8/jit-x86.vcproj	Sat Mar 03 00:56:01 2007 +0000
    13.2 +++ b/sourcepawn/jit/x86/msvc8/jit-x86.vcproj	Sat Mar 03 07:50:01 2007 +0000
    13.3 @@ -221,10 +221,6 @@
    13.4  				>
    13.5  			</File>
    13.6  			<File
    13.7 -				RelativePath="..\svn_version.h"
    13.8 -				>
    13.9 -			</File>
   13.10 -			<File
   13.11  				RelativePath="..\ungen_opcodes.h"
   13.12  				>
   13.13  			</File>
    14.1 --- a/sourcepawn/jit/x86/svn_version.h	Sat Mar 03 00:56:01 2007 +0000
    14.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    14.3 @@ -1,11 +0,0 @@
    14.4 -/** This file is autogenerated by build scripts */
    14.5 -
    14.6 -#ifndef _INCLUDE_SVN_VERSION_H_
    14.7 -#define _INCLUDE_SVN_VERSION_H_
    14.8 -
    14.9 -#define SVN_REVISION			408
   14.10 -#define SVN_REVISION_STRING	"408"
   14.11 -#define SVN_FILE_VERSION		1,0,0,408
   14.12 -
   14.13 -#endif //_INCLUDE_SVN_VERSION_H_
   14.14 -
    15.1 --- a/sourcepawn/jit/x86/version.rc	Sat Mar 03 00:56:01 2007 +0000
    15.2 +++ b/sourcepawn/jit/x86/version.rc	Sat Mar 03 07:50:01 2007 +0000
    15.3 @@ -46,12 +46,12 @@
    15.4          BEGIN
    15.5              VALUE "Comments", "SourcePawn JIT"
    15.6              VALUE "FileDescription", "SourcePawn JIT/Virtual Machine"
    15.7 -            VALUE "FileVersion", SVN_REVISION_STRING
    15.8 +            VALUE "FileVersion", SVN_FULL_VERSION
    15.9              VALUE "InternalName", "sourcemod"
   15.10              VALUE "LegalCopyright", "Copyright (c) 2004-2007, AlliedModders LLC"
   15.11              VALUE "OriginalFilename", "sourcepawn.jit.x86.dll"
   15.12              VALUE "ProductName", "SourcePawn JIT"
   15.13 -            VALUE "ProductVersion", JIT_VERSION
   15.14 +            VALUE "ProductVersion", SVN_FULL_VERSION
   15.15          END
   15.16      END
   15.17      BLOCK "VarFileInfo"