Bug 271812 - DOM Inspector not published to addons.mozilla.org. r=mconnor, sr=mconnor. NPOTDB

extensions/inspector/Makefile.in

@@ -37,40 +37,34 @@
 # ***** END LICENSE BLOCK *****
 
 
-DEPTH=../..
-topsrcdir=@top_srcdir@
-srcdir=@srcdir@
-VPATH=@srcdir@
+DEPTH = ../..
+topsrcdir = @top_srcdir@
+srcdir = @srcdir@
+VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE	= inspector
+MODULE = inspector
+DOMi_VERSION = 2.0.0
 
-DIRS=base resources
+DIRS = \
+  base \
+  resources \
+  $(NULL)
 
-ifdef MOZ_XUL_APP
 XPI_NAME               = inspector
 USE_EXTENSION_MANIFEST = 1
 NO_JAR_AUTO_REG        = 1
 INSTALL_EXTENSION_ID   = inspector@mozilla.org
-XPI_PKGNAME            = inspector-$(MOZ_APP_VERSION)
-endif
+XPI_PKGNAME            = inspector-$(DOMi_VERSION)
 
 PREF_JS_EXPORTS = $(srcdir)/resources/content/prefs/inspector.js
 
 DIST_FILES = install.rdf
 
-# We should really pull FIREFOX_VERSION and THUNDERBIRD_VERSION from
-# browser/config/version.txt mail/config/version.txt but we can't be assured
-# that we've even pulled those files. So we hardcode them.
-
 XULAPP_DEFINES = \
-    -DFIREFOX_VERSION=$(FIREFOX_VERSION) \
-    -DTHUNDERBIRD_VERSION=$(THUNDERBIRD_VERSION) \
-    -DSUNBIRD_VERSION=$(SUNBIRD_VERSION) \
-    -DSEAMONKEY_VERSION=$(SEAMONKEY_VERSION) \
-    -DEXTENSION_VERSION=$(MOZILLA_VERSION) \
-    $(NULL)
+  -DDOMi_VERSION=$(DOMi_VERSION) \
+  $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 

extensions/inspector/install.rdf

@@ -6,14 +6,14 @@
      xmlns:em="http://www.mozilla.org/2004/em-rdf#">
   <Description about="urn:mozilla:install-manifest">
     <em:id>inspector@mozilla.org</em:id>
-    <em:version>@EXTENSION_VERSION@</em:version>
+    <em:version>@DOMi_VERSION@</em:version>
 
     <em:targetApplication>
       <!-- Firefox -->
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
         <em:minVersion>3.0a1</em:minVersion>
-        <em:maxVersion>@FIREFOX_VERSION@</em:maxVersion>
+        <em:maxVersion>3.0b4pre</em:maxVersion>
       </Description>
     </em:targetApplication>
 
@@ -22,7 +22,7 @@
       <Description>
         <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
         <em:minVersion>3.0a1pre</em:minVersion>
-        <em:maxVersion>@THUNDERBIRD_VERSION@</em:maxVersion>
+        <em:maxVersion>3.0a1pre</em:maxVersion>
       </Description>
     </em:targetApplication>
 
@@ -30,8 +30,8 @@
       <!-- Sunbird -->
       <Description>
         <em:id>{718e30fb-e89b-41dd-9da7-e25a45638b28}</em:id>
-        <em:minVersion>0.6a1pre</em:minVersion>
-        <em:maxVersion>@SUNBIRD_VERSION@</em:maxVersion>
+        <em:minVersion>0.8pre</em:minVersion>
+        <em:maxVersion>0.8pre</em:maxVersion>
       </Description>
     </em:targetApplication>
 
@@ -39,8 +39,8 @@
       <!-- Suite -->
       <Description>
         <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
-        <em:minVersion>1.5a</em:minVersion>
-        <em:maxVersion>@SEAMONKEY_VERSION@</em:maxVersion>
+        <em:minVersion>2.0a</em:minVersion>
+        <em:maxVersion>2.0a1pre</em:maxVersion>
       </Description>
     </em:targetApplication>
 
@@ -49,18 +49,10 @@
       <Description>
         <em:id>toolkit@mozilla.org</em:id>
         <em:minVersion>1.9a1</em:minVersion>
-        <em:maxVersion>@EXTENSION_VERSION@</em:maxVersion>
+        <em:maxVersion>1.9</em:maxVersion>
       </Description>
     </em:targetApplication>
 
-    <!-- EXTENSION AUTHORS!
-         DO NOT COPY THIS PROPERTY INTO YOUR INSTALL RDF FILES
-         It will cause users not to be informed of incompatibilities
-         with your extension when they are updated with Software Update
-         and your extension will become unavailable to them!
-         -->
-    <em:appManaged>true</em:appManaged>
-
     <!-- front-end metadata -->
     <em:name>DOM Inspector</em:name>
     <em:description>Inspects the structure and properties of a window and its contents.</em:description>