Bug 1221200 - Post: Change formatting and ordering. r=me
authorNick Alexander <nalexander@mozilla.com>
Mon, 07 Mar 2016 12:47:34 -0800
changeset 287031 8d604d4a13f3626ade10a9b8a96f8ac5bf7e4ffa
parent 287030 7280ed7ecd34d1507624a326bc7e84c5ef451c16
child 287032 87bc55c1a7dc02d3a9661e047095fa3beaef6862
push id18046
push usernalexander@mozilla.com
push dateMon, 07 Mar 2016 21:08:14 +0000
treeherderfx-team@8d604d4a13f3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs1221200
milestone47.0a1
Bug 1221200 - Post: Change formatting and ordering. r=me On a CLOSED TREE because DONTBUILD NPOTB MozReview-Commit-ID: 56vyz2CRJsU
python/mozboot/mozboot/bootstrap.py
--- a/python/mozboot/mozboot/bootstrap.py
+++ b/python/mozboot/mozboot/bootstrap.py
@@ -20,39 +20,49 @@ from mozboot.openbsd import OpenBSDBoots
 from mozboot.archlinux import ArchlinuxBootstrapper
 
 APPLICATION_CHOICE = '''
 Please choose the version of Firefox you want to build:
 %s
 
 Note: (For Firefox for Android)
 
-Firefox for Android is built on top of the Gecko technology platform. Gecko is Mozilla's web rendering engine, similar to Edge, Blink, and WebKit. Gecko is implemented in C++ and JavaScript. If you want to work on web rendering, this is what you want.
-
-The Firefox for Android Front-End is built using Java, the Android Platform SDK, JavaScript, HTML, and CSS. If you want to work on the look-and-feel of Firefox for Android, this is what you want.
+The Firefox for Android front-end is built using Java, the Android
+Platform SDK, JavaScript, HTML, and CSS. If you want to work on the
+look-and-feel of Firefox for Android, you want "Firefox for Android
+Artifact Mode".
 
-If you don't know what you want, start with just the Firefox for Android Artifact Mode. Your builds will be much shorter than if you build Gecko as well. But don't worry! You can always switch configurations later.
+Firefox for Android is built on top of the Gecko technology
+platform. Gecko is Mozilla's web rendering engine, similar to Edge,
+Blink, and WebKit. Gecko is implemented in C++ and JavaScript. If you
+want to work on web rendering, you want "Firefox for Android".
 
-You can learn more about Artifact builds from https://developer.mozilla.org/en-US/docs/Artifact_builds
+If you don't know what you want, start with just "Firefox for Android
+Artifact Mode". Your builds will be much shorter than if you build
+Gecko as well. But don't worry! You can always switch configurations
+later.
+
+You can learn more about Artifact mode builds at
+https://developer.mozilla.org/en-US/docs/Artifact_builds.
 
 Your choice:
 '''
 
 APPLICATIONS_LIST=[
     ('Firefox for Desktop', 'browser'),
+    ('Firefox for Android Artifact Mode', 'mobile_android_artifact_mode'),
     ('Firefox for Android', 'mobile_android'),
-    ('Firefox for Android Artifact Mode', 'mobile_android_artifact_mode')
 ]
 
 # This is a workaround for the fact that we must support python2.6 (which has
 # no OrderedDict)
 APPLICATIONS = dict(
-    desktop=APPLICATIONS_LIST[0],
-    android=APPLICATIONS_LIST[1],
-    android_artifact_mode=APPLICATIONS_LIST[2],
+    browser=APPLICATIONS_LIST[0],
+    mobile_android_artifact_mode=APPLICATIONS_LIST[1],
+    mobile_android=APPLICATIONS_LIST[2],
 )
 
 FINISHED = '''
 Your system should be ready to build %s! If you have not already,
 obtain a copy of the source code by running:
 
     hg clone https://hg.mozilla.org/mozilla-central
 
@@ -127,17 +137,17 @@ class Bootstrapper(object):
         if cls is None:
             raise NotImplementedError('Bootstrap support is not yet available '
                                       'for your OS.')
 
         self.instance = cls(**args)
 
     def bootstrap(self):
         if self.choice is None:
-            # Like ['1. Firefox for Desktop', '2. Firefox for Android', '3. Firefox for Android Artifact Mode'].
+            # Like ['1. Firefox for Desktop', '2. Firefox for Android Artifact Mode', ...].
             labels = ['%s. %s' % (i + 1, name) for (i, (name, _)) in enumerate(APPLICATIONS_LIST)]
             prompt = APPLICATION_CHOICE % '\n'.join(labels)
             prompt_choice = self.instance.prompt_int(prompt=prompt, low=1, high=len(APPLICATIONS))
             name, application = APPLICATIONS_LIST[prompt_choice-1]
         elif self.choice not in APPLICATIONS.keys():
             raise Exception('Please pick a valid application choice: (%s)' % '/'.join(APPLICATIONS.keys()))
         else:
             name, application = APPLICATIONS[self.choice]