diff --git a/ant/windows/windows-packager.nsi.in b/ant/windows/windows-packager.nsi.in index 85a114f..b71e49a 100644 --- a/ant/windows/windows-packager.nsi.in +++ b/ant/windows/windows-packager.nsi.in @@ -36,10 +36,16 @@ InstallDir "$PROGRAMFILES\${socket.name}" ;------------------------------ Section + ; Sets the context of shell folders to "All Users" + SetShellVarContext all + ; Kills any running ${socket.name} processes nsExec::ExecToLog "wmic.exe process where $\"Name like '%java%' and CommandLine like '%${build.socket.name}.jar%'$\" call terminate" + ; Cleanup for wmic on Windows XP + SetShellVarContext current Delete "$DESKTOP\TempWmicBatchFile.bat" + SetShellVarContext all SetOutPath "$INSTDIR" @@ -112,6 +118,9 @@ SectionEnd ;------------------------------- Section "Uninstall" + ; Sets the context of shell folders to "All Users" + SetShellVarContext all + ; Kills any running ${socket.name} processes nsExec::ExecToLog "wmic.exe process where $\"Name like '%java%' and CommandLine like '%${build.socket.name}.jar%'$\" call terminate" ; Cleanup for wmic on Windows XP @@ -133,6 +142,12 @@ Section "Uninstall" Delete "$DESKTOP\${socket.name}.url" Delete "$DESKTOP\${socket.name}.lnk" + + ; Sets the context of shell folders to current user + SetShellVarContext current + Delete "$DESKTOP\${socket.name}.url" + Delete "$DESKTOP\${socket.name}.lnk" + Delete "$SMPROGRAMS\${socket.name}.lnk" SectionEnd ;------------------------------- diff --git a/src/qz/common/Constants.java b/src/qz/common/Constants.java index e11ff4f..f5da1d2 100644 --- a/src/qz/common/Constants.java +++ b/src/qz/common/Constants.java @@ -11,7 +11,7 @@ public class Constants { public static final int OUTPUT_STREAM_SIZE = 20480; public static final int BYTE_BUFFER_SIZE = 512; public static final int APPEND_XML = 1; - public static final String VERSION = "1.9.2"; + public static final String VERSION = "1.9.3"; public static final int APPEND_RAW = 2; public static final int APPEND_IMAGE = 3; public static final int APPEND_IMAGE_PS = 4;