Mathematica -> v12.0.0

mathematica.xml

@@ -2,28 +2,15 @@
 <packages>
 <package id="mathematica" name="Mathematica" revision="%version%.1" reboot="false" priority="0">
  
-  <variable name="major" value="11" />
-  <variable name="minor" value="1" />
-  <variable name="sub" value="1" />
+  <variable name="major" value="12" />
+  <variable name="minor" value="0" />
+  <variable name="sub" value="0" />
   <variable name="version" value="%major%.%minor%.%sub%" />
-  <!-- Wildcards in path do not work, empirically, so even though wpkg for v10.0 used them I am not -->
-  <check type="uninstall" condition="versiongreaterorequal" path="Wolfram Mathematica %version% (M-WIN-L %version% 5716995)" value="%version%" />
-
-  <!-- attempt to uninstall 10.4, first; if there's an error it's probably because it's not there -->
-  <install cmd='"%programfiles%\Wolfram Research\Mathematica\10.4\SystemFiles\UninstallFiles\Windows\unins000.exe" /VERYSILENT'>
-		 <exit code='any'/>
-	</install>
-  <install cmd='"%programfiles%\Extras\uninstallfiles\windows\unins000.exe" /VERYSILENT'>
-		 <exit code='any'/>
-	</install>
-  <install cmd='%SOFTWARE%\wolfram\mathematica\%version%\setup.exe /verysilent /suppressmsgboxes'>
-  <!-- Dont think we need to do this <install cmd='cmd /c mkdir "%ProgramData%\Mathematica\Licensing" '> -->
-   <exit code='1'/>
-  </install>
-
-  <!-- Place mathpass in the default location for global password (different directory to <=10.x!) --> 
-  <install cmd='cmd /c copy %SOFTWARE%\wolfram\mathematica\mathpass "%programfiles%\Wolfram Research\Mathematica\%major%.%minor%\Configuration\Licensing\mathpass" '/>
+  <check type="uninstall" condition="versiongreaterorequal" path="Wolfram Mathematica %major% .+" value="%version%" />
+
+  <install cmd='%SOFTWARE%\wolfram\mathematica\%version%\setup.exe /verysilent /suppressmsgboxes' />
 
+  <install cmd='cmd /c copy %SOFTWARE%\wolfram\mathematica\mathpass "%programfiles%\Wolfram Research\Mathematica\%major%.%minor%\Configuration\Licensing\mathpass" '/>
 
   <upgrade cmd='cmd /c taskkill /f /im "wolframkernel.exe"'>
     <exit code='128'/>
@@ -32,16 +19,22 @@
   <upgrade cmd='cmd /c taskkill /f /im "mathematica.exe"'>
     <exit code='128'/>
   </upgrade>
+
+  <upgrade include="remove" />
   <upgrade include="install" />
 
-  <!-- Uninstall the Extras -->
-  <remove cmd='"%ProgramData%\Mathematica\Applications\SystemFiles\UninstallFiles\Windows\unins000.exe" /VERYSILENT /suppressmsgboxes'>
-   <exit code="9009"/>
+  <!-- uninstall old versions if they exist -->
+  <remove cmd='"%ProgramFiles%\Wolfram Research\Mathematica\11.1\SystemFiles\UninstallFiles\Windows\unins000.exe" /VERYSILENT /suppressmsgboxes'>
+    <condition>
+      <check type="file" condition="exists" path="%ProgramFiles%\Wolfram Research\Mathematica\11.1\SystemFiles\UninstallFiles\Windows\unins000.exe" />
+    </condition>
   </remove>
 
-  <!-- Uninstall Mathematica -->
+  <!-- Uninstall this Mathematica -->
   <remove cmd='"%ProgramFiles%\Wolfram Research\Mathematica\%major%.%minor%\SystemFiles\UninstallFiles\Windows\unins000.exe" /VERYSILENT /suppressmsgboxes'>
-   <exit code="9009"/>
+    <condition>
+      <check type="file" condition="exists" path="%ProgramFiles%\Wolfram Research\Mathematica\%major%.%minor%\SystemFiles\UninstallFiles\Windows\unins000.exe" />
+    </condition>
   </remove>
 
 </package>