Merge inbound to m-c.

Makefile.in

@@ -60,7 +60,7 @@ ifndef MOZ_PROFILE_USE
 # We need to explicitly put backend.RecursiveMakeBackend.built here
 # otherwise the rule in rules.mk doesn't run early enough.
 default alldep all:: CLOBBER $(topsrcdir)/configure config.status backend.RecursiveMakeBackend.built
-	$(PYTHON) $(topsrcdir)/config/purge_directories.py -d _build_manifests/purge .
+	$(call py_action,purge_manifests,-d _build_manifests/purge .)
 endif
 
 CLOBBER: $(topsrcdir)/CLOBBER

accessible/src/atk/Makefile.in

@@ -12,9 +12,6 @@ include $(DEPTH)/config/autoconf.mk
 EXPORT_LIBRARY = ..
 LIBXUL_LIBRARY = 1
 
-# we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 
 ifdef MOZ_ENABLE_GTK

accessible/src/base/Makefile.in

@@ -11,9 +11,6 @@ include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY = 1
 
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES += \

accessible/src/generic/Makefile.in

@@ -11,9 +11,6 @@ include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY = 1
 
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES = \

accessible/src/html/Makefile.in

@@ -12,9 +12,6 @@ include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY = 1
 
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES = \

accessible/src/jsat/AccessFu.jsm

