Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-27 12:50:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bump version number - workaround Firefox insatll bug

Browse Source
This commit is contained in:
mkaply%us.ibm.com 2005-12-13 18:07:15 +00:00
parent dfd57a478c
commit 0ae1504f9f
3 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/cck/browser/install.rdf
View File

@ -5,7 +5,7 @@ xmlns:em="http://www.mozilla.org/2004/em-rdf#">
<em:id>cckwizard@extensions.mozilla.org</em:id>
<em:name>CCK Wizard</em:name>
<em:version>0.5</em:version>
<em:version>0.7</em:version>
<em:description>XUL Wizard to create CCK Packages</em:description>
<em:creator>Michael Kaply</em:creator>
<em:homepageURL>http://www.mozilla.org/projects/cck/firefox</em:homepageURL>

22
extensions/cck/browser/resources/content/cckwizard/cckwizard.js
View File

@ -583,6 +583,15 @@ function CreateCCK()
CCKCopyChromeToFile("chrome.manifest", destdir)
CCKWriteInstallRDF(destdir);
// For now, do to a Firefox 1.5 bug, we have to put install.rdf in a subdir and install
// it from there. So the installer needs a different XPI.
var installrdfdir = destdir.clone();
installrdfdir.append("installrdf");
try {
installrdfdir.create(Components.interfaces.nsIFile.DIRECTORY_TYPE, 0775);
} catch(ex) {}
CCKWriteInstallRDF(installrdfdir);
CCKWriteInstallJS(destdir);
var filename = document.getElementById("filename").value;
if (filename.length == 0)
@ -592,6 +601,18 @@ function CreateCCK()
CCKZip(filename, destdir,
"chrome", "components", "defaults", "plugins", "searchplugins", "chrome.manifest", "install.rdf", "install.js");
var bundle = document.getElementById("bundle_cckwizard");
// For now, do to a Firefox 1.5 bug, we have to put install.rdf in a subdir and install
// it from there. So the installer needs a different XPI.
var installerfilename = document.getElementById("filename").value;
if (installerfilename.length == 0)
installerfilename = "cck";
installerfilename += "-installer.xpi";
CCKZip(installerfilename, destdir,
"chrome", "components", "defaults", "plugins", "searchplugins", "chrome.manifest", "installrdf", "install.js");
var bundle = document.getElementById("bundle_cckwizard");
gPromptService.alert(window, bundle.getString("windowTitle"),
bundle.getString("outputLocation") + destdir.path + "\\" + filename);
}
@ -1123,6 +1144,7 @@ function CCKWriteInstallRDF(destdir)
var file = destdir.clone();
file.append("install.rdf");
try {
file.remove(false);

6
extensions/cck/browser/resources/content/cckwizard/srcfiles/install.js.in
View File

@ -106,7 +106,11 @@ addDirectory("", "%version%", "components", cckextensiondir, "components", true)
%plugins%
%searchplugins%
addFile("", "%version%", "chrome.manifest", cckextensiondir, "", true);
addFile("", "%version%", "install.rdf", cckextensiondir, "", true);
// addFile("", "%version%", "install.rdf", cckextensiondir, "", true);
// For now, do to a Firefox 1.5 bug, we have to put install.rdf in a subdir and install
// it from there. So the installer needs a different XPI.
addDirectory("", "%version%", "installrdf", cckextensiondir, "", true);
err = getLastError();
if (err==SUCCESS)