diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2022-04-10 02:50:54 -0500 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2022-04-10 02:50:54 -0500 |
| commit | 4ebc78682799bbb4e5e6c5d2f8477ef614c47756 (patch) | |
| tree | 74149292b13d15a5a5bd93d0687370319bd1e391 /system | |
| parent | d542034aafae711f6446536e086d734102997c46 (diff) | |
| download | aura-central-4ebc78682799bbb4e5e6c5d2f8477ef614c47756.tar.gz | |
Revert "No Issue - Hardcode XAI.platformVersion to 52.9.0 and add XAI.greVersion as the actual version"
This reverts commit 0c2396808491278981bec84e8998b29ec19d297d.
Diffstat (limited to 'system')
| -rw-r--r-- | system/runtime/nsAppRunner.cpp | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/system/runtime/nsAppRunner.cpp b/system/runtime/nsAppRunner.cpp index fe2c59479..32834580b 100644 --- a/system/runtime/nsAppRunner.cpp +++ b/system/runtime/nsAppRunner.cpp @@ -175,8 +175,7 @@ extern void InstallSignalHandlers(const char *ProgramName); int gArgc; char **gArgv; -static const char gGoannaVersion[] = NS_STRINGIFY(GRE_MILESTONE); -static const char gToolkitVersion[] = "52.9.0"; +static const char gToolkitVersion[] = NS_STRINGIFY(GRE_MILESTONE); static const char gToolkitBuildID[] = NS_STRINGIFY(MOZ_BUILDID); static nsIProfileLock* gProfileLock; @@ -685,14 +684,6 @@ nsXULAppInfo::GetVersion(nsACString& aResult) } NS_IMETHODIMP -nsXULAppInfo::GetGreVersion(nsACString& aResult) -{ - aResult.Assign(gGoannaVersion); - - return NS_OK; -} - -NS_IMETHODIMP nsXULAppInfo::GetPlatformVersion(nsACString& aResult) { aResult.Assign(gToolkitVersion); @@ -2808,11 +2799,11 @@ XREMain::XRE_mainInit(bool* aExitFlag) SetAllocatedString(mAppData->maxVersion, "1.*"); } - if (mozilla::Version(mAppData->minVersion) > gGoannaVersion || - mozilla::Version(mAppData->maxVersion) < gGoannaVersion) { + if (mozilla::Version(mAppData->minVersion) > gToolkitVersion || + mozilla::Version(mAppData->maxVersion) < gToolkitVersion) { Output(true, "Error: Platform version '%s' is not compatible with\n" "minVersion >= %s\nmaxVersion <= %s\n", - gGoannaVersion, + gToolkitVersion, mAppData->minVersion, mAppData->maxVersion); return 1; } |