From 89de8e5b552b997335a429ad41f86e4200441b11 Mon Sep 17 00:00:00 2001
From: CG Linden <cg@lindenlab.com>
Date: Mon, 31 Aug 2009 13:26:35 -0700
Subject: [PATCH] Port over the new build scripts from para-test, tweek
update_version_files to use the repo revision number for now.
---
indra/llcommon/llversionserver.h | 2 +-
indra/llcommon/llversionviewer.h | 2 +-
indra/newview/English.lproj/InfoPlist.strings | 4 ++--
indra/newview/Info-SecondLife.plist | 2 +-
indra/newview/res/viewerRes.rc | 8 ++++----
scripts/update_version_files.py | 18 ++++++++++++++++--
6 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/indra/llcommon/llversionserver.h b/indra/llcommon/llversionserver.h
index 23e39ceb08..e9e21cffb6 100644
--- a/indra/llcommon/llversionserver.h
+++ b/indra/llcommon/llversionserver.h
@@ -36,7 +36,7 @@
const S32 LL_VERSION_MAJOR = 1;
const S32 LL_VERSION_MINOR = 29;
const S32 LL_VERSION_PATCH = 0;
-const S32 LL_VERSION_BUILD = 0;
+const S32 LL_VERSION_BUILD = 2425;
const char * const LL_CHANNEL = "Second Life Server";
diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h
index 45810a101d..04cf98ce19 100644
--- a/indra/llcommon/llversionviewer.h
+++ b/indra/llcommon/llversionviewer.h
@@ -36,7 +36,7 @@
const S32 LL_VERSION_MAJOR = 2;
const S32 LL_VERSION_MINOR = 0;
const S32 LL_VERSION_PATCH = 0;
-const S32 LL_VERSION_BUILD = 0;
+const S32 LL_VERSION_BUILD = 2425;
const char * const LL_CHANNEL = "Second Life 2009";
diff --git a/indra/newview/English.lproj/InfoPlist.strings b/indra/newview/English.lproj/InfoPlist.strings
index 735424c647..28853ba032 100644
--- a/indra/newview/English.lproj/InfoPlist.strings
+++ b/indra/newview/English.lproj/InfoPlist.strings
@@ -2,6 +2,6 @@
CFBundleName = "Second Life";
-CFBundleShortVersionString = "Second Life version 2.0.0.0";
-CFBundleGetInfoString = "Second Life version 2.0.0.0, Copyright 2004-2009 Linden Research, Inc.";
+CFBundleShortVersionString = "Second Life version 2.0.0.2425";
+CFBundleGetInfoString = "Second Life version 2.0.0.2425, Copyright 2004-2009 Linden Research, Inc.";
diff --git a/indra/newview/Info-SecondLife.plist b/indra/newview/Info-SecondLife.plist
index 7264044d37..c0a33feaec 100644
--- a/indra/newview/Info-SecondLife.plist
+++ b/indra/newview/Info-SecondLife.plist
@@ -32,7 +32,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
- <string>2.0.0.0</string>
+ <string>2.0.0.2425</string>
<key>CSResourcesFileMapped</key>
<true/>
</dict>
diff --git a/indra/newview/res/viewerRes.rc b/indra/newview/res/viewerRes.rc
index 87a8bd5787..a5ee78df2c 100644
--- a/indra/newview/res/viewerRes.rc
+++ b/indra/newview/res/viewerRes.rc
@@ -138,8 +138,8 @@ TOOLMEDIAOPEN CURSOR "toolmediaopen.cur"
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,0,0,0
- PRODUCTVERSION 2,0,0,0
+ FILEVERSION 2,0,0,2425
+ PRODUCTVERSION 2,0,0,2425
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -156,12 +156,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Linden Lab"
VALUE "FileDescription", "Second Life"
- VALUE "FileVersion", "2.0.0.0"
+ VALUE "FileVersion", "2.0.0.2425"
VALUE "InternalName", "Second Life"
VALUE "LegalCopyright", "Copyright © 2001-2008, Linden Research, Inc."
VALUE "OriginalFilename", "SecondLife.exe"
VALUE "ProductName", "Second Life"
- VALUE "ProductVersion", "2.0.0.0"
+ VALUE "ProductVersion", "2.0.0.2425"
END
END
BLOCK "VarFileInfo"
diff --git a/scripts/update_version_files.py b/scripts/update_version_files.py
index 9081941521..977b66253a 100755
--- a/scripts/update_version_files.py
+++ b/scripts/update_version_files.py
@@ -37,6 +37,8 @@ add_indra_lib_path()
import getopt, os, re, commands
from indra.util import llversion
+hg = os.path.expandvars("${HG}")
+if not hg or hg == "${HG}": hg = "hg"
svn = os.path.expandvars("${SVN}")
if not svn or svn == "${SVN}": svn = "svn"
@@ -152,6 +154,8 @@ re_map['indra/newview/English.lproj/InfoPlist.strings'] = \
version_re = re.compile('(\d+).(\d+).(\d+).(\d+)')
svn_branch_re = re.compile('^URL:\s+\S+/([^/\s]+)$', re.MULTILINE)
svn_revision_re = re.compile('^Last Changed Rev: (\d+)$', re.MULTILINE)
+hg_branch_re = re.compile('^.*_([^_\s]*)\s*$', re.MULTILINE)
+hg_revision_re = re.compile('^changeset:\s+(\d+):', re.MULTILINE)
def main():
script_path = os.path.dirname(__file__)
@@ -244,14 +248,24 @@ def main():
# Assume we're updating just the build number
cl = '%s info "%s"' % (svn, src_root)
status, output = _getstatusoutput(cl)
+ branch_match = None
+ revision_match = None
+ if status == 0:
+ branch_match = svn_branch_re.search(output)
+ revision_match = svn_revision_re.search(output)
+ else:
+ cl = '%s log --limit 1' % hg
+ status, output = _getstatusoutput(cl)
+ if status == 0:
+ branch_match = hg_branch_re.search(os.path.expandvars("${PARABUILD_BUILD_NAME}"))
+ revision_match = hg_revision_re.search(output)
+
if verbose:
print
print "svn info output:"
print "----------------"
print output
- branch_match = svn_branch_re.search(output)
- revision_match = svn_revision_re.search(output)
if not branch_match or not revision_match:
print "Failed to execute svn info, output follows:"
print output
--
GitLab