[lmi-commits] [lmi] master cbae25fb: Specify ".exe" with 'wine' almost everywhere

[Greg Chicares]

branch: master
commit cbae25fb65af70878b59df79259b2ebf3546f348
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>

    Specify ".exe" with 'wine' almost everywhere
    
    The latest version (wine-7.0) in debian 'bookworm' is even more strict
    than its predecessors in demanding an ".exe" extension on msw binaries.
    Some wine-provided programs appear not to have this problem:
      wine reg
      wine regedit
      wine wineboot
    so that extension hasn't been added in those cases, lest it break them
    in some future version.
    
    Fixes this actual observed failure [lines broken to fit here]:
    
    wine /opt/lmi/bin/rate_table_tool --accept --file=proprietary \
      --merge=/opt/lmi/proprietary/tables
    + wine /opt/lmi/bin/rate_table_tool --accept --file=proprietary \
      --merge=/opt/lmi/proprietary/tables
    it looks like wine32 is missing, you should install it.
    multiarch needs to be enabled first.  as root, please
    execute "dpkg --add-architecture i386 && apt-get update &&
    apt-get install wine32:i386"
    wine: failed to open "/opt/lmi/bin/rate_table_tool": c0000135
---
 authenticity_test.cpp | 2 +-
 gwc/develop1.txt      | 9 +++++----
 gwc/install_posix.sh  | 8 +++++---
 install_msw.sh        | 8 +++++---
 lmi_setup_40.sh       | 3 +++
 lmi_setup_43.sh       | 2 +-
 nychthemeral_test.sh  | 2 +-
 tabs/6/startup_script | 2 +-
 8 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/authenticity_test.cpp b/authenticity_test.cpp
index 568bdc68..f70ec3f5 100644
--- a/authenticity_test.cpp
+++ b/authenticity_test.cpp
@@ -266,7 +266,7 @@ void PasskeyTest::CheckNominal(char const* file, int line) 
const
 /// By default, lmi authenticates itself at startup. Its executable
 /// and data files shouldn't need to be in any particular directory;
 /// an invocation like this:
-///   wine /opt/lmi/bin/lmi_wx_shared --data_path=/opt/lmi/data
+///   /opt/lmi/bin/lmi_wx_shared --data_path=/opt/lmi/data
 /// should just work. This test checks that invariant, as follows.
 ///
 /// First, change ${PWD}; authenticate; and restore ${PWD}, verifying
diff --git a/gwc/develop1.txt b/gwc/develop1.txt
index e645949f..8117f3b8 100644
--- a/gwc/develop1.txt
+++ b/gwc/develop1.txt
@@ -369,7 +369,8 @@ git diff --no-index --color=always --color-moved=plain 
/opt/lmi/logs/log-old /op
 
 mkdir /tmp/q
 pushd /tmp/q
-
-[wine] /opt/lmi/bin/rate_table_tool --accept --file=/opt/lmi/data/some_name 
--extract-all
-  # for example:
-wine /opt/lmi/bin/rate_table_tool --accept --file=/opt/lmi/data/qx_cso 
--extract-all
+  # examples using 'qx_cso' database
+  # GNU/linux native:
+     /opt/lmi/bin/rate_table_tool     --accept --file=/opt/lmi/data/qx_cso 
--extract-all
+  # wine:
+wine /opt/lmi/bin/rate_table_tool.exe --accept --file=/opt/lmi/data/qx_cso 
--extract-all
diff --git a/gwc/install_posix.sh b/gwc/install_posix.sh
index 66639a60..29b0cdf6 100755
--- a/gwc/install_posix.sh
+++ b/gwc/install_posix.sh
@@ -195,9 +195,11 @@ mkdir --parents /opt/lmi/data
 
 # To regenerate authentication files for production distributions:
 # cd /opt/lmi/data
-# printf '2450449 2472011'             >expiry
-# printf '%s\n' "$(md5sum expiry)"     >validated.md5
-# [wine] /opt/lmi/bin/generate_passkey >passkey
+# printf '2450449 2472011'         >expiry
+# printf '%s\n' "$(md5sum expiry)" >validated.md5
+# /opt/lmi/bin/generate_passkey    >passkey
+#   alternatively, for 'wine':
+# wine /opt/lmi/bin/generate_passkey.exe >passkey
 printf '2450449 2472011'                            >/opt/lmi/data/expiry
 printf '5fc68a795c9c60da1b32be989efc299a  expiry\n' 
>/opt/lmi/data/validated.md5
 printf '391daa5cbc54e118c4737446bcb84eea'           >/opt/lmi/data/passkey
diff --git a/install_msw.sh b/install_msw.sh
index 058e3865..3efc5c67 100755
--- a/install_msw.sh
+++ b/install_msw.sh
@@ -353,9 +353,11 @@ mkdir --parents /opt/lmi/data
 
 # To regenerate authentication files for production distributions:
 # cd /opt/lmi/data
