diff options
Diffstat (limited to 'system/runtime/nsAppRunner.cpp')
-rw-r--r-- | system/runtime/nsAppRunner.cpp | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/system/runtime/nsAppRunner.cpp b/system/runtime/nsAppRunner.cpp index 4071e7730..e0e9885ff 100644 --- a/system/runtime/nsAppRunner.cpp +++ b/system/runtime/nsAppRunner.cpp @@ -175,7 +175,8 @@ extern void InstallSignalHandlers(const char *ProgramName); int gArgc; char **gArgv; -static const char gToolkitVersion[] = NS_STRINGIFY(GRE_MILESTONE); +static const char gToolkitVersion[] = "52.9.0"; +static const char gRuntimeVersion[] = NS_STRINGIFY(GRE_MILESTONE); static const char gToolkitBuildID[] = NS_STRINGIFY(MOZ_BUILDID); static nsIProfileLock* gProfileLock; @@ -684,6 +685,14 @@ nsXULAppInfo::GetVersion(nsACString& aResult) } NS_IMETHODIMP +nsXULAppInfo::GetRuntimeVersion(nsACString& aResult) +{ + aResult.Assign(gRuntimeVersion); + + return NS_OK; +} + +NS_IMETHODIMP nsXULAppInfo::GetPlatformVersion(nsACString& aResult) { aResult.Assign(gToolkitVersion); @@ -2800,11 +2809,11 @@ XREMain::XRE_mainInit(bool* aExitFlag) SetAllocatedString(mAppData->maxVersion, "1.*"); } - if (mozilla::Version(mAppData->minVersion) > gToolkitVersion || - mozilla::Version(mAppData->maxVersion) < gToolkitVersion) { - Output(true, "Error: Platform version '%s' is not compatible with\n" + if (mozilla::Version(mAppData->minVersion) > gRuntimeVersion || + mozilla::Version(mAppData->maxVersion) < gRuntimeVersion) { + Output(true, "Error: Runtime version '%s' is not compatible with\n" "minVersion >= %s\nmaxVersion <= %s\n", - gToolkitVersion, + gRuntimeVersion, mAppData->minVersion, mAppData->maxVersion); return 1; } |