--- trunk/xvidextra/src/installer/xvid.xml	2014/06/06 00:01:45	2087
+++ trunk/xvidextra/src/installer/xvid.xml	2015/06/08 18:56:36	2101
@@ -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>
@@ -983,7 +983,28 @@
             <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-nt</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 +1016,28 @@
             <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-nt</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>
@@ -1022,7 +1064,28 @@
             <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-nt</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 +1100,28 @@
             <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-nt</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 +1136,28 @@
             <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-nt</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 +1169,28 @@
             <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-nt</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 +1204,28 @@
             <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-nt</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 +1242,28 @@
             <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-nt</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 +1280,28 @@
             <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-nt</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 +1315,28 @@
             <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-nt</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 +1459,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 +1686,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>