--- trunk/xvidextra/src/installer/xvid.xml	2015/06/08 18:56:36	2101
+++ trunk/xvidextra/src/installer/xvid.xml	2015/06/20 17:18:22	2126
@@ -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>
@@ -191,42 +203,167 @@
             </folderList>
             <startMenuShortcutList>
                 <startMenuShortcut>
-                    <comment>Uninstall ${product_fullname}</comment>
-                    <name>Uninstall ${product_fullname}</name>
+                    <comment>Configure the Decoder properties</comment>
+                    <name>Decoder Config</name>
+                    <ruleEvaluationLogic>or</ruleEvaluationLogic>
                     <runAsAdmin>0</runAsAdmin>
                     <runInTerminal>0</runInTerminal>
-                    <windowsExec>${installdir}/${uninstallerName}.exe</windowsExec>
-                    <windowsExecArgs></windowsExecArgs>
-                    <windowsIcon></windowsIcon>
-                    <windowsPath>${installdir}/</windowsPath>
+                    <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>Configure Decoder</name>
+                    <name>Decoder Config</name>
                     <runAsAdmin>0</runAsAdmin>
                     <runInTerminal>0</runInTerminal>
                     <windowsExec>${windows_folder_system}/rundll32.exe</windowsExec>
                     <windowsExecArgs>xvid.ax,Configure</windowsExecArgs>
-                    <windowsIcon>${installdir}/xvid.ico</windowsIcon>
+                    <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 +380,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>
@@ -318,6 +512,16 @@
                     <windowsIcon></windowsIcon>
                     <windowsPath>${installdir}/</windowsPath>
                 </startMenuShortcut>
+                <startMenuShortcut>
+                    <comment>Uninstall ${product_fullname}</comment>
+                    <name>Uninstall ${product_fullname}</name>
+                    <runAsAdmin>0</runAsAdmin>
+                    <runInTerminal>0</runInTerminal>
+                    <windowsExec>${installdir}/${uninstallerName}.exe</windowsExec>
+                    <windowsExecArgs>--debuglevel 3</windowsExecArgs>
+                    <windowsIcon>${installdir}/xvidw.ico</windowsIcon>
+                    <windowsPath>${installdir}</windowsPath>
+                </startMenuShortcut>
             </startMenuShortcutList>
         </component>
     </componentList>
@@ -992,10 +1196,6 @@
                 </platformTest>
                 <platformTest>
                     <negate>1</negate>
-                    <type>windows-nt</type>
-                </platformTest>
-                <platformTest>
-                    <negate>1</negate>
                     <type>windows-9x</type>
                 </platformTest>
                 <platformTest>
@@ -1025,10 +1225,6 @@
                 </platformTest>
                 <platformTest>
                     <negate>1</negate>
-                    <type>windows-nt</type>
-                </platformTest>
-                <platformTest>
-                    <negate>1</negate>
                     <type>windows-9x</type>
                 </platformTest>
                 <platformTest>
@@ -1048,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>
@@ -1073,10 +1269,6 @@
                 </platformTest>
                 <platformTest>
                     <negate>1</negate>
-                    <type>windows-nt</type>
-                </platformTest>
-                <platformTest>
-                    <negate>1</negate>
                     <type>windows-9x</type>
                 </platformTest>
                 <platformTest>
@@ -1109,10 +1301,6 @@
                 </platformTest>
                 <platformTest>
                     <negate>1</negate>
-                    <type>windows-nt</type>
-                </platformTest>
-                <platformTest>
-                    <negate>1</negate>
                     <type>windows-9x</type>
                 </platformTest>
                 <platformTest>
@@ -1145,10 +1333,6 @@
                 </platformTest>
                 <platformTest>
                     <negate>1</negate>
-                    <type>windows-nt</type>
-                </platformTest>
-                <platformTest>
-                    <negate>1</negate>
                     <type>windows-9x</type>
                 </platformTest>
                 <platformTest>
@@ -1178,10 +1362,6 @@
                 </platformTest>
                 <platformTest>
                     <negate>1</negate>
-                    <type>windows-nt</type>
-                </platformTest>
-                <platformTest>
-                    <negate>1</negate>
                     <type>windows-9x</type>
                 </platformTest>
                 <platformTest>
@@ -1213,10 +1393,6 @@
                 </platformTest>
                 <platformTest>
                     <negate>1</negate>
-                    <type>windows-nt</type>
-                </platformTest>
-                <platformTest>
-                    <negate>1</negate>
                     <type>windows-9x</type>
                 </platformTest>
                 <platformTest>
@@ -1251,10 +1427,6 @@
                 </platformTest>
                 <platformTest>
                     <negate>1</negate>
-                    <type>windows-nt</type>
-                </platformTest>
-                <platformTest>
-                    <negate>1</negate>
                     <type>windows-9x</type>
                 </platformTest>
                 <platformTest>
@@ -1289,10 +1461,6 @@
                 </platformTest>
                 <platformTest>
                     <negate>1</negate>
-                    <type>windows-nt</type>
-                </platformTest>
-                <platformTest>
-                    <negate>1</negate>
                     <type>windows-9x</type>
                 </platformTest>
                 <platformTest>
@@ -1324,10 +1492,6 @@
                 </platformTest>
                 <platformTest>
                     <negate>1</negate>
-                    <type>windows-nt</type>
-                </platformTest>
-                <platformTest>
-                    <negate>1</negate>
                     <type>windows-9x</type>
                 </platformTest>
                 <platformTest>
@@ -1729,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>