Merge lp:~dobey/ubuntuone-windows-installer/update-from-trunk into lp:ubuntuone-windows-installer/stable-3-0

[dobey]

[Brian Curtin]

    - Add Windows firewall exceptions to the installer.

[Roberto Alsina (ralsina)]

We need to raise the version to 3.0.0 in ubuntuone.xml and probably other places, I will do a patch tomorrow morning.

[Roberto Alsina (ralsina)]

review: Approve

=== modified file 'scripts/ubuntuone.xml'
--- scripts/ubuntuone.xml	2012-03-23 21:02:45 +0000
+++ scripts/ubuntuone.xml	2012-04-11 00:47:18 +0000
@@ -226,6 +226,44 @@
             <type>REG_SZ</type>
             <value>${installdir}\dist\ubuntu-sso-login.exe</value>
         </registrySet>
+        <setInstallerVariableFromRegEx>
+            <!-- Help get the paths correct on Windows 7
+                 netsh complains about path separators from installdir -->
+            <name>forwardslash_installdir</name>
+            <pattern>/</pattern>
+            <substitution>\</substitution>
+            <text>${installdir}</text>
+         </setInstallerVariableFromRegEx>
+        <runProgram>
+            <!-- Inbound Firewall allowance -->
+            <program>netsh.exe</program>
+            <programArguments>advfirewall firewall add rule name="Ubuntu One" dir=in action=allow program="${forwardslash_installdir}\dist\ubuntuone-syncdaemon.exe" enable=yes</programArguments>
+            <ruleEvaluationLogic>or</ruleEvaluationLogic>
+            <ruleList>
+                <!-- This usage of netsh is for Vista and 7. -->
+                <platformTest type="windows-vista" />
+                <platformTest type="windows-7" />
+            </ruleList>
+        </runProgram>
+        <runProgram>
+            <!-- Outbound Firewall allowance -->
+            <program>netsh.exe</program>
+            <programArguments>advfirewall firewall add rule name="Ubuntu One" dir=out action=allow program="${forwardslash_installdir}\dist\ubuntuone-syncdaemon.exe" enable=yes</programArguments>
+            <ruleEvaluationLogic>or</ruleEvaluationLogic>
+            <ruleList>
+                <!-- This usage of netsh is for Vista and 7. -->
+                <platformTest type="windows-vista" />
+                <platformTest type="windows-7" />
+            </ruleList>
+        </runProgram>
+        <runProgram>
+            <program>netsh.exe</program>
+            <programArguments>firewall add allowedprogram "${installdir}\dist\ubuntuone-syncdaemon.exe" "Ubuntu One" ENABLE</programArguments>
+            <ruleList>
+                <!-- This usage of netsh is for XP. -->
+                <platformTest type="windows-xp" />
+            </ruleList>
+        </runProgram>
         <runProgram>
             <program>${windows_folder_system}\RunDll32.exe</program>
             <programArguments>"${installdir}\dist\VistaLib32.dll" RunNonElevated "${installdir}\dist\ubuntuone-control-panel-qt.exe" --installer --with-icon &amp;</programArguments>