From 3f993f695c25e39088d037dd6c49cf6d4d0bda0f Mon Sep 17 00:00:00 2001 From: David Walter Seikel Date: Thu, 11 Apr 2013 07:14:34 +1000 Subject: Bump version number to 1.4.0.3 exp 0. TODO - still too much hard coding going on, need to fix that using viewer_info.py more. --- .../windows/imprudence_installer_script_experimental.iss | 12 ++++++------ .../newview/packaging/mac/English.lproj/InfoPlist.strings | 4 ++-- linden/indra/newview/res/viewerRes.rc | 4 ++-- linden/indra/newview/viewerinfo.cpp | 3 ++- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/linden/indra/newview/installers/windows/imprudence_installer_script_experimental.iss b/linden/indra/newview/installers/windows/imprudence_installer_script_experimental.iss index c551919..d50957d 100644 --- a/linden/indra/newview/installers/windows/imprudence_installer_script_experimental.iss +++ b/linden/indra/newview/installers/windows/imprudence_installer_script_experimental.iss @@ -9,15 +9,15 @@ ; These will change AppId={{1B3E68BC-13EB-4277-9439-CB5FF9259460} AppName=Imprudence Viewer Experimental -AppVerName=Imprudence Viewer 1.4.0 beta 1.5 windows test release +AppVerName=Imprudence Viewer 1.4.0.3 exp 0 windows test release DefaultDirName={pf}\ImprudenceExperimental DefaultGroupName=Imprudence Viewer Experimental VersionInfoProductName=Imprudence Viewer Experimental -OutputBaseFilename=Imprudence-1.4.0-beta-1.5-windows-test -VersionInfoVersion=1.4.0 -VersionInfoTextVersion=1.4.0 -VersionInfoProductVersion=1.4.0 -AppVersion=1.4.0 +OutputBaseFilename=Imprudence-1.4.0.3-exp-0-windows-test +VersionInfoVersion=1.4.0.3 +VersionInfoTextVersion=1.4.0.3 +VersionInfoProductVersion=1.4.0.3 +AppVersion=1.4.0.3 VersionInfoCopyright=2011 ; These won't change diff --git a/linden/indra/newview/packaging/mac/English.lproj/InfoPlist.strings b/linden/indra/newview/packaging/mac/English.lproj/InfoPlist.strings index 1ebe727..91eae98 100644 --- a/linden/indra/newview/packaging/mac/English.lproj/InfoPlist.strings +++ b/linden/indra/newview/packaging/mac/English.lproj/InfoPlist.strings @@ -1,5 +1,5 @@ /* Localized versions of Info.plist keys */ CFBundleName = "Imprudence"; -CFBundleShortVersionString = "Imprudence 1.4.0 beta 1"; -CFBundleGetInfoString = "Imprudence 1.4.0 beta 1"; +CFBundleShortVersionString = "Imprudence 1.4.0.3 exp 0"; +CFBundleGetInfoString = "Imprudence 1.4.0.3 exp 0"; diff --git a/linden/indra/newview/res/viewerRes.rc b/linden/indra/newview/res/viewerRes.rc index 951d0cc..4144e47 100644 --- a/linden/indra/newview/res/viewerRes.rc +++ b/linden/indra/newview/res/viewerRes.rc @@ -156,11 +156,11 @@ BEGIN BEGIN VALUE "CompanyName", "Imprudence Viewer Project" VALUE "FileDescription", "Imprudence" - VALUE "FileVersion", "1.4.0 beta 2" + VALUE "FileVersion", "1.4.0.3 exp 0" VALUE "InternalName", "Imprudence" VALUE "OriginalFilename", "imprudence.exe" VALUE "ProductName", "Imprudence" - VALUE "ProductVersion", "1.4.0 beta 2" + VALUE "ProductVersion", "1.4.0.3 exp 0" END END BLOCK "VarFileInfo" diff --git a/linden/indra/newview/viewerinfo.cpp b/linden/indra/newview/viewerinfo.cpp index fc463c8..d1ed1a0 100644 --- a/linden/indra/newview/viewerinfo.cpp +++ b/linden/indra/newview/viewerinfo.cpp @@ -30,13 +30,14 @@ namespace ViewerInfo // These are intentionally defined here instead of in the header, // because they should NOT be read directly. Use the functions. + // NOTE: Some parts of the build system scan this file looking for version numbers and such, commenting out sections confuses that. const std::string NAME = "Imprudence"; const std::string VARNT = ""; const S32 MAJOR = 1; const S32 MINOR = 4; const S32 PATCH = 0; const S32 RLEAS = 3; // increment for each beta/RC/release - const std::string EXTRA = "beta 2"; + const std::string EXTRA = "exp 0"; // Mac OS X bundle identifier. Should match the one in Info.plist. const std::string BUNDLE_ID = "org.imprudenceviewer.viewer"; -- cgit v1.1