--- trunk/xvidextra/src/installer/xvid.xml	2014/06/06 00:01:45	2087
+++ trunk/xvidextra/src/installer/xvid.xml	2015/06/16 09:49:28	2119
@@ -1,7 +1,7 @@
 <project>
     <shortName>Xvid</shortName>
     <fullName>Xvid Video Codec</fullName>
-    <version>1.4.0</version>
+    <version>15</version>
     <installerFilename>${product_shortname}-${product_version}-${platform_name}.${platform_exec_suffix}</installerFilename>
     <readmeFile>releasenotes.txt</readmeFile>
     <licenseFile>../../LICENSE</licenseFile>
@@ -107,6 +107,18 @@
                         <distributionFile>
                             <origin>../../../xvidcore/build/win32/bin/xvid_encraw.exe</origin>
                         </distributionFile>
+                        <distributionFile>
+                            <origin>xvid_logo.png</origin>
+                        </distributionFile>
+                        <distributionFile>
+                            <origin>xvid.png</origin>
+                        </distributionFile>
+                        <distributionFile>
+                            <origin>xvidw.ico</origin>
+                        </distributionFile>
+                        <distributionFile>
+                            <origin>CheckUpdate.ps1</origin>
+                        </distributionFile>
                     </distributionFileList>
                     <shortcutList>
                         <linkShortcut>
@@ -202,31 +214,166 @@
                 </startMenuShortcut>
                 <startMenuShortcut>
                     <comment>Configure the Decoder properties</comment>
-                    <name>Configure Decoder</name>
+                    <name>Decoder Config</name>
+                    <ruleEvaluationLogic>or</ruleEvaluationLogic>
                     <runAsAdmin>0</runAsAdmin>
                     <runInTerminal>0</runInTerminal>
                     <windowsExec>${windows_folder_system}/rundll32.exe</windowsExec>
                     <windowsExecArgs>xvid.ax,Configure</windowsExecArgs>
                     <windowsIcon>${installdir}/xvid.ico</windowsIcon>
                     <windowsPath></windowsPath>
+                    <ruleList>
+                        <platformTest>
+                            <type>windows-xp</type>
+                        </platformTest>
+                        <platformTest>
+                            <type>windows-vista</type>
+                        </platformTest>
+                        <platformTest>
+                            <type>windows-9x</type>
+                        </platformTest>
+                        <platformTest>
+                            <type>windows-2003</type>
+                        </platformTest>
+                        <platformTest>
+                            <type>windows-2000</type>
+                        </platformTest>
+                        <platformTest>
+                            <type>windows-7</type>
+                        </platformTest>
+                    </ruleList>
+                </startMenuShortcut>
+                <startMenuShortcut>
+                    <comment>Configure the Decoder properties</comment>
+                    <name>Decoder Config</name>
+                    <runAsAdmin>0</runAsAdmin>
+                    <runInTerminal>0</runInTerminal>
+                    <windowsExec>${windows_folder_system}/rundll32.exe</windowsExec>
+                    <windowsExecArgs>xvid.ax,Configure</windowsExecArgs>
+                    <windowsIcon>${installdir}/xvidw.ico</windowsIcon>
+                    <windowsPath></windowsPath>
+                    <ruleList>
+                        <platformTest>
+                            <negate>1</negate>
+                            <type>windows-xp</type>
+                        </platformTest>
+                        <platformTest>
+                            <negate>1</negate>
+                            <type>windows-vista</type>
+                        </platformTest>
+                        <platformTest>
+                            <negate>1</negate>
+                            <type>windows-9x</type>
+                        </platformTest>
+                        <platformTest>
+                            <negate>1</negate>
+                            <type>windows-2003</type>
+                        </platformTest>
+                        <platformTest>
+                            <negate>1</negate>
+                            <type>windows-2000</type>
+                        </platformTest>
+                        <platformTest>
+                            <negate>1</negate>
+                            <type>windows-7</type>
+                        </platformTest>
+                    </ruleList>
                 </startMenuShortcut>
                 <startMenuShortcut>
                     <comment>Configure the encoder properties</comment>
-                    <name>Configure Encoder</name>
+                    <name>Encoder Config</name>
+                    <ruleEvaluationLogic>or</ruleEvaluationLogic>
                     <runAsAdmin>0</runAsAdmin>
                     <runInTerminal>0</runInTerminal>
                     <windowsExec>${windows_folder_system}/rundll32.exe</windowsExec>
                     <windowsExecArgs>xvidvfw.dll,Configure</windowsExecArgs>
                     <windowsIcon>${installdir}/xvid.ico</windowsIcon>
                     <windowsPath></windowsPath>
