Merge pull request #13196 from Pugwash1/20240616-launchjmri

LaunchJMRI.exe Actually make the /noisy parameter do what it says it does.

help/en/releasenotes/current-draft-note.shtml

@@ -600,6 +600,6 @@
     <h3>Miscellaneous</h3>
         <a id="Misc" name="Misc"></a>
         <ul>
-            <li></li>
+            <li>Updated LauchJMRI.exe to display the console when the /noisy is used. No more return code 1, but and actual explanation</li>
         </ul>
 

scripts/WinInstallFiles/LaunchJMRI.nsi

@@ -25,6 +25,10 @@
 ; -------------------------------------------------------------------------
 ; - Version History
 ; -------------------------------------------------------------------------
+; - Version 0.1.31.0
+; - Make /noisy do what its supposed to do and display the console
+; - NB version 0.1.30.0 seems to have been skipped
+; -------------------------------------------------------------------------
 ; - Version 0.1.28.1
 ; - Do not set the jinput.plugins property
 ; -------------------------------------------------------------------------
@@ -178,7 +182,7 @@
 !define AUTHOR     "Matt Harris for JMRI"         ; Author name
 !define APP        "LaunchJMRI"                   ; Application name
 !define COPYRIGHT  "(C) 1997-2024 JMRI Community" ; Copyright string
-!define VER        "0.1.29.0"                     ; Launcher version
+!define VER        "0.1.31.0"                     ; Launcher version
 !define PNAME      "${APP}"                       ; Name of launcher
 ; -- Comment out next line to use {app}.ico
 !define ICON       "decpro5.ico"                  ; Launcher icon
@@ -743,9 +747,19 @@ Section "Main"
 
   ; -- Launch the Java class.
   LaunchJMRI:
-  DetailPrint "Launching JMRI"
-  ; -- use $7 to hold return value
-  ExecWait `"$JEXEPATH" $OPTIONS -Djava.class.path="$CLASSPATH" $CLASS $PARAMETERS` $7
+    DetailPrint "Launching JMRI"
+    ; -- use $7 to hold return value
+    StrCmp $NOISY ${SW_NORMAL} IsNoisyExec
+    ExecWait `"$JEXEPATH" $OPTIONS -Djava.class.path="$CLASSPATH" $CLASS $PARAMETERS` $7
+    Goto IsNotNoisy
+
+  IsNoisyExec:
+    ; -- use $7 to hold return value
+    nsExec::ExecToLog `"$JEXEPATH" $OPTIONS -Djava.class.path="$CLASSPATH" $CLASS $PARAMETERS`
+    Pop $0
+    Pop $7    ;-- response code
+
+  IsNotNoisy:
 
   ; -- We're no longer active
   DetailPrint "Return code from process: $7"