Update to 3.0.0 and deploy x64 build on x64 systems

packages/vlc.xml

@@ -2,19 +2,18 @@
 <packages>
     <package id='vlc'
              name='Lecteur multimedia VideoLAN Client'
-             revision='24'
+             revision='25'
              priority='10'
              reboot='false' >
 
-        <variable name="PKG_VERSION" value="2.2.8" />
-        <variable name="SETUP_PATH" value="%SOFTWARE%\vlc\vlc-%PKG_VERSION%-win32.exe" />
-        <variable architecture="x86" name="INSTALL_PATH" value="%PROGRAMFILES%" />
-        <variable architecture="x64" name="INSTALL_PATH" value="%PROGRAMFILES(x86)%" />
+        <variable name="PKG_VERSION" value="3.0.0" />
+        <variable architecture="x86" name="SETUP_PATH" value="%SOFTWARE%\vlc\vlc-%PKG_VERSION%-win32.exe" />
+        <variable architecture="x64" name="SETUP_PATH" value="%SOFTWARE%\vlc\vlc-%PKG_VERSION%-win64.exe" />
 
         <check type='uninstall' condition='versionequalto' path='VLC media player' value='%PKG_VERSION%'/>
 
         <install include='remove' />
-        <install cmd='%COMSPEC% /C start /wait "VLC" "%SETUP_PATH%" /S /NCRC /D="%INSTALL_PATH%"'/>
+        <install cmd='%COMSPEC% /C start /wait "VLC" "%SETUP_PATH%" /S /NCRC /D="%PROGRAMFILES%"'/>
         <!-- XP -->
         <install cmd='%COMSPEC% /C del /F /Q "%ALLUSERSPROFILE%\Bureau\VLC media player**"'>
             <exit code="any" />
@@ -24,12 +23,12 @@
             <exit code="any" />
         </install>
 
+        <!-- Remove x86 on x64 systems -->
+        <upgrade architecture="x64" cmd='%COMSPEC% /C if exist "%PROGRAMFILES(x86)%\VideoLAN\VLC\uninstall.exe" "%PROGRAMFILES(x86)%\VideoLAN\VLC\uninstall.exe" /S _?=%PROGRAMFILES(x86)%\VideoLAN\VLC' />
         <upgrade include='install'/>
 
-        <downgrade include='install' />
+        <downgrade include='upgrade' />
 
-        <!-- Suppression de la version win64 sur les windows x64 -->
-        <remove architecture="x64" cmd='%COMSPEC% /C if exist "%PROGRAMFILES%\VideoLAN\VLC\uninstall.exe" "%PROGRAMFILES%\VideoLAN\VLC\uninstall.exe" /S _?=%PROGRAMFILES%\VideoLAN\VLC' />
         <remove cmd='%COMSPEC% /C if exist "%INSTALL_PATH%\VideoLAN\VLC\uninstall.exe" "%INSTALL_PATH%\VideoLAN\VLC\uninstall.exe" /S _?=%INSTALL_PATH%\VideoLAN\VLC'/>
         <remove cmd='%COMSPEC% /C if exist "%INSTALL_PATH%\VideoLAN\VLC" rmdir /S /Q "%INSTALL_PATH%\VideoLAN"'/>
     </package>