+                    <ruleList>
+                        <platformTest>
+                            <type>windows-xp</type>
+                        </platformTest>
+                        <platformTest>
+                            <type>windows-vista</type>
+                        </platformTest>
+                        <platformTest>
+                            <type>windows-9x</type>
+                        </platformTest>
+                        <platformTest>
+                            <type>windows-2003</type>
+                        </platformTest>
+                        <platformTest>
+                            <type>windows-2000</type>
+                        </platformTest>
+                        <platformTest>
+                            <type>windows-7</type>
+                        </platformTest>
+                    </ruleList>
+                </startMenuShortcut>
+                <startMenuShortcut>
+                    <comment>Configure the encoder properties</comment>
+                    <name>Encoder Config</name>
+                    <runAsAdmin>0</runAsAdmin>
+                    <runInTerminal>0</runInTerminal>
+                    <windowsExec>${windows_folder_system}/rundll32.exe</windowsExec>
+                    <windowsExecArgs>xvidvfw.dll,Configure</windowsExecArgs>
+                    <windowsIcon>${installdir}/xvidw.ico</windowsIcon>
+                    <windowsPath></windowsPath>
+                    <ruleList>
+                        <platformTest>
+                            <negate>1</negate>
+                            <type>windows-xp</type>
+                        </platformTest>
+                        <platformTest>
+                            <negate>1</negate>
+                            <type>windows-vista</type>
+                        </platformTest>
+                        <platformTest>
+                            <negate>1</negate>
+                            <type>windows-9x</type>
+                        </platformTest>
+                        <platformTest>
+                            <negate>1</negate>
+                            <type>windows-2003</type>
+                        </platformTest>
+                        <platformTest>
+                            <negate>1</negate>
+                            <type>windows-2000</type>
+                        </platformTest>
+                        <platformTest>
+                            <negate>1</negate>
+                            <type>windows-7</type>
+                        </platformTest>
+                    </ruleList>
                 </startMenuShortcut>
                 <startMenuFileShortcut>
                     <comment>Important notes concerning this Xvid build</comment>
                     <filePath>${installdir}/releasenotes.txt</filePath>
                     <name>Release Notes</name>
+                    <ruleEvaluationLogic>or</ruleEvaluationLogic>
                     <runAsAdmin>0</runAsAdmin>
                     <runInTerminal>0</runInTerminal>
                     <windowsIcon></windowsIcon>
+                    <ruleList>
+                        <platformTest>
+                            <type>windows-xp</type>
+                        </platformTest>
+                        <platformTest>
+                            <type>windows-vista</type>
+                        </platformTest>
+                        <platformTest>
+                            <type>windows-9x</type>
+                        </platformTest>
+                        <platformTest>
+                            <type>windows-2003</type>
+                        </platformTest>
+                        <platformTest>
+                            <type>windows-2000</type>
+                        </platformTest>
+                        <platformTest>
+                            <type>windows-7</type>
+                        </platformTest>
+                    </ruleList>
                 </startMenuFileShortcut>
                 <startMenuShortcut>
                     <comment>Check whether a new update for Xvid is available</comment>
@@ -243,12 +390,69 @@
                     <name>Xvid Homepage</name>
                     <runAsAdmin>0</runAsAdmin>
                     <runInTerminal>0</runInTerminal>
-                    <url>http://www.xvid.org</url>
+                    <url>https://www.xvid.com</url>
                     <windowsIcon></windowsIcon>
                 </startMenuLinkShortcut>
+                <startMenuShortcut>
+                    <comment>Command line encoder application</comment>
+                    <name>xvid_encraw</name>
+                    <runAsAdmin>0</runAsAdmin>
+                    <runInTerminal>0</runInTerminal>
+                    <windowsExec>%comspec%</windowsExec>
+                    <windowsExecArgs>/k ""${installdir}\xvid_encraw.exe"" -h</windowsExecArgs>
+                    <windowsIcon></windowsIcon>
+                    <windowsPath>${installdir}</windowsPath>
+                    <ruleList>
+                        <platformTest>
+                            <negate>1</negate>
+                            <type>windows-xp</type>
+                        </platformTest>
+                        <platformTest>
+                            <negate>1</negate>
+                            <type>windows-vista</type>
+                        </platformTest>
+                        <platformTest>
+                            <negate>1</negate>
+                            <type>windows-9x</type>
+                        </platformTest>
+                        <platformTest>
+                            <negate>1</negate>
+                            <type>windows-2003</type>
+                        </platformTest>
+                        <platformTest>
+                            <negate>1</negate>
+                            <type>windows-2000</type>
+                        </platformTest>
+                        <platformTest>
+                            <negate>1</negate>
+                            <type>windows-7</type>
+                        </platformTest>
+                    </ruleList>
+                </startMenuShortcut>
                 <startMenuFolder>
                     <name>Advanced</name>
                     <platforms>windows</platforms>
