From 7183797e05050a832321df6338cf270071289fe0 Mon Sep 17 00:00:00 2001
From: Latif Khalifa <latifer@streamgrid.net>
Date: Mon, 18 Nov 2013 23:40:19 +0100
Subject: [PATCH] Autogenerated versioned windows resource files

---
 .gitignore                                           |  2 ++
 indra/cmake/BuildVersion.cmake                       | 12 ++++++++++++
 indra/newview/res/{viewerRes.rc => viewerRes.rc.in}  |  8 ++++----
 .../res/{viewerRes_bc.rc => viewerRes_bc.rc.in}      |  8 ++++----
 4 files changed, 22 insertions(+), 8 deletions(-)
 rename indra/newview/res/{viewerRes.rc => viewerRes.rc.in} (95%)
 rename indra/newview/res/{viewerRes_bc.rc => viewerRes_bc.rc.in} (95%)

diff --git a/.gitignore b/.gitignore
index 4f9405a16..29e8fd76f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,5 @@ qtcreator-build/
 /.pc
 /build-*
 /viewer-*
+/indra/newview/res/viewerRes.rc
+/indra/newview/res/viewerRes_bc.rc
\ No newline at end of file
diff --git a/indra/cmake/BuildVersion.cmake b/indra/cmake/BuildVersion.cmake
index 041927f10..b85f77198 100644
--- a/indra/cmake/BuildVersion.cmake
+++ b/indra/cmake/BuildVersion.cmake
@@ -33,6 +33,18 @@ configure_file(
     ${CMAKE_SOURCE_DIR}/llcommon/llversionviewer.h
 )
 
+if (WINDOWS)
+   configure_file(
+       ${CMAKE_SOURCE_DIR}/newview/res/viewerRes.rc.in
+       ${CMAKE_SOURCE_DIR}/newview/res/viewerRes.rc
+   )
+   
+   configure_file(
+       ${CMAKE_SOURCE_DIR}/newview/res/viewerRes_bc.rc.in
+       ${CMAKE_SOURCE_DIR}/newview/res/viewerRes_bc.rc
+   )
+endif (WINDOWS)
+
 # Compose the version.
 set(viewer_VERSION "${vMAJOR}.${vMINOR}.${vPATCH}.${vBUILD}")
 if (viewer_VERSION MATCHES "^[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+$")
diff --git a/indra/newview/res/viewerRes.rc b/indra/newview/res/viewerRes.rc.in
similarity index 95%
rename from indra/newview/res/viewerRes.rc
rename to indra/newview/res/viewerRes.rc.in
index 6e492ae15..0ca054f5a 100644
--- a/indra/newview/res/viewerRes.rc
+++ b/indra/newview/res/viewerRes.rc.in
@@ -138,8 +138,8 @@ TOOLMEDIAOPEN           CURSOR                  "toolmediaopen.cur"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,8,4,5433
- PRODUCTVERSION 1,8,4,5433
+ FILEVERSION ${vMAJOR},${vMINOR},${vPATCH},${vBUILD}
+ PRODUCTVERSION ${vMAJOR},${vMINOR},${vPATCH},${vBUILD}
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -156,12 +156,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Siana Gearz"
             VALUE "FileDescription", "Singularity Viewer"
-            VALUE "FileVersion", "1.8.4.5433"
+            VALUE "FileVersion", "${vMAJOR}.${vMINOR}.${vPATCH}.${vBUILD}"
             VALUE "InternalName", "Second Life"
             VALUE "LegalCopyright", "Copyright © 2001-2010, Linden Research, Inc., Copyright 2010 Siana Gearz"
             VALUE "OriginalFilename", "SingularityViewer.exe"
             VALUE "ProductName", "Singularity Viewer"
-            VALUE "ProductVersion", "1.8.4.5433"
+            VALUE "ProductVersion", "${vMAJOR}.${vMINOR}.${vPATCH}.${vBUILD}"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/indra/newview/res/viewerRes_bc.rc b/indra/newview/res/viewerRes_bc.rc.in
similarity index 95%
rename from indra/newview/res/viewerRes_bc.rc
rename to indra/newview/res/viewerRes_bc.rc.in
index 7827f7ded..a9bdd7c8d 100644
--- a/indra/newview/res/viewerRes_bc.rc
+++ b/indra/newview/res/viewerRes_bc.rc.in
@@ -138,8 +138,8 @@ TOOLMEDIAOPEN           CURSOR                  "toolmediaopen.cur"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,8,4,5433
- PRODUCTVERSION 1,8,4,5433
+ FILEVERSION ${vMAJOR},${vMINOR},${vPATCH},${vBUILD}
+ PRODUCTVERSION ${vMAJOR},${vMINOR},${vPATCH},${vBUILD}
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -156,12 +156,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Siana Gearz"
             VALUE "FileDescription", "Singularity Viewer"
-            VALUE "FileVersion", "1.8.4.5433"
+            VALUE "FileVersion", "${vMAJOR}.${vMINOR}.${vPATCH}.${vBUILD}"
             VALUE "InternalName", "Second Life"
             VALUE "LegalCopyright", "Copyright © 2001-2010, Linden Research, Inc., Copyright 2010 Siana Gearz"
             VALUE "OriginalFilename", "SingularityViewer.exe"
             VALUE "ProductName", "Singularity Viewer"
-            VALUE "ProductVersion", "1.8.4.5433"
+            VALUE "ProductVersion", "${vMAJOR}.${vMINOR}.${vPATCH}.${vBUILD}"
         END
     END
     BLOCK "VarFileInfo"