@@ -785,6 +785,8 @@ var Input = {
       B: ['movePrevious', 'Button'],
       c: ['moveNext', 'Combobox'],
       C: ['movePrevious', 'Combobox'],
+      d: ['moveNext', 'Landmark'],
+      D: ['movePrevious', 'Landmark'],
       e: ['moveNext', 'Entry'],
       E: ['movePrevious', 'Entry'],
       f: ['moveNext', 'FormElement'],

accessible/src/jsat/OutputGenerator.jsm

@@ -176,22 +176,12 @@ this.OutputGenerator = {
    * @param {nsIAccessible} aAccessible current accessible object.
    */
   _addLandmark: function _addLandmark(aOutput, aAccessible) {
-    let getLandmarkName = function getLandmarkName(aAccessible) {
-      let roles = Utils.getAttributes(aAccessible)['xml-roles'];
-      if (!roles) {
-        return;
-      }
-
-      // Looking up a role that would match a landmark.
-      for (let landmark of this.gLandmarks) {
-        if (roles.indexOf(landmark) > -1) {
-          return gStringBundle.GetStringFromName(landmark);
-        }
-      }
-    };
-
-    let landmark = getLandmarkName.apply(this, [aAccessible]);
+    let landmarkName = Utils.getLandmarkName(aAccessible);
+    if (!landmarkName) {
+      return;
+    }
 
+    let landmark = gStringBundle.GetStringFromName(landmarkName);
     if (!landmark) {
       return;
     }
@@ -222,15 +212,6 @@ this.OutputGenerator = {
     return str.replace('#1', aCount);
   },
 
-  gLandmarks: [
-    'banner',
-    'complementary',
-    'contentinfo',
-    'main',
-    'navigation',
-    'search'
-  ],
-
   roleRuleMap: {
     'menubar': INCLUDE_DESC,
     'scrollbar': INCLUDE_DESC,

accessible/src/jsat/TraversalRules.jsm

@@ -184,6 +184,14 @@ this.TraversalRules = {
     [ROLE_COMBOBOX,
      ROLE_LISTBOX]),
 
+  Landmark: new BaseTraversalRule(
+    [],
+    function Landmark_match(aAccessible) {
+      return Utils.getLandmarkName(aAccessible) ? FILTER_MATCH :
+        FILTER_IGNORE;
+    }
+  ),
+
   Entry: new BaseTraversalRule(
     [ROLE_ENTRY,
      ROLE_PASSWORD_TEXT]),

accessible/src/jsat/Utils.jsm

@@ -260,6 +260,28 @@ this.Utils = {
     }
 
     return true;
+  },
+
+  getLandmarkName: function getLandmarkName(aAccessible) {
+    const landmarks = [
+      'banner',
+      'complementary',
+      'contentinfo',
+      'main',
+      'navigation',
+      'search'
+    ];
+    let roles = this.getAttributes(aAccessible)['xml-roles'];
+    if (!roles) {
+      return;
+    }
+
+    // Looking up a role that would match a landmark.
+    for (let landmark of landmarks) {
+      if (roles.indexOf(landmark) > -1) {
+        return landmark;
+      }
+    }
   }
 };
 

accessible/src/mac/Makefile.in

@@ -13,9 +13,6 @@ EXPORT_LIBRARY = ..
 LIBXUL_LIBRARY = 1
 
 
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES += \

accessible/src/other/Makefile.in

@@ -12,9 +12,6 @@ include $(DEPTH)/config/autoconf.mk
 EXPORT_LIBRARY = ..
 LIBXUL_LIBRARY = 1
 
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES += \

accessible/src/windows/ia2/Makefile.in

@@ -17,9 +17,6 @@ LIBXUL_LIBRARY = 1
 # macros which conflicts with std::min/max.  Suppress the macros:
 OS_CXXFLAGS += -DNOMINMAX
 
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 

accessible/src/windows/msaa/Makefile.in

@@ -13,9 +13,6 @@ LIBRARY_NAME = accessibility_toolkit_msaa_s
 EXPORT_LIBRARY = 1
 LIBXUL_LIBRARY = 1
 
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk

accessible/src/windows/sdn/Makefile.in

@@ -16,9 +16,6 @@ LIBXUL_LIBRARY = 1
 # macros which conflicts with std::min/max.  Suppress the macros:
 OS_CXXFLAGS += -DNOMINMAX
 
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 

accessible/src/windows/uia/Makefile.in

@@ -16,9 +16,6 @@ LIBXUL_LIBRARY = 1
 # macros which conflicts with std::min/max.  Suppress the macros:
 OS_CXXFLAGS += -DNOMINMAX
 
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 

accessible/src/xpcom/Makefile.in

@@ -12,9 +12,6 @@ include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY = 1
 
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
 EXTRA_MDDEPEND_FILES = xpcAccEvents.pp
 
 include $(topsrcdir)/config/rules.mk

accessible/src/xul/Makefile.in

@@ -12,9 +12,6 @@ include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY = 1
 
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES = \

addon-sdk/source/bin/activate.fish

@@ -0,0 +1,66 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# This file must be used with "source bin/activate.fish" *from fish*
+# you cannot run it directly
+
+# Much of this code is based off of the activate.fish file for the
+# virtualenv project. http://ur1.ca/ehmd6
+
+function deactivate -d "Exit addon-sdk and return to normal shell environment"
+    if test -n "$_OLD_VIRTUAL_PATH"
+        set -gx PATH $_OLD_VIRTUAL_PATH
+        set -e _OLD_VIRTUAL_PATH
+    end
+
+    if test -n "$_OLD_PYTHONPATH"
+        set -gx PYTHONPATH $_OLD_PYTHONPATH
+        set -e _OLD_PYTHONPATH
+    end
+
+    if test -n "$_OLD_FISH_PROMPT_OVERRIDE"
+        functions -e fish_prompt
+        set -e _OLD_FISH_PROMPT_OVERRIDE
+        . ( begin
+                printf "function fish_prompt\n\t#"
+                functions _old_fish_prompt
+            end | psub )
+
+        functions -e _old_fish_prompt
+    end
+
+    set -e CUDDLEFISH_ROOT
+    set -e VIRTUAL_ENV
+
+    if test "$argv[1]" != "nondestructive"
+        functions -e deactivate
+    end
+end
+
+# unset irrelavent variables
+deactivate nondestructive
+
+set -gx _OLD_PYTHONPATH $PYTHONPATH
+set -gx _OLD_VIRTUAL_PATH $PATH
+set -gx _OLD_FISH_PROMPT_OVERRIDE "true"
+
+set VIRTUAL_ENV (pwd)
+
+set -gx CUDDLEFISH_ROOT $VIRTUAL_ENV
+set -gx PYTHONPATH "$VIRTUAL_ENV/python-lib" $PYTHONPATH
+set -gx PATH "$VIRTUAL_ENV/bin" $PATH
+
+# save the current fish_prompt function as the function _old_fish_prompt
+. ( begin
+        printf "function _old_fish_prompt\n\t#"
+        functions fish_prompt
+    end | psub )
+
+# with the original prompt function renamed, we can override with our own.
+function fish_prompt
+    printf "(%s)%s%s" (basename "$VIRTUAL_ENV") (set_color normal) (_old_fish_prompt)
+    return
+end 
+
+python -c "from jetpack_sdk_env import welcome; welcome()"

addon-sdk/source/doc/dev-guide-source/credits.md

@@ -43,6 +43,7 @@ We'd like to thank our many Jetpack project contributors!  They include:
 
 ### F ###
 
+* [Corey Farwell](http://github.com/frewsxcv)
 * [Matteo Ferretti](https://github.com/ZER0)
 * fuzzykiller