+                    <ruleEvaluationLogic>or</ruleEvaluationLogic>
+                    <ruleList>
+                        <platformTest>
+                            <type>windows-xp</type>
+                        </platformTest>
+                        <platformTest>
+                            <type>windows-vista</type>
+                        </platformTest>
+                        <platformTest>
+                            <type>windows-9x</type>
+                        </platformTest>
+                        <platformTest>
+                            <type>windows-2003</type>
+                        </platformTest>
+                        <platformTest>
+                            <type>windows-2000</type>
+                        </platformTest>
+                        <platformTest>
+                            <type>windows-7</type>
+                        </platformTest>
+                    </ruleList>
                     <startMenuShortcutList>
                         <startMenuShortcut>
                             <comment>Quickly change the FourCC of your AVI files</comment>
@@ -983,7 +1187,24 @@
             <workingDirectory>${system_temp_directory}/xvid_x86</workingDirectory>
             <ruleList>
                 <platformTest>
-                    <type>windows-7</type>
+                    <negate>1</negate>
+                    <type>windows-xp</type>
+                </platformTest>
+                <platformTest>
+                    <negate>1</negate>
+                    <type>windows-vista</type>
+                </platformTest>
+                <platformTest>
+                    <negate>1</negate>
+                    <type>windows-9x</type>
+                </platformTest>
+                <platformTest>
+                    <negate>1</negate>
+                    <type>windows-2003</type>
+                </platformTest>
+                <platformTest>
+                    <negate>1</negate>
+                    <type>windows-2000</type>
                 </platformTest>
             </ruleList>
         </runProgram>
@@ -995,7 +1216,24 @@
             <workingDirectory>${system_temp_directory}/xvid_x64</workingDirectory>
             <ruleList>
                 <platformTest>
-                    <type>windows-7</type>
+                    <negate>1</negate>
+                    <type>windows-xp</type>
+                </platformTest>
+                <platformTest>
+                    <negate>1</negate>
+                    <type>windows-vista</type>
+                </platformTest>
+                <platformTest>
+                    <negate>1</negate>
+                    <type>windows-9x</type>
+                </platformTest>
+                <platformTest>
+                    <negate>1</negate>
+                    <type>windows-2003</type>
+                </platformTest>
+                <platformTest>
+                    <negate>1</negate>
+                    <type>windows-2000</type>
                 </platformTest>
                 <platformTest>
                     <type>windows-x64</type>
@@ -1006,7 +1244,7 @@
             <key>HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Run</key>
             <name>Xvid</name>
             <type>REG_SZ</type>
-            <value>${installdir}\CheckUpdate.exe</value>
+            <value>powershell.exe -nologo -WindowStyle hidden -Noninteractive -NoProfile -ExecutionPolicy Bypass -File "${installdir}\CheckUpdate.ps1"</value>
             <ruleList>
                 <platformTest>
                     <type>windows</type>
@@ -1022,7 +1260,24 @@
             <wowMode>64</wowMode>
             <ruleList>
                 <platformTest>
-                    <type>windows-7</type>
+                    <negate>1</negate>
+                    <type>windows-xp</type>
+                </platformTest>
+                <platformTest>
+                    <negate>1</negate>
+                    <type>windows-vista</type>
+                </platformTest>
+                <platformTest>
+                    <negate>1</negate>
+                    <type>windows-9x</type>
+                </platformTest>
+                <platformTest>
+                    <negate>1</negate>
+                    <type>windows-2003</type>
+                </platformTest>
+                <platformTest>
+                    <negate>1</negate>
+                    <type>windows-2000</type>
                 </platformTest>
                 <platformTest>
                     <type>windows-x64</type>
@@ -1037,7 +1292,24 @@
             <wowMode>64</wowMode>
             <ruleList>
                 <platformTest>
