Permalink
Browse files

Fix up the jar installation on Mozilla. Still broken on Firefox.

svn path=/trunk/aspeditor/; revision=62626
  • Loading branch information...
2 parents bbf9987 + 586bfa5 commit 313c878dd66ae11057371b65d99f0f9fc9d017b2 @mhutch mhutch committed Jul 15, 2006
View
@@ -1,3 +1,11 @@
+2006-07-15 Michael Hutchinson <m.j.hutchinson@gmail.com>
+
+ * locale/*:
+ * chrome/*:
+ * Makefile.am: Restructure jar to make it work with Mozilla. Fix nasty
+ bug that broke Mozilla installations. Note that this extension is
+ still unlikely to work with anything newer than Mozilla 1.6.
+
2006-06-24 Michael Hutchinson <m.j.hutchinson@gmail.com>
* locale/en-US/contents.rdf
View
@@ -2,19 +2,19 @@ packagename = aspdesigner
extension_guid="{d7d824a2-030d-11db-9804-b622a1ef5492}"
chromedir = $(EXTENSION_DIR)
chrome_install_file = $(MOZILLA_HOME)/chrome/installed-chrome.txt
-chrome_install_text = "content,install,url,resource:/chrome/aspdesigner/content/" \
- "locale,install,url,resource:/chrome/aspdesigner/locale/en-US/"
+chrome_install_text = "content,install,url,jar:resource:/chrome/aspdesigner.jar!/content/aspdesigner/" \
+ "locale,install,url,jar:resource:/chrome/aspdesigner.jar!/locale/en-US/aspdesigner/"
jar_files = \
- content/JSCall.js \
- content/contents.rdf \
- content/editor.xul \
- content/editorContent.css \
- content/editor.js \
- content/clipboard.js \
- content/constants.js \
- content/xpcom.js \
- locale/en-US/contents.rdf
+ content/aspdesigner/JSCall.js \
+ content/aspdesigner/contents.rdf \
+ content/aspdesigner/aspdesigner.xul \
+ content/aspdesigner/editorContent.css \
+ content/aspdesigner/editor.js \
+ content/aspdesigner/clipboard.js \
+ content/aspdesigner/constants.js \
+ content/aspdesigner/xpcom.js \
+ locale/en-US/aspdesigner/contents.rdf
xpi_files = \
chrome/$(packagename).jar \
@@ -26,7 +26,7 @@ all: $(packagename).xpi
$(packagename).xpi: $(xpi_files)
$(ZIP) -q9 $@ $^
-content/JSCall.js: $(JSCALL_SCRIPT)
+content/aspdesigner/JSCall.js: $(JSCALL_SCRIPT)
cp $^ $@
chrome/$(packagename).jar: $(jar_files)
@@ -38,13 +38,15 @@ install-data-hook: install-files install-text
uninstall-hook: uninstall-files uninstall-text
install-files:
- mkdir -p $(chromedir)/chrome; \
- for file in $(xpi_files); do \
- cp $$file $(chromedir)/$$file; \
- done;
+ mkdir -p $(chromedir); \
+ cp chrome/$(packagename).jar $(chromedir)
+
+# for file in $(xpi_files); do \
+# cp $$file $(chromedir)/$$file; \
+# done;
uninstall-files:
- rm -rf $(chromedir)
+ rm -rf $(chromedir)/$(packagename).jar
install-text:
if test -f $(chrome_install_file); then \
@@ -61,7 +63,7 @@ uninstall-text:
if test -f $(chrome_install_file); then \
cp $(chrome_install_file) /tmp/chrome.old; \
sudo bash -c "sed -e'/aspdesigner/d' /tmp/chrome.old > $(chrome_install_file)"; \
- rm /tmp/chrome.old;
+ rm /tmp/chrome.old; \
fi;
EXTRA_DIST = $(jar_files) $(xpi_files)

0 comments on commit 313c878

Please sign in to comment.