-# printf '2450449 2472011'             >expiry
-# printf '%s\n' "$(md5sum expiry)"     >validated.md5
-# [wine] /opt/lmi/bin/generate_passkey >passkey
+# printf '2450449 2472011'         >expiry
+# printf '%s\n' "$(md5sum expiry)" >validated.md5
+# /opt/lmi/bin/generate_passkey    >passkey
+#   alternatively, for 'wine':
+# wine /opt/lmi/bin/generate_passkey.exe >passkey
 printf '2450449 2472011'                            >/opt/lmi/data/expiry
 printf '5fc68a795c9c60da1b32be989efc299a  expiry\n' 
>/opt/lmi/data/validated.md5
 printf '391daa5cbc54e118c4737446bcb84eea'           >/opt/lmi/data/passkey
diff --git a/lmi_setup_40.sh b/lmi_setup_40.sh
index a5e927ab..61a1981b 100755
--- a/lmi_setup_40.sh
+++ b/lmi_setup_40.sh
@@ -32,6 +32,7 @@ assert_chrooted
 
 # Initialize wine. See:
 #   https://lists.nongnu.org/archive/html/lmi/2016-10/msg00002.html
+#   (even with wine-7.0, no ".exe" suffix is required here)
 WINEDLLOVERRIDES=mscoree=d wine wineboot
 #
 # Don't worry about this:
@@ -70,8 +71,10 @@ winecfg
 #   HKCU\Control Panel\International:
 #     set sShortDate and sLongDate to "yyyy-MM-dd"
 # using either the 'regedit' GUI:
+#   (even with wine-7.0, no ".exe" suffix is required here)
 wine regedit
 # or the command-line registry editor:
+#   (even with wine-7.0, no ".exe" suffix is required here)
 #   wine reg add "HKCU\Control Panel\International" /v "sLongDate"  /d 
"yyyy-MM-dd" /f
 #   wine reg add "HKCU\Control Panel\International" /v "sShortDate" /d 
"yyyy-MM-dd" /f
 
diff --git a/lmi_setup_43.sh b/lmi_setup_43.sh
index 8d0fd0f1..96ffffdc 100755
--- a/lmi_setup_43.sh
+++ b/lmi_setup_43.sh
@@ -89,7 +89,7 @@ rm /opt/lmi/"${LMI_COMPILER}_${LMI_TRIPLET}"/build/ship/my*
 # the first time, because there are no old files to remove):
 cd /opt/lmi/data || { printf 'failed: cd\n'; exit 3; }
 rm --force proprietary.dat proprietary.ndx
-wine /opt/lmi/bin/rate_table_tool --accept --file=proprietary 
--merge=/opt/lmi/proprietary/tables
+wine /opt/lmi/bin/rate_table_tool.exe --accept --file=proprietary 
--merge=/opt/lmi/proprietary/tables
 
 coefficiency="--jobs=$(nproc)"
 
diff --git a/nychthemeral_test.sh b/nychthemeral_test.sh
index 0605235c..d9daad6d 100755
--- a/nychthemeral_test.sh
+++ b/nychthemeral_test.sh
@@ -354,7 +354,7 @@ make "$coefficiency" install check_physical_closure 2>&1 \
 # The automated GUI test simulates keyboard and mouse actions, so
 # no such actions must be performed manually while it is running
 # (unless it is run in a virtual frame buffer, as with Xvfb here).
-# The $WINEDEBUG setting inhibits wine-6.0.3 nuisance messages.
+# The $WINEDEBUG setting inhibits wine-{6,7}.0 nuisance messages.
 if [ "x86_64-pc-linux-gnu" != "$LMI_TRIPLET" ]
 then
   printf '\n# GUI test\n\n'
diff --git a/tabs/6/startup_script b/tabs/6/startup_script
index 616f66b6..3c219f63 100755
--- a/tabs/6/startup_script
+++ b/tabs/6/startup_script
@@ -4,7 +4,7 @@ a='schroot --chroot=lmi'
 
 b='cd /opt/lmi/bin'
 c='. /opt/lmi/src/lmi/set_toolchain.sh'
-d='wine ./lmi_wx_shared --ash_nazg --data_path=/opt/lmi/data'
+d='wine ./lmi_wx_shared.exe --ash_nazg --data_path=/opt/lmi/data'
 # redirect voluminous GTK diagnostics
 e='lmipath=/opt/lmi/gcc_x86_64-pc-linux-gnu/build/ship; 
LD_LIBRARY_PATH=$lmipath:/opt/lmi/local/gcc_x86_64-pc-linux-gnu/lib/ 
$lmipath/lmi_wx_shared --ash_nazg --data_path=/opt/lmi/data 2>&1 |less'