aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra
diff options
context:
space:
mode:
authorDavid Walter Seikel2013-04-11 07:14:34 +1000
committerDavid Walter Seikel2013-04-11 07:14:34 +1000
commit3f993f695c25e39088d037dd6c49cf6d4d0bda0f (patch)
tree7b227a00b0340ee1796bb95ff35d7abfbd40a8f4 /linden/indra
parentAdd release number to version strings. (diff)
downloadmeta-impy-3f993f695c25e39088d037dd6c49cf6d4d0bda0f.zip
meta-impy-3f993f695c25e39088d037dd6c49cf6d4d0bda0f.tar.gz
meta-impy-3f993f695c25e39088d037dd6c49cf6d4d0bda0f.tar.bz2
meta-impy-3f993f695c25e39088d037dd6c49cf6d4d0bda0f.tar.xz
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.
Diffstat (limited to 'linden/indra')
-rw-r--r--linden/indra/newview/installers/windows/imprudence_installer_script_experimental.iss12
-rw-r--r--linden/indra/newview/packaging/mac/English.lproj/InfoPlist.strings4
-rw-r--r--linden/indra/newview/res/viewerRes.rc4
-rw-r--r--linden/indra/newview/viewerinfo.cpp3
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 @@
9; These will change 9; These will change
10AppId={{1B3E68BC-13EB-4277-9439-CB5FF9259460} 10AppId={{1B3E68BC-13EB-4277-9439-CB5FF9259460}
11AppName=Imprudence Viewer Experimental 11AppName=Imprudence Viewer Experimental
12AppVerName=Imprudence Viewer 1.4.0 beta 1.5 windows test release 12AppVerName=Imprudence Viewer 1.4.0.3 exp 0 windows test release
13DefaultDirName={pf}\ImprudenceExperimental 13DefaultDirName={pf}\ImprudenceExperimental
14DefaultGroupName=Imprudence Viewer Experimental 14DefaultGroupName=Imprudence Viewer Experimental
15VersionInfoProductName=Imprudence Viewer Experimental 15VersionInfoProductName=Imprudence Viewer Experimental
16OutputBaseFilename=Imprudence-1.4.0-beta-1.5-windows-test 16OutputBaseFilename=Imprudence-1.4.0.3-exp-0-windows-test
17VersionInfoVersion=1.4.0 17VersionInfoVersion=1.4.0.3
18VersionInfoTextVersion=1.4.0 18VersionInfoTextVersion=1.4.0.3
19VersionInfoProductVersion=1.4.0 19VersionInfoProductVersion=1.4.0.3
20AppVersion=1.4.0 20AppVersion=1.4.0.3
21VersionInfoCopyright=2011 21VersionInfoCopyright=2011
22 22
23; These won't change 23; 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 @@
1/* Localized versions of Info.plist keys */ 1/* Localized versions of Info.plist keys */
2 2
3CFBundleName = "Imprudence"; 3CFBundleName = "Imprudence";
4CFBundleShortVersionString = "Imprudence 1.4.0 beta 1"; 4CFBundleShortVersionString = "Imprudence 1.4.0.3 exp 0";
5CFBundleGetInfoString = "Imprudence 1.4.0 beta 1"; 5CFBundleGetInfoString = "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
156 BEGIN 156 BEGIN
157 VALUE "CompanyName", "Imprudence Viewer Project" 157 VALUE "CompanyName", "Imprudence Viewer Project"
158 VALUE "FileDescription", "Imprudence" 158 VALUE "FileDescription", "Imprudence"
159 VALUE "FileVersion", "1.4.0 beta 2" 159 VALUE "FileVersion", "1.4.0.3 exp 0"
160 VALUE "InternalName", "Imprudence" 160 VALUE "InternalName", "Imprudence"
161 VALUE "OriginalFilename", "imprudence.exe" 161 VALUE "OriginalFilename", "imprudence.exe"
162 VALUE "ProductName", "Imprudence" 162 VALUE "ProductName", "Imprudence"
163 VALUE "ProductVersion", "1.4.0 beta 2" 163 VALUE "ProductVersion", "1.4.0.3 exp 0"
164 END 164 END
165 END 165 END
166 BLOCK "VarFileInfo" 166 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
30 30
31 // These are intentionally defined here instead of in the header, 31 // These are intentionally defined here instead of in the header,
32 // because they should NOT be read directly. Use the functions. 32 // because they should NOT be read directly. Use the functions.
33 // NOTE: Some parts of the build system scan this file looking for version numbers and such, commenting out sections confuses that.
33 const std::string NAME = "Imprudence"; 34 const std::string NAME = "Imprudence";
34 const std::string VARNT = ""; 35 const std::string VARNT = "";
35 const S32 MAJOR = 1; 36 const S32 MAJOR = 1;
36 const S32 MINOR = 4; 37 const S32 MINOR = 4;
37 const S32 PATCH = 0; 38 const S32 PATCH = 0;
38 const S32 RLEAS = 3; // increment for each beta/RC/release 39 const S32 RLEAS = 3; // increment for each beta/RC/release
39 const std::string EXTRA = "beta 2"; 40 const std::string EXTRA = "exp 0";
40 41
41 // Mac OS X bundle identifier. Should match the one in Info.plist. 42 // Mac OS X bundle identifier. Should match the one in Info.plist.
42 const std::string BUNDLE_ID = "org.imprudenceviewer.viewer"; 43 const std::string BUNDLE_ID = "org.imprudenceviewer.viewer";