Bug 1256442 - Various updates to get the 1.1.x version of the system …

…add-on ready for 45 release. r=Mardak

Makefile

@@ -421,7 +421,7 @@ karma: build
 .PHONY: build
 build: add-on standalone ui vendor_libs
 
-GIT_EXPORT_LOCATION := ../gecko-dev
+GIT_EXPORT_LOCATION := ../mozilla-release
 GIT_EXPORT_DIR := $(GIT_EXPORT_LOCATION)/browser/extensions/loop
 
 .PHONY: git-export

add-on/chrome/bootstrap.js

@@ -318,7 +318,8 @@ var WindowListener = {
           }
         });
 
-        this.addMenuItem();
+        // Disabled for 45, as 45 has its own menuitem.
+        // this.addMenuItem();
 
         // Don't do the rest if this is for the hidden window - we don't
         // have a toolbar there.
@@ -903,7 +904,8 @@ var WindowListener = {
    */
   tearDownBrowserUI: function(window) {
     if (window.LoopUI) {
-      window.LoopUI.removeMenuItem();
+      // Disabled for 45, as 45 has its own menuitem.
+      // window.LoopUI.removeMenuItem();
 
       // XXX Bug 1229352 - Add in tear-down of the panel.
     }

add-on/install.rdf.in

@@ -17,8 +17,8 @@
     <em:targetApplication>
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
-        <em:minVersion>46.0a1</em:minVersion>
-        <em:maxVersion>@FIREFOX_VERSION@</em:maxVersion>
+        <em:minVersion>45.0</em:minVersion>
+        <em:maxVersion>45.*</em:maxVersion>
       </Description>
     </em:targetApplication>
 

add-on/jar.mn

@@ -3,7 +3,7 @@
 # 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/.
 
-[features/loop@mozilla.org] chrome.jar:
+[.] chrome.jar:
 % content loop %content/ contentaccessible=yes
 % content loop-locale-fallback %content/locale-fallback/en-US/
 % skin loop classic/1.0 %skin/linux/ os=Linux

locale/jar.mn

@@ -25,7 +25,7 @@
 #define zh_CN zh-CN
 #define zh_TW zh-TW
 
-[features/loop@mozilla.org] @AB_CD@.jar:
+[.] @AB_CD@.jar:
 % locale loop @AB_CD@ %locale/@AB_CD@/
   # For locales we support, include the file from the locale's directory in the
   # source tree.