From 1f385b527aaf6e6d71d1fa540afeb4af8d553153 Mon Sep 17 00:00:00 2001 From: Tres Finocchiaro Date: Tue, 22 Jun 2021 17:16:50 -0400 Subject: [PATCH 1/3] Add qz-tray-console.exe for debugging purposes Supersedes #801 --- .gitignore | 1 + ant/windows/installer.xml | 9 +++++++++ .../nsis/Plugins/Release_ANSI/ExecDos.dll | Bin 0 -> 6656 bytes .../nsis/Plugins/Release_Unicode/ExecDos.dll | Bin 0 -> 6656 bytes ant/windows/nsis/console.ico | Bin 0 -> 429819 bytes 5 files changed, 10 insertions(+) create mode 100644 ant/windows/nsis/Plugins/Release_ANSI/ExecDos.dll create mode 100644 ant/windows/nsis/Plugins/Release_Unicode/ExecDos.dll create mode 100644 ant/windows/nsis/console.ico diff --git a/.gitignore b/.gitignore index 21c445edf..6d505cf44 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /fx.zip /README.md .DS_Store +windows-debug-launcher.nsi.in \ No newline at end of file diff --git a/ant/windows/installer.xml b/ant/windows/installer.xml index 27dd05484..d68884f6e 100644 --- a/ant/windows/installer.xml +++ b/ant/windows/installer.xml @@ -15,6 +15,15 @@ + + + + + + + + + diff --git a/ant/windows/nsis/Plugins/Release_ANSI/ExecDos.dll b/ant/windows/nsis/Plugins/Release_ANSI/ExecDos.dll new file mode 100644 index 0000000000000000000000000000000000000000..0d8a871a9d21ed04871ee7edc8ea0aa89e365258 GIT binary patch literal 6656 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 literal 0 HcmV?d00001 diff --git a/ant/windows/nsis/Plugins/Release_Unicode/ExecDos.dll b/ant/windows/nsis/Plugins/Release_Unicode/ExecDos.dll new file mode 100644 index 0000000000000000000000000000000000000000..d6b7ab022bac751c64668e0325e75d06f0f1f4f8 GIT binary patch literal 6656 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 Date: Tue, 22 Jun 2021 17:19:19 -0400 Subject: [PATCH 2/3] Remove unneeded files --- .../nsis/Plugins/Release_ANSI/ExecDos.dll | Bin 6656 -> 0 bytes .../nsis/Plugins/Release_Unicode/ExecDos.dll | Bin 6656 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 ant/windows/nsis/Plugins/Release_ANSI/ExecDos.dll delete mode 100644 ant/windows/nsis/Plugins/Release_Unicode/ExecDos.dll diff --git a/ant/windows/nsis/Plugins/Release_ANSI/ExecDos.dll b/ant/windows/nsis/Plugins/Release_ANSI/ExecDos.dll deleted file mode 100644 index 0d8a871a9d21ed04871ee7edc8ea0aa89e365258..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6656 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 diff --git a/ant/windows/nsis/Plugins/Release_Unicode/ExecDos.dll b/ant/windows/nsis/Plugins/Release_Unicode/ExecDos.dll deleted file mode 100644 index d6b7ab022bac751c64668e0325e75d06f0f1f4f8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6656 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 Date: Thu, 24 Jun 2021 20:48:06 -0400 Subject: [PATCH 3/3] Use cmd.exe from qz-tray-console.exe --- ant/windows/nsis/Include/StrLoc.nsh | 72 +++++++++++++++++++++++++++++ ant/windows/windows-launcher.nsi.in | 13 +++++- 2 files changed, 84 insertions(+), 1 deletion(-) create mode 100644 ant/windows/nsis/Include/StrLoc.nsh diff --git a/ant/windows/nsis/Include/StrLoc.nsh b/ant/windows/nsis/Include/StrLoc.nsh new file mode 100644 index 000000000..8adb1caab --- /dev/null +++ b/ant/windows/nsis/Include/StrLoc.nsh @@ -0,0 +1,72 @@ +!define StrLoc "!insertmacro StrLoc" + +!macro StrLoc ResultVar String SubString StartPoint + Push "${String}" + Push "${SubString}" + Push "${StartPoint}" + Call StrLoc + Pop "${ResultVar}" +!macroend + +Function StrLoc +/*After this point: + ------------------------------------------ + $R0 = StartPoint (input) + $R1 = SubString (input) + $R2 = String (input) + $R3 = SubStringLen (temp) + $R4 = StrLen (temp) + $R5 = StartCharPos (temp) + $R6 = TempStr (temp)*/ + + ;Get input from user + Exch $R0 + Exch + Exch $R1 + Exch 2 + Exch $R2 + Push $R3 + Push $R4 + Push $R5 + Push $R6 + + ;Get "String" and "SubString" length + StrLen $R3 $R1 + StrLen $R4 $R2 + ;Start "StartCharPos" counter + StrCpy $R5 0 + + ;Loop until "SubString" is found or "String" reaches its end + ${Do} + ;Remove everything before and after the searched part ("TempStr") + StrCpy $R6 $R2 $R3 $R5 + + ;Compare "TempStr" with "SubString" + ${If} $R6 == $R1 + ${If} $R0 == `<` + IntOp $R6 $R3 + $R5 + IntOp $R0 $R4 - $R6 + ${Else} + StrCpy $R0 $R5 + ${EndIf} + ${ExitDo} + ${EndIf} + ;If not "SubString", this could be "String"'s end + ${If} $R5 >= $R4 + StrCpy $R0 `` + ${ExitDo} + ${EndIf} + ;If not, continue the loop + IntOp $R5 $R5 + 1 + ${Loop} + + ;Return output to user + Pop $R6 + Pop $R5 + Pop $R4 + Pop $R3 + Pop $R2 + Exch + Pop $R1 + Exch $R0 +FunctionEnd \ No newline at end of file diff --git a/ant/windows/windows-launcher.nsi.in b/ant/windows/windows-launcher.nsi.in index c15ed51ee..5a326acbf 100644 --- a/ant/windows/windows-launcher.nsi.in +++ b/ant/windows/windows-launcher.nsi.in @@ -8,6 +8,7 @@ !endif !addincludedir "${basedir}/ant/windows/nsis/Include" !include StdUtils.nsh +!include StrLoc.nsh !include FindJava.nsh !insertmacro GetParameters @@ -54,7 +55,17 @@ Section IfErrors +2 0 StrCpy $opts "$opts $R0" - Exec '"$javaw" $opts -jar "${JAR}" $params' + Var /GLOBAL command + StrCpy $command '"$javaw" $opts -jar "${JAR}" $params' + + ; If ends in "-console.exe", use "cmd /s /k" to launch + ${StrLoc} $R1 "${nsis.outfile}" "-console.exe" "<" + ${If} $R1 == "0" + ExpandEnvStrings $R2 %COMSPEC% + StrCpy $command '"$R2" /s /k "$command"' + ${EndIf} + + Exec $command ${If} ${RunningX64} ${EnableX64FSRedirection} ${EndIf}