From 98bf124013821d85fa2fd1058f3ebbd3833358bd Mon Sep 17 00:00:00 2001
From: David Anderson <dvander@alliedmods.net>
Date: Tue, 15 May 2007 04:59:48 +0000
Subject: [PATCH] compiler now gets its own versioning, finally

--HG--
extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/trunk%40805
---
 modules.versions                        |  5 +++++
 sourcepawn/compiler/libpawnc.rc         | 13 +++++-------
 sourcepawn/compiler/msvc8/spcomp.vcproj |  4 ++++
 sourcepawn/compiler/sc1.c               |  4 ++--
 sourcepawn/compiler/svn_version.h       | 28 ++++++++++++++++++-------
 sourcepawn/compiler/svn_version.tpl     | 25 ++++++++++++++++++++++
 6 files changed, 62 insertions(+), 17 deletions(-)
 create mode 100644 sourcepawn/compiler/svn_version.tpl

diff --git a/modules.versions b/modules.versions
index d1197ce5..d6fc94e8 100644
--- a/modules.versions
+++ b/modules.versions
@@ -27,3 +27,8 @@ out = svn_version.h
 folder = extensions/threader
 in = svn_version.tpl
 out = svn_version.h
+
+[compiler]
+folder = sourcepawn/compiler
+in = svn_version.tpl
+out = svn_version.h
diff --git a/sourcepawn/compiler/libpawnc.rc b/sourcepawn/compiler/libpawnc.rc
index d486738d..f84f9c93 100644
--- a/sourcepawn/compiler/libpawnc.rc
+++ b/sourcepawn/compiler/libpawnc.rc
@@ -13,17 +13,14 @@ AppIcon ICON "pawn.ico"
  *  All strings MUST have an explicit \0. See the Windows SDK documentation
  *  for details on version information and the VERSIONINFO structure.
  */
-#define VERSION              1
-#define REVISION             0
-#define BUILD                SVN_REVISION
-#define VERSIONSTR           SVN_REVISION_STRING
+
 #define VERSIONNAME          "smcomp.exe\0"
 #define VERSIONDESCRIPTION   "SourcePawn Compiler\0"
 #define VERSIONPRODUCTNAME   "smcomp\0"
 
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION    VERSION, REVISION, BUILD, 0
-PRODUCTVERSION VERSION, REVISION, BUILD, 0
+FILEVERSION    SVN_FILE_VERSION
+PRODUCTVERSION SVN_FILE_VERSION
 FILEFLAGSMASK  0x0000003FL
 FILEFLAGS      0
 #if defined(WIN32)
@@ -39,12 +36,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName",      "(C)1998-2006 ITB CompuPhase, AlliedModders LLC\0"
             VALUE "FileDescription",  VERSIONDESCRIPTION
-            VALUE "FileVersion",      VERSIONSTR
+            VALUE "FileVersion",      SVN_FULL_VERSION
             VALUE "InternalName",     VERSIONNAME
             VALUE "LegalCopyright",   "(C)1998-2006 ITB CompuPhase, AlliedModders LLC\0"
             VALUE "OriginalFilename", VERSIONNAME
             VALUE "ProductName",      VERSIONPRODUCTNAME
-            VALUE "ProductVersion",   VERSIONSTR
+            VALUE "ProductVersion",   SVN_FULL_VERSION
         END
     END
 
diff --git a/sourcepawn/compiler/msvc8/spcomp.vcproj b/sourcepawn/compiler/msvc8/spcomp.vcproj
index 8d1fa240..84416348 100644
--- a/sourcepawn/compiler/msvc8/spcomp.vcproj
+++ b/sourcepawn/compiler/msvc8/spcomp.vcproj
@@ -330,6 +330,10 @@
 				RelativePath="..\sc7.scp"
 				>
 			</File>
+			<File
+				RelativePath="..\svn_version.tpl"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="zlib"
diff --git a/sourcepawn/compiler/sc1.c b/sourcepawn/compiler/sc1.c
index 6202762e..c74a4a81 100644
--- a/sourcepawn/compiler/sc1.c
+++ b/sourcepawn/compiler/sc1.c
@@ -1180,8 +1180,8 @@ static void setconfig(char *root)
 
 static void setcaption(void)
 {
-  pc_printf("SourcePawn Compiler 1.0.0." SVN_REVISION_STRING "\n");
-  pc_printf("Copyright (c) 1997-2006, ITB CompuPhase, (C)2004-2006 AlliedModders, LLC\n\n");
+  pc_printf("SourcePawn Compiler " SVN_FULL_VERSION "\n");
+  pc_printf("Copyright (c) 1997-2006, ITB CompuPhase, (C)2004-2007 AlliedModders, LLC\n\n");
 }
 
 static void about(void)
diff --git a/sourcepawn/compiler/svn_version.h b/sourcepawn/compiler/svn_version.h
index caa6d95a..ac9f1a94 100644
--- a/sourcepawn/compiler/svn_version.h
+++ b/sourcepawn/compiler/svn_version.h
@@ -1,11 +1,25 @@
-/** This file is autogenerated by build scripts */
+/**
+ * vim: set ts=4 :
+ * ===============================================================
+ * SourceMod (C)2004-2007 AlliedModders LLC.  All rights reserved.
+ * ===============================================================
+ *
+ * This file is not open source and may not be copied without explicit
+ * written permission of AlliedModders LLC.  This file may not be redistributed 
+ * in whole or significant part.
+ * For information, see LICENSE.txt or http://www.sourcemod.net/license.php
+ *
+ * Version: $Id$
+ */
 
-#ifndef _INCLUDE_SVN_VERSION_H_
-#define _INCLUDE_SVN_VERSION_H_
+#ifndef _INCLUDE_SOURCEMOD_VERSION_H_
+#define _INCLUDE_SOURCEMOD_VERSION_H_
 
-#define SVN_REVISION			416
-#define SVN_REVISION_STRING	"416"
-#define SVN_FILE_VERSION		1,0,0,416
+/**
+ * @file Contains SourceMod version information.
+ */
 
-#endif //_INCLUDE_SVN_VERSION_H_
+#define SVN_FULL_VERSION	"1.0.0.800"
+#define SVN_FILE_VERSION	1,0,0,800
 
+#endif //_INCLUDE_SOURCEMOD_VERSION_H_
diff --git a/sourcepawn/compiler/svn_version.tpl b/sourcepawn/compiler/svn_version.tpl
new file mode 100644
index 00000000..ffe8001d
--- /dev/null
+++ b/sourcepawn/compiler/svn_version.tpl
@@ -0,0 +1,25 @@
+/**
+ * vim: set ts=4 :
+ * ===============================================================
+ * SourceMod (C)2004-2007 AlliedModders LLC.  All rights reserved.
+ * ===============================================================
+ *
+ * This file is not open source and may not be copied without explicit
+ * written permission of AlliedModders LLC.  This file may not be redistributed 
+ * in whole or significant part.
+ * For information, see LICENSE.txt or http://www.sourcemod.net/license.php
+ *
+ * Version: $Id$
+ */
+
+#ifndef _INCLUDE_SOURCEMOD_VERSION_H_
+#define _INCLUDE_SOURCEMOD_VERSION_H_
+
+/**
+ * @file Contains SourceMod version information.
+ */
+
+#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$.$GLOBAL_BUILD$"
+#define SVN_FILE_VERSION	$PMAJOR$,$PMINOR$,$PREVISION$,$GLOBAL_BUILD$
+
+#endif //_INCLUDE_SOURCEMOD_VERSION_H_