Merge branch 'olex2' into 'master'

Olex2

See merge request !14

packages/olex2.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!--  vim: set softtabstop=3: -->
+<packages>
+  <package id="olex2" name="olex2" revision="%version%.1" priority="0" reboot="false">
+    <variable name="version" value="1.3" />
+
+    <!-- 1) download zip from their website and unpack
+         2) copy to %programfiles% on test computer
+         3) run olex2 as admin (needed so that it can compile lots of pyc files
+            and write them to %programfiles%)
+         4) copy %programfiles%\olex2 back to the deploy share complete with pyc files -->
+
+    <check type='registry' condition='equals' path='HKLM\software\ucam_wpkg.ch.cam.ac.uk\olex2\version' value="%version%" />
+
+    <install cmd='%WPKGSOFTWARE%\wpkg\tools\copydir.cmd "%WPKGSOFTWARE%\olex2\%version%" "%programfiles%\olex2"' />
+    <install cmd='cscript %WPKGSOFTWARE%\wpkg\tools\create-shortcut.js /folder:"Olex2" /linkname:"Olex2 %version%" /target:"%programfiles%\olex2\olex2.exe"' />
+    <install cmd='reg add HKLM\software\ucam_wpkg.ch.cam.ac.uk\olex2 /t reg_sz /v version /d %version% /f' />
+    
+    <upgrade include='remove' />
+    <upgrade include='install' />
+
+    <remove cmd='cmd /c if exist "%programfiles%\olex2" rmdir /s /q "%programfiles%\olex2"' />
+    <remove cmd='cscript %WPKGSOFTWARE%\wpkg\tools\delete-shortcut.js /folder:"Olex2"'/>
+    <remove cmd='reg delete HKLM\software\ucam_wpkg.ch.cam.ac.uk\olex2 /f' />
+
+  </package>
+</packages>