Backed out changeset d88982ef09c8 (bug 1871447) as requested for land…

…ing under the wrong bug number and for better understanding of the changes made in the future. CLOSED TREE

browser/app/macbuild/Contents/MacOS-files.in

@@ -5,6 +5,7 @@
 #filter substitution
 /*.app/***
 /certutil
+/@MOZ_APP_NAME@-bin
 #if defined(MOZ_GECKODRIVER)
 /geckodriver
 #endif

browser/installer/allowed-dupes.mn

@@ -36,11 +36,9 @@ browser/chrome.manifest
 crashreporter.app/Contents/Resources/English.lproj/MainMenu.nib/classes.nib
 crashreporter.app/Contents/Resources/English.lproj/MainMenuRTL.nib/classes.nib
 
-#ifndef XP_MACOSX
 # firefox/firefox-bin is bug 658850
 @MOZ_APP_NAME@
 @MOZ_APP_NAME@-bin
-#endif
 
 # Row and column icons are duplicated
 res/table-remove-column-active.gif

browser/installer/package-manifest.in

@@ -137,9 +137,7 @@
 @BINPATH@/browser/VisualElements/PrivateBrowsing_150.png
 @BINPATH@/browser/VisualElements/PrivateBrowsing_70.png
 #else
-#ifndef XP_MACOSX
 @BINPATH@/@MOZ_APP_NAME@-bin
-#endif
 @BINPATH@/@MOZ_APP_NAME@
 #endif
 @RESPATH@/application.ini

devtools/docs/user/browser_console/index.rst

@@ -29,7 +29,7 @@ You can also start the Browser Console by launching Firefox from the command lin
 
 .. code-block:: bash
 
-  /Applications/FirefoxAurora.app/Contents/MacOS/firefox -jsconsole
+  /Applications/FirefoxAurora.app/Contents/MacOS/firefox-bin -jsconsole
 
 The Browser Console looks like this:
 

docs/contributing/debugging/debugging_firefox_with_lldb.rst

@@ -65,7 +65,7 @@ followed by the command line you'd like to run, like this:
 
 .. code:: bash
 
-   $ lldb -- obj-ff-dbg/dist/Nightly.app/Contents/MacOS/firefox -no-remote -profile /path/to/profile
+   $ lldb -- obj-ff-dbg/dist/Nightly.app/Contents/MacOS/firefox-bin -no-remote -profile /path/to/profile
 
 Then set breakpoints you need and start the process:
 
@@ -76,5 +76,5 @@ Then set breakpoints you need and start the process:
    WARNING: Unable to resolve breakpoint to any actual locations.
 
    (lldb) r
-   Process 7602 launched: '/.../obj-ff-opt/dist/Nightly.app/Contents/MacOS/firefox' (x86_64)
+   Process 7602 launched: '/.../obj-ff-opt/dist/Nightly.app/Contents/MacOS/firefox-bin' (x86_64)
    1 location added to breakpoint 1

docs/contributing/debugging/stacktrace_report.rst

@@ -117,7 +117,7 @@ macOS
 ~~~~~
 
 Run /Applications/Utilities/Console.app.  Expand "~/Library/Logs" and
-"CrashReporter", then look for logs for "firefox".
+"CrashReporter", then look for logs for "firefox-bin".
 
 
 Linux

docs/nspr/creating_a_cookie_log.rst

@@ -35,11 +35,11 @@ already).
 #. Type "export NSPR_LOG_MODULES=cookie:4" and press Enter.
 #. Run Firefox by typing "./firefox" and pressing Enter
 
-macOS
-^^^^^
+Mac OS X
+^^^^^^^^
 
 Open Terminal.app, which is located in the /Applications/Utilities
-folder (these instructions are for bash, the default shell in macOS
+folder (these instructions are for bash, the default shell in Mac OS X
 10.3 and higher; if you use something else, you probably know how to
 modify these instructions already).
 
@@ -48,7 +48,7 @@ modify these instructions already).
 #. Type "export NSPR_LOG_FILE=~/Desktop/cookie-log.txt" and press
    Return.
 #. Type "export NSPR_LOG_MODULES=cookie:4" and press Return.
-#. Run Firefox by typing "./firefox" and pressing Return (note that
+#. Run Firefox by typing "./firefox-bin" and pressing Return (note that
    Firefox will launch behind windows for other applications).
 
 Creating the Log

netwerk/docs/http/logging.rst

@@ -144,14 +144,14 @@ running on Linux.
 #. When the problem has been reproduced, exit Firefox and look for the
    generated log files, which you can find at ``/tmp/log.txt``.
 
-macOS
-~~~~~
+Mac OS X
+~~~~~~~~
 
-These instructions show how to log HTTP traffic in Firefox on macOS.
+These instructions show how to log HTTP traffic in Firefox on Mac OS X.
 
 #. Quit Firefox is if it's currently running, by using the Quit option
    in the File menu. Keep in mind that simply closing all windows does
-   **not** quit Firefox on macOS (this is standard practice for Mac
+   **not** quit Firefox on Mac OS X (this is standard practice for Mac
    applications).
 
 #. Run the Terminal application, which is located in the Utilities
@@ -165,7 +165,7 @@ These instructions show how to log HTTP traffic in Firefox on macOS.
       export MOZ_LOG=timestamp,rotate:200,nsHttp:5,cache2:5,nsSocketTransport:5,nsHostResolver:5
       export MOZ_LOG_FILE=~/Desktop/log.txt
       cd /Applications/Firefox.app/Contents/MacOS
-      ./firefox
+      ./firefox-bin
 
    (The instructions assume that you've installed Firefox directly into
    your startup disk's Applications folder. If you've put it elsewhere,

taskcluster/ci/config.yml

@@ -800,6 +800,7 @@ mac-signing:
                                   mozilla-central: security/mac/hardenedruntime/v2/production/nightly.browser.xml
                                   default: security/mac/hardenedruntime/v2/production/firefox.browser.xml
                   globs:
+                      - "/Contents/MacOS/firefox-bin"
                       - "/"  # The .app
 
             default:
@@ -842,6 +843,7 @@ mac-signing:
                   force: true
                   entitlements: security/mac/hardenedruntime/v2/developer/browser.xml
                   globs:
+                      - "/Contents/MacOS/firefox-bin"
                       - "/"  # The .app
 
 expiration-policy:

testing/mozbase/docs/mozversion.rst

@@ -19,7 +19,7 @@ Firefox::
 
     import mozversion
 
-    version = mozversion.get_version(binary='/path/to/firefox')
+    version = mozversion.get_version(binary='/path/to/firefox-bin')
     for (key, value) in sorted(version.items()):
         if value:
             print '%s: %s' % (key, value)

toolkit/crashreporter/tools/unit-symbolstore.py

@@ -546,10 +546,6 @@ def setUp(self):
             self.target_bin = os.path.join(
                 buildconfig.topobjdir, "dist", "bin", "firefox.exe"
             )
-        elif target_platform() == "Darwin":
-            self.target_bin = os.path.join(
-                buildconfig.topobjdir, "dist", "bin", "firefox"
-            )
         else:
             self.target_bin = os.path.join(
                 buildconfig.topobjdir, "dist", "bin", "firefox-bin"

tools/bloatview/bloatdiff.pl

@@ -10,15 +10,15 @@ ()
     print <<EOUSAGE;
 # bloatdiff.pl - munges the output from
 #   XPCOM_MEM_BLOAT_LOG=1 
-#   firefox -P default resource:///res/bloatcycle.html
+#   firefox-bin -P default resource:///res/bloatcycle.html
 # so that it does some summary and stats stuff.
 #
 # To show leak test results for a set of changes, do something like this:
 #
 #   XPCOM_MEM_BLOAT_LOG=1
-#   firefox -P default resource:///res/bloatcycle.html > a.out
+#   firefox-bin -P default resource:///res/bloatcycle.html > a.out
 #     **make change**
-#   firefox -P default resource:///res/bloatcycle.html > b.out
+#   firefox-bin -P default resource:///res/bloatcycle.html > b.out
 #   bloatdiff.pl a.out b.out
 
 EOUSAGE