Refactored the installer for Firefox extensions.

florentbr · florentbr · commit dba8bfdeb063 · 2015-09-08T10:57:15.000+01:00
Removed the java, python, csharp and ruby formatters.
Fixed the long delay experienced before the comfirmation dialog.
diff --git a/FirefoxAddons/build-vb-format.py b/FirefoxAddons/build-vb-format.py
@@ -31,7 +31,7 @@ def main(args):
     print 'Build formater xpi ...'
     make_dir(OUT_DIR)
     set_working_dir(SRC_DIR)
-    with ZipFile(OUT_DIR + r'\vb-format.xpi', 'w') as zip:
+    with ZipFile(OUT_DIR + r'\vb-formatters.xpi', 'w') as zip:
         zip.add(r'*')
     
     print '\nDone'
diff --git a/FirefoxAddons/install.rdf b/FirefoxAddons/install.rdf
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:em="http://www.mozilla.org/2004/em-rdf#">
+    <Description about="urn:mozilla:install-manifest">
+        <em:type>32</em:type>
+    </Description>
+</RDF>
diff --git a/SeleniumBasicSetup.iss b/SeleniumBasicSetup.iss
@@ -76,8 +76,9 @@ Source: "References\iedriver.exe"; DestDir: "{app}"; Flags: ignoreversion; Compo
 Source: "References\operadriver.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: pkg_op;
 Source: "References\phantomjs.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: pkg_pjs;
 
-Source: "FirefoxAddons\bin\selenium-ide.xpi"; DestDir: "{app}"; Flags: ignoreversion; Components: pkg_ide;
-                                                                                                                                                      
+;Firefox extensions
+Source: "FirefoxAddons\bin\extensions.xpi"; DestDir: "{app}"; Flags: ignoreversion; Components: pkg_ide;
+
 Source: "Scripts\*.*" ; DestDir: "{app}\Scripts"; Flags: ignoreversion overwritereadonly; Attribs:readonly; Components: pkg_core;
 Source: "Templates\*.*" ; DestDir: "{app}\Templates"; Flags: ignoreversion overwritereadonly; Attribs:readonly; Components: pkg_doc;
 Source: "Examples\VBScript\*.vbs"; DestDir: "{app}\VBScript"; Flags: ignoreversion overwritereadonly; Attribs:readonly; Components: pkg_doc;
@@ -114,6 +115,10 @@ Name: "{group}\Start PhantomJS"; Filename: "{app}\Scripts\StartPhantomJS.vbs"; W
 
 [Registry]
 
+;Firefox plugins
+;Root: HKCU; Subkey: "Software\Mozilla\Firefox\Extensions"; ValueName: "{{a6fd85ed-e919-4a43-a5af-8da18bda539f}"; ValueType: string; ValueData:"{app}\selenium-ide.xpi"; Flags: uninsdeletevalue; Components: pkg_ide;
+;Root: HKCU; Subkey: "Software\Mozilla\Firefox\Extensions"; ValueName: "vbformatters@florent.breheret"; ValueType: string; ValueData:"{app}\vbformatters.xpi"; Flags: uninsdeletevalue; Components: pkg_ide;
+;Root: HKCU; Subkey: "Software\Mozilla\Firefox\Extensions"; ValueName: "implicit-wait@florent.breheret"; ValueType: string; ValueData:"{app}\implicit-wait.xpi"; Flags: uninsdeletevalue; Components: pkg_ide;
 ;Fix for KB948461 https://support.microsoft.com/en-us/kb/948461                            
 Root: HKCR; Subkey: "Interface\{{000C0601-0000-0000-C000-000000000046}"; ValueType: string; ValueName: "";  ValueData: "Office .NET Framework Lockback Bypass Key"; Check: HasPrivileges And HasExcel2003orInf;
 
@@ -203,7 +208,7 @@ Root: HKCU; Subkey: "Software\Microsoft\Windows Script Host\Settings"; ValueName
 
 [Run]
 ;Filename: "{app}\RegNet.exe"; Parameters: "-r"; WorkingDir: {app}; Flags: waituntilterminated runascurrentuser runhidden; StatusMsg: "Register for COM interoperability";
-Filename: "{code:GetAppPath|firefox.exe}"; Parameters: "selenium-ide.xpi"; WorkingDir: {app}; Flags: shellexec postinstall skipifsilent runascurrentuser; Components: pkg_ide; Check: HasFirefox; Description: "Install the Selenium IDE Addon for Firefox";
+Filename: "{code:GetAppPath|firefox.exe}"; Parameters: "-url ""{app}\extensions.xpi"""; WorkingDir: {app}; Flags: shellexec postinstall skipifsilent runascurrentuser; Components: pkg_ide; Check: HasFirefox; Description: "Install the Selenium IDE Addon for Firefox";
 
 [UninstallRun]
 ;Filename: "{app}\RegNet.exe"; Parameters: "-u"; WorkingDir: {app}; Flags: waituntilterminated runascurrentuser runhidden; StatusMsg: "Unregister for COM interoperability"; 
diff --git a/build-setup.py b/build-setup.py
@@ -51,14 +51,12 @@ def main():
     print 'Build implicit-wait addin ...'
     execute(APP_IRONPYTHON_PATH, __dir__ + r'\FirefoxAddons\build-implicit-wait.py', current_version)
     
-    print 'Extend SeleniumIDE ...'
-    out_xpi_path = __dir__ + r'\FirefoxAddons\bin\selenium-ide.xpi'
-    copy_file(__dir__ + r'\References\selenium-ide.xpi', out_xpi_path)
-    set_working_dir(__dir__ + r'\FirefoxAddons\bin')
-    with ZipFile(out_xpi_path, 'a') as zip:
-        zip.add(r'vb-format.xpi')
-        zip.add(r'implicit-wait.xpi')
-    set_working_dir(__dir__)
+    print 'Build extensions package ...'
+    with zipfile.ZipFile(__dir__ + r'\FirefoxAddons\bin\extensions.xpi', 'a') as zip:
+        zip.write(__dir__ + r'\FirefoxAddons\install.rdf', 'install.rdf')
+        zip.write(__dir__ + r'\References\selenium-ide.xpi', 'selenium-ide.xpi')
+        zip.write(__dir__ + r'\FirefoxAddons\bin\vb-formatters.xpi', 'vb-formatters.xpi')
+        zip.write(__dir__ + r'\FirefoxAddons\bin\implicit-wait.xpi', 'implicit-wait.xpi')
     
     print 'Build .Net library ...'
     execute(APP_MSBUILD_PATH, '/t:build', '/nologo', '/v:quiet',
diff --git a/update-references.py b/update-references.py
@@ -131,7 +131,8 @@ def update_SeleniumIDE(self):
         url = page2 + value
         cfg = self.cfgs.get('SeleniumIDE')
         if cfg.get('version') != version or not file_exists('selenium-ide.xpi'):
-            WebFile(url).save('selenium-ide.xpi')
+            with WebZip(url) as zip:
+                zip.extract(r'selenium-ide.xpi')
             cfg.update({'version': version, 'url': url})
             Log("Updated Selenium IDE to version " + version)
     