-                    <type>windows-7</type>
+                    <negate>1</negate>
+                    <type>windows-xp</type>
+                </platformTest>
+                <platformTest>
+                    <negate>1</negate>
+                    <type>windows-vista</type>
+                </platformTest>
+                <platformTest>
+                    <negate>1</negate>
+                    <type>windows-9x</type>
+                </platformTest>
+                <platformTest>
+                    <negate>1</negate>
+                    <type>windows-2003</type>
+                </platformTest>
+                <platformTest>
+                    <negate>1</negate>
+                    <type>windows-2000</type>
                 </platformTest>
                 <platformTest>
                     <type>windows-x64</type>
@@ -1052,7 +1324,24 @@
             <wowMode>32</wowMode>
             <ruleList>
                 <platformTest>
-                    <type>windows-7</type>
+                    <negate>1</negate>
+                    <type>windows-xp</type>
+                </platformTest>
+                <platformTest>
+                    <negate>1</negate>
+                    <type>windows-vista</type>
+                </platformTest>
+                <platformTest>
+                    <negate>1</negate>
+                    <type>windows-9x</type>
+                </platformTest>
+                <platformTest>
+                    <negate>1</negate>
+                    <type>windows-2003</type>
+                </platformTest>
+                <platformTest>
+                    <negate>1</negate>
+                    <type>windows-2000</type>
                 </platformTest>
             </ruleList>
         </registryDelete>
@@ -1064,7 +1353,24 @@
             <wowMode>32</wowMode>
             <ruleList>
                 <platformTest>
-                    <type>windows-7</type>
+                    <negate>1</negate>
+                    <type>windows-xp</type>
+                </platformTest>
+                <platformTest>
+                    <negate>1</negate>
+                    <type>windows-vista</type>
+                </platformTest>
+                <platformTest>
+                    <negate>1</negate>
+                    <type>windows-9x</type>
+                </platformTest>
+                <platformTest>
+                    <negate>1</negate>
+                    <type>windows-2003</type>
+                </platformTest>
+                <platformTest>
+                    <negate>1</negate>
+                    <type>windows-2000</type>
                 </platformTest>
             </ruleList>
         </registryDelete>
@@ -1078,7 +1384,24 @@
             <wowMode>64</wowMode>
             <ruleList>
                 <platformTest>
-                    <type>windows-7</type>
+                    <negate>1</negate>
+                    <type>windows-xp</type>
+                </platformTest>
+                <platformTest>
+                    <negate>1</negate>
+                    <type>windows-vista</type>
+                </platformTest>
+                <platformTest>
+                    <negate>1</negate>
+                    <type>windows-9x</type>
+                </platformTest>
+                <platformTest>
+                    <negate>1</negate>
+                    <type>windows-2003</type>
+                </platformTest>
+                <platformTest>
+                    <negate>1</negate>
+                    <type>windows-2000</type>
                 </platformTest>
                 <platformTest>
                     <type>windows-x64</type>
@@ -1095,7 +1418,24 @@
             <wowMode>64</wowMode>
             <ruleList>
                 <platformTest>
-                    <type>windows-7</type>
+                    <negate>1</negate>
+                    <type>windows-xp</type>
+                </platformTest>
+                <platformTest>
+                    <negate>1</negate>
+                    <type>windows-vista</type>
+                </platformTest>
+                <platformTest>
+                    <negate>1</negate>
+                    <type>windows-9x</type>
+                </platformTest>
+                <platformTest>
+                    <negate>1</negate>
+                    <type>windows-2003</type>
+                </platformTest>
+                <platformTest>
+                    <negate>1</negate>
+                    <type>windows-2000</type>
                 </platformTest>
                 <platformTest>
                     <type>windows-x64</type>
@@ -1112,7 +1452,24 @@
             <wowMode>32</wowMode>
             <ruleList>
                 <platformTest>
-                    <type>windows-7</type>
+                    <negate>1</negate>
+                    <type>windows-xp</type>
+                </platformTest>
+                <platformTest>
+                    <negate>1</negate>
+                    <type>windows-vista</type>
+                </platformTest>
+                <platformTest>
+                    <negate>1</negate>
+                    <type>windows-9x</type>
+                </platformTest>
+                <platformTest>
+                    <negate>1</negate>
+                    <type>windows-2003</type>
+                </platformTest>
+                <platformTest>
+                    <negate>1</negate>
+                    <type>windows-2000</type>
                 </platformTest>
             </ruleList>
         </registrySet>
@@ -1126,7 +1483,24 @@
             <wowMode>32</wowMode>
             <ruleList>
                 <platformTest>
-                    <type>windows-7</type>
+                    <negate>1</negate>
+                    <type>windows-xp</type>
+                </platformTest>
+                <platformTest>
+                    <negate>1</negate>
+                    <type>windows-vista</type>
+                </platformTest>
+                <platformTest>
+                    <negate>1</negate>
+                    <type>windows-9x</type>
+                </platformTest>
+                <platformTest>
+                    <negate>1</negate>
+                    <type>windows-2003</type>
+                </platformTest>
+                <platformTest>
+                    <negate>1</negate>
+                    <type>windows-2000</type>
                 </platformTest>
             </ruleList>
         </registrySet>
@@ -1249,14 +1623,22 @@
             <value>${generic_mpeg4}</value>
         </registrySet>
         <runProgram>
-            <explanation>Installing Xvid Web Player</explanation>
-            <program>${windows_folder_system}/msiexec.exe</program>
-            <programArguments>/q /i "${installdir}/XvidWebPlayer.msi" INSTALLDIR="${installdir}/xvid-gstreamer/0.10/x86/bin"</programArguments>
+            <program>${windows_folder_system}\msiexec.exe</program>
+            <programArguments>/passive /i "${installdir.dos}\xvid-gstreamer-x86-2013.6.msi" "INSTALLDIR=${installdir.dos}\xvid-gstreamer"</programArguments>
+            <show>0</show>
+            <useMSDOSPath>0</useMSDOSPath>
         </runProgram>
         <runProgram>
-            <program>${windows_folder_system}/msiexec</program>
-            <programArguments>/q /i "${installdir}/xvid-gstreamer-x86-2013.6.msi" INSTALLDIR="${installdir}/xvid-gstreamer"</programArguments>
+            <explanation>Installing Xvid Web Player</explanation>
+            <program>${windows_folder_system}\msiexec.exe</program>
+            <programArguments>/passive /I "${installdir.dos}\XvidWebPlayer.msi" "INSTALLDIR=${installdir.dos}\xvid-gstreamer\0.10\x86\bin"</programArguments>
+            <show>0</show>
+            <useMSDOSPath>0</useMSDOSPath>
         </runProgram>
+        <addDirectoryToPath>
+            <insertAt>end</insertAt>
+            <path>${installdir}\xvid-gstreamer\0.10\x86\bin</path>
+        </addDirectoryToPath>
     </postInstallationActionList>
     <preUninstallationActionList>
         <runProgram>
@@ -1468,6 +1850,19 @@
                 </platformTest>
             </ruleList>
         </deleteFile>
+        <runProgram>
+            <program>${windows_folder_system}\msiexec.exe</program>
+            <programArguments>/passive /x "${installdir.dos}\XvidWebPlayer.msi" "INSTALLDIR=${installdir.dos}\xvid-gstreamer\0.10\x86\bin"</programArguments>
+            <useMSDOSPath>0</useMSDOSPath>
+        </runProgram>
+        <runProgram>
+            <program>${windows_folder_system}\msiexec.exe</program>
+            <programArguments>/passive /x "${installdir.dos}\xvid-gstreamer-x86-2013.6.msi" "INSTALLDIR=${installdir.dos}\xvid-gstreamer"</programArguments>
+            <useMSDOSPath>0</useMSDOSPath>
+        </runProgram>
+        <removeDirectoryFromPath>
+            <path>${installdir}\xvid-gstreamer\0.10\x86\bin</path>
+        </removeDirectoryFromPath>
     </preUninstallationActionList>
     <postUninstallationActionList>
         <registryDelete>
@@ -1498,9 +1893,7 @@
     <requireInstallationByRootUser>1</requireInstallationByRootUser>
     <saveRelativePaths>1</saveRelativePaths>
     <startMenuGroupName>${product_shortname}</startMenuGroupName>
-    <updateInformationURL>http://update.xvid.org/update.xml</updateInformationURL>
     <vendor>Xvid Team</vendor>
-    <versionId>132</versionId>
     <windowsExecutableIcon>xvid.ico</windowsExecutableIcon>
     <windowsResourceFileVersion>1.4.0.0</windowsResourceFileVersion>
     <windowsResourceOriginalFilename>${product_shortname}-${product_version}-${platform_name}.${platform_exec_suffix}</windowsResourceOriginalFilename>