Backed out changeset 1f7d1d6bf61d (bug 1488679) for causing build bustages on xre/nsAppRunner.cpp CLOSED TREE
authorCiure Andrei <aciure@mozilla.com>
Wed, 13 Feb 2019 01:36:43 +0200
changeset 458729 bdbab05f9667
parent 458728 1f7d1d6bf61d
child 458730 636d2c00234d
push id35546
push userrmaries@mozilla.com
push dateWed, 13 Feb 2019 04:27:59 +0000
treeherdermozilla-central@636d2c00234d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1488679
milestone67.0a1
backs out1f7d1d6bf61d
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 1f7d1d6bf61d (bug 1488679) for causing build bustages on xre/nsAppRunner.cpp CLOSED TREE
toolkit/xre/nsAppRunner.cpp
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -1526,22 +1526,17 @@ static void DumpHelp() {
   // of the bug, because we ship a component.reg file, it works correctly.
   DumpArbitraryHelp();
 }
 
 static inline void DumpVersion() {
   if (gAppData->vendor) {
     printf("%s ", (const char*)gAppData->vendor);
   }
-  printf("%s ", (const char*)gAppData->name);
-
-  // Use the displayed version
-  // For example, for beta, we would display 42.0b2 instead of 42.0
-  printf("%s", MOZ_APP_VERSION_DISPLAY);
-
+  printf("%s %s", (const char*)gAppData->name, (const char*)gAppData->version);
   if (gAppData->copyright) {
     printf(", %s", (const char*)gAppData->copyright);
   }
   printf("\n");
 }
 
 #if defined(MOZ_WIDGET_GTK)
 static RemoteResult ParseRemoteCommandLine(nsCString& program,