--NOT PART OF DEFAULT BUILD--

XMLterm changes only.
Fixed overlay to XMLterm back into the tasks menu.

extensions/xmlterm/scripts/Makefile.in

@@ -33,6 +33,12 @@
 
 # makefile for xmlterm/scripts directory
 
+# Specify these as parameters to the make command
+BUILD_ID = 2000xxxx
+BUILD_MSTONE = Mxx
+
+XMLTERM_VERS = 0.5
+
 ifdef STAND_ALONE
 DEPTH      = ..
 topsrcdir  = ..
@@ -53,6 +59,23 @@ include $(srcdir)/../config/xmlterm_config.mk
 
 include $(topsrcdir)/config/rules.mk
 
+PLATFORM_STR = unknown
+
+# Edit the lines below as needed, depending upon your platform(s)
+ifeq ($(OS_ARCH),Linux)
+PLATFORM_STR = i686-pc-linux-gnu
+endif
+
+ifeq ($(OS_CONFIG),SunOS5)
+PLATFORM_STR = sparc-sun-solaris2.6
+endif
+
+ifeq ($(OS_ARCH),FreeBSD)
+PLATFORM_STR = i686-pc-freebsd
+endif
+
+XPIFILE = xmlterm$(XMLTERM_VERS)-$(PLATFORM_STR)-$(BUILD_MSTONE)-$(BUILD_ID).xpi
+
 XMLTERM_SCRIPTS = \
 	$(srcdir)/xmlterm \
 	$(srcdir)/xls \
@@ -63,14 +86,14 @@ install::
 	$(INSTALL) -m 555 $(XMLTERM_SCRIPTS) $(DIST)/bin
 
 xpi::
-	zip $(DIST)/bin/xmlterm.xpi install.js
-	cd $(DIST); zip -g bin/xmlterm.xpi \
+	zip $(DIST)/bin/$(XPIFILE) install.js
+	cd $(DIST); zip -g bin/$(XPIFILE) \
                bin/xcat \
                bin/xls \
                bin/xmlterm
-	cd $(DIST)/bin; zip -g xmlterm.xpi \
+	cd $(DIST)/bin; zip -g $(XPIFILE) \
                components/libxmlterm.so \
                components/xmlterm.xpt \
                components/xmlterm-service.js
-	cd $(DIST)/bin; zip -g -r xmlterm.xpi chrome/packages/xmlterm
-	echo Created $(DIST)/bin/xmlterm.xpi
+	cd $(DIST)/bin; zip -g -r $(XPIFILE) chrome/packages/xmlterm
+	echo Created $(DIST)/bin/$(XPIFILE)

extensions/xmlterm/ui/content/xmltermOverlay.xul

@@ -14,7 +14,7 @@
 
 <menupopup id="taskPopup">
 	<menuitem
-        position="7"
+        position="5"
         value="XMLterm"
         oncommand="toXMLterm()"/>
 </menupopup>

extensions/xmlterm/ui/manifest.rdf

@@ -19,10 +19,10 @@
 
   <!-- xmlterm overlay information -->
   <RDF:Seq about="urn:mozilla:overlays">
-    <RDF:li resource="chrome://global/content/tasksOverlay.xul"/>
+    <RDF:li resource="chrome://communicator/content/tasksOverlay.xul"/>
   </RDF:Seq>
 
-  <RDF:Seq about="chrome://global/content/tasksOverlay.xul">
+  <RDF:Seq about="chrome://communicator/content/tasksOverlay.xul">
     <RDF:li>chrome://xmlterm/content/xmltermOverlay.xul</RDF:li>
   </RDF:Seq>