Merge pull request #669 from QB64-Phoenix-Edition/build-fixes

Build fixes

Author: RhoSigma-QB64

.ci/make-dist.sh

@@ -8,8 +8,8 @@ ARCHIVE_ROOT=qb64pe
 DIST_ROOT=./dist/$ARCHIVE_ROOT
 
 # populate internal/help from static download and updates from Wiki
-curl --silent --retry 5 -o ./help.zip https://qb64phoenix.com/qb64_files/help.zip
-unzip -oqq ./help.zip -d ./internal >/dev/null 2>&1 || true
+curl --silent --retry 3 -o ./help.zip https://qb64phoenix.com/qb64_files/help.zip
+unzip -oqq ./help.zip -d ./internal
 ./qb64pe -u
 # end internal/help
 

source/ide/wiki/wiki_methods.bas

@@ -1150,12 +1150,16 @@ FUNCTION wikiDLPage$ (url$, timeout#)
     '--- set default result & avoid side effects ---
     wikiDLPage$ = ""
     wik$ = url$: tio# = timeout#
+    redirDev$ = "/dev/null": IF INSTR(_OS$, "WIN") > 0 THEN redirDev$ = "NUL"
     '--- request wiki page ---
     retry:
-    ch& = _OPENCLIENT(wik$)
+    FOR r% = 1 TO 3
+        ch& = _OPENCLIENT(wik$)
+        IF ch& = 0 THEN _DELAY 5: ELSE EXIT FOR
+    NEXT r%
     IF Help_Recaching < 2 THEN 'avoid messages for 'qb64pe -u' (build time update)
         IF ch& = 0 AND LCASE$(LEFT$(wik$, 8)) = "https://" THEN
-            IF _SHELLHIDE("curl --version >NUL") <> 0 THEN
+            IF _SHELLHIDE("curl --version >" + redirDev$) <> 0 THEN
                 'no external curl available (see notes below)
                 IF _MESSAGEBOX("QB64-PE Help", "Can't make secure connection (https:) to Wiki, shall the IDE use unsecure (http:) instead?", "yesno", "warning") = 1 THEN
                     IF _MESSAGEBOX("QB64-PE Help", "Do you wanna save your choice permanently for the future?", "yesno", "question") = 1 THEN
@@ -1198,17 +1202,19 @@ FUNCTION wikiDLPage$ (url$, timeout#)
     'and instead only give that information to people who complain about
     'not working Wiki downloads in the Forum/Discord.
     '--- check for curl ---
-    IF _SHELLHIDE("curl --version >NUL") = 0 THEN
-        '--- 1st restore https: protocol, if changed above ---
-        IF LCASE$(LEFT$(wik$, 7)) = "http://" THEN wik$ = "https://" + MID$(wik$, 8)
-        '--- issue curl request ---
-        responseFile$ = Cache_Folder$ + "/curlResponse.txt"
-        SHELL _HIDE "curl --silent -o " + CHR$(34) + responseFile$ + CHR$(34) + " " + CHR$(34) + wik$ + CHR$(34)
-        '--- read the response ---
-        res$ = _READFILE$(responseFile$)
-        KILL responseFile$
-        '--- set result ---
-        wikiDLPage$ = res$
+    IF Help_Recaching < 2 THEN 'avoid using cUrl for 'qb64pe -u' (build time update)
+        IF _SHELLHIDE("curl --version >" + redirDev$) = 0 THEN
+            '--- 1st restore https: protocol, if changed above ---
+            IF LCASE$(LEFT$(wik$, 7)) = "http://" THEN wik$ = "https://" + MID$(wik$, 8)
+            '--- issue curl request ---
+            responseFile$ = Cache_Folder$ + "/curlResponse.txt"
+            SHELL _HIDE "curl --silent -o " + CHR$(34) + responseFile$ + CHR$(34) + " " + CHR$(34) + wik$ + CHR$(34)
+            '--- read the response ---
+            res$ = _READFILE$(responseFile$)
+            KILL responseFile$
+            '--- set result ---
+            wikiDLPage$ = res$
+        END IF
     END IF
 END FUNCTION
 

source/qb64pe.bas

@@ -13465,7 +13465,7 @@ FUNCTION ParseCMDLineArgs$ ()
                 Help_Recaching = 2: Help_IgnoreCache = 1
                 IF ideupdatehelpbox THEN
                     _DEST _CONSOLE
-                    PRINT "Update failed: Can't make connection to Wiki."
+                    PRINT "Help update failed: Can't make connection to Wiki."
                     SYSTEM 1
                 END IF
                 SYSTEM

tests/compile_tests/console_only/audio_out.bas

@@ -1,5 +1,4 @@
 $CONSOLE:ONLY
-_DEST _CONSOLE
 
 PLAY "O3"
 print "this is a test";

tests/compile_tests/console_only/devices.bas

@@ -1,5 +1,4 @@
 $CONSOLE:ONLY
-_DEST _CONSOLE
 
 print _DEVICES > 1;
 _DELAY 1

tests/compile_tests/console_only/libz.bas

@@ -1,5 +1,4 @@
 $CONSOLE:ONLY
-_DEST _CONSOLE
 
 PRINT HexString$(_DEFLATE$("this is a test"))
 SYSTEM

tests/compile_tests/console_only/midi.bas

@@ -1,5 +1,4 @@
 $CONSOLE:ONLY
-_DEST _CONSOLE
 ON ERROR GOTO errorhand
 
 CHDIR _STARTDIR$

tests/compile_tests/console_only/screenimage.bas

@@ -1,5 +1,4 @@
 $CONSOLE:ONLY
-_DEST _CONSOLE
 
 $IF WIN THEN
 $ELSE