From bb2ab9fb5149ff29d8d5a213556a93b5fffa62a3 Mon Sep 17 00:00:00 2001
From: "svn%xmlterm.org" <svn%xmlterm.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 10 Oct 2000 04:38:20 +0000
Subject: [PATCH] --NOT PART OF DEFAULT BUILD-- XMLterm changes only. Changes
 to fix xmlterm XPI file build.

git-svn-id: svn://10.0.0.236/trunk@80810 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/extensions/xmlterm/scripts/Makefile.in |  5 ++---
 mozilla/extensions/xmlterm/scripts/install.js  | 16 ++++++++++------
 mozilla/extensions/xmlterm/scripts/xmlterm     | 12 ++----------
 3 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/mozilla/extensions/xmlterm/scripts/Makefile.in b/mozilla/extensions/xmlterm/scripts/Makefile.in
index 98966f214c1..b1ca0882a81 100644
--- a/mozilla/extensions/xmlterm/scripts/Makefile.in
+++ b/mozilla/extensions/xmlterm/scripts/Makefile.in
@@ -89,11 +89,10 @@ xpi::
 	zip $(DIST)/bin/$(XPIFILE) install.js
 	cd $(DIST); zip -g bin/$(XPIFILE) \
                bin/xcat \
-               bin/xls \
-               bin/xmlterm
+               bin/xls
 	cd $(DIST)/bin; zip -g $(XPIFILE) \
                components/libxmlterm.so \
                components/xmlterm.xpt \
                components/xmlterm-service.js
-	cd $(DIST)/bin; zip -g -r $(XPIFILE) chrome/packages/xmlterm
+	cd $(DIST)/bin; zip -g -r $(XPIFILE) chrome/xmlterm.jar
 	echo Created $(DIST)/bin/$(XPIFILE)
diff --git a/mozilla/extensions/xmlterm/scripts/install.js b/mozilla/extensions/xmlterm/scripts/install.js
index 0c453eddc23..64d1685856f 100644
--- a/mozilla/extensions/xmlterm/scripts/install.js
+++ b/mozilla/extensions/xmlterm/scripts/install.js
@@ -4,25 +4,29 @@ var err = initInstall("XMLterm v0.5",  // name for install UI
 
 logComment("initInstall: " + err);
 
-var fProgram = getFolder("Program");
+var fProgram    = getFolder("Program");
 var fComponents = getFolder("Components");
-var fXMLterm = getFolder("Chrome","packages/xmlterm");
+var fChrome     = getFolder("Chrome");
 
 // addDirectory: blank, archive_dir, install_dir, subdir
-err = addDirectory("", "bin",                     fProgram,    "");
+err = addDirectory("", "bin",        fProgram,    "");
 if (err != SUCCESS)
    cancelInstall(err);
 
-err = addDirectory("", "components",              fComponents, "");
+err = addDirectory("", "components", fComponents, "");
 if (err != SUCCESS)
    cancelInstall(err);
 
-err = addDirectory("", "chrome/packages/xmlterm", fXMLterm,    "");
+err = addDirectory("", "chrome",     fChrome,     "");
 if (err != SUCCESS)
    cancelInstall(err);
 
 // Register chrome
-err = registerChrome(PACKAGE|DELAYED_CHROME, fXMLterm );
+registerChrome(PACKAGE | DELAYED_CHROME, getFolder("Chrome","xmlterm.jar"), "content/xmlterm/");
+
+registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","xmlterm.jar"), "skin/modern/xmlterm/");
+
+registerChrome(LOCALE | DELAYED_CHROME, getFolder("Chrome","xmlterm.jar"), "locale/en-US/xmlterm/");
 
 if (getLastError() == SUCCESS)
     performInstall();
diff --git a/mozilla/extensions/xmlterm/scripts/xmlterm b/mozilla/extensions/xmlterm/scripts/xmlterm
index cb50cee95d9..51f92ad1da4 100755
--- a/mozilla/extensions/xmlterm/scripts/xmlterm
+++ b/mozilla/extensions/xmlterm/scripts/xmlterm
@@ -34,13 +34,5 @@ fi
 echo cd $MOZILLA_DIR
 cd $MOZILLA_DIR
 
-if [ -f chrome/packages/xmlterm/xmlterm/content/$XMLTERM_CHROME ]
-then
-    dummy=0
-else
-    echo "chrome://xmlterm/content/$XMLTERM_CHROME not found; error in installing XMLterm?"
-    exit 1
-fi
-
-echo ./run-mozilla.sh $MOZILLA_BIN -chrome "chrome://xmlterm/content/$XMLTERM_CHROME"
-./run-mozilla.sh $MOZILLA_BIN -chrome "chrome://xmlterm/content/$XMLTERM_CHROME"
+echo ./run-mozilla.sh $MOZILLA_BIN -telnet
+./run-mozilla.sh $MOZILLA_BIN -telnet