[lmi-commits] [lmi] odd/multiarch 11efcd0 16/16: Rewrite command assuming '/opt/lmi/bin/' no longer exists

[Greg Chicares]

branch: odd/multiarch
commit 11efcd0c6b18c1039e580d294e4862ca619b11fb
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Rewrite command assuming '/opt/lmi/bin/' no longer exists
---
 INSTALL               | 18 +++++++++---------
 README.schroot        |  5 +++--
 debian/menu           |  2 +-
 gwc/develop1.txt      |  6 +++---
 gwc/develop2.txt      |  8 ++++----
 install_msw.sh        | 15 ++++++++++-----
 tabs/5/startup_script | 10 +++++-----
 7 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/INSTALL b/INSTALL
index 044ab62..6f18eec 100644
--- a/INSTALL
+++ b/INSTALL
@@ -57,8 +57,8 @@ Close the "Command prompt" window.
 
 (2) Install lmi
 
-[Experienced users: Make sure 'C:\cache_for_lmi\' contains any files
-you need to download manually due to corporate firewall weirdness.]
+[Experienced users: Make sure 'C:\cache_for_lmi\' contains any files you
+need to download manually due to corporate firewall weirdness.]
 
 Start a Cygwin shell:
 
@@ -75,12 +75,12 @@ Copy the following, and paste it (Shift-Insert) into the 
shell:
   logfile=log-`date -u +'%Y%m%dT%H%MZ'`; echo "Log file is '$logfile.tar.bz2'."
   ./install_msw.sh >$logfile 2>&1; tar -cjf $logfile.tar.bz2 $logfile
 
-Installation proceeds silently for about an hour. When you see
-"Finished building lmi", copy and paste these lines into the shell:
+Installation proceeds silently for anywhere from a few minutes to a couple
+of hours, depending on your computer. When you see "Finished building lmi",
+copy and paste this line into the shell:
 
-  export PATH=/opt/lmi/local/bin:/opt/lmi/local/lib:$PATH
-  cd /opt/lmi/bin; ./lmi_wx_shared --data_path=/opt/lmi/data
+  /opt/lmi/x86_64-w64-mingw32/bin/lmi_wx_shared --data_path=/opt/lmi/data
 
-You should see lmi's GUI. Try "File | New | Illustration", then press
-"OK"; you should see values. Then try "File | Print preview". You
-should see an illustration in your 'pdf' viewer.
+You should see lmi's GUI. Try "File | New | Illustration", then press "OK";
+you should see values. Then try "File | Print preview"; you should see an
+illustration in your 'pdf' viewer.
diff --git a/README.schroot b/README.schroot
index 1be65b5..9822555 100644
--- a/README.schroot
+++ b/README.schroot
@@ -329,7 +329,7 @@ chmod +x install_msw.sh
 # msw program, prefix its command line with 'wine'. Test the chroot by
 # running the lmi binary built in the preceding step:
 
-pushd /opt/lmi/bin
+pushd /opt/lmi/x86_64-w64-mingw32/bin
 wine ./lmi_wx_shared.exe --ash_nazg --data_path=../data
 
 # '--host' being 'i686-w64-mingw32', unit tests require an msw-native
@@ -382,7 +382,8 @@ rm /opt/lmi/src/build/lmi/Linux/gcc/ship/my*
 # the first time, because there are no old files to remove):
 cd /opt/lmi/data
 rm proprietary.dat proprietary.ndx
-wine /opt/lmi/bin/rate_table_tool --accept --file=proprietary 
--merge=/opt/lmi/proprietary/tables
+wine /opt/lmi/x86_64-w64-mingw32/bin/rate_table_tool --accept \
+ --file=proprietary --merge=/opt/lmi/proprietary/tables
 
 # Run a system test.
 cd /opt/lmi/src/lmi
diff --git a/debian/menu b/debian/menu
index 79b9976..4aaf3a7 100644
--- a/debian/menu
+++ b/debian/menu
@@ -1,2 +1,2 @@
 ?package(lmi):needs="X11" section="Apps/Technical"\
-  title="lmi" command="/opt/lmi/bin/lmi_wx"
+  title="lmi" command="/opt/lmi/x86_64-w64-mingw32/bin/lmi_wx"
diff --git a/gwc/develop1.txt b/gwc/develop1.txt
index ff828ca..e368a86 100644
--- a/gwc/develop1.txt
+++ b/gwc/develop1.txt
@@ -214,7 +214,7 @@ date -u +'%Y%m%dT%H%MZ' |tr -d '\n' >/dev/clipboard
 
   # Fifth screen: only for running lmi and its GUI tests
 
-cd /opt/lmi/bin
+cd /opt/lmi/"$LMI_HOST"/bin
 ./lmi_wx_shared --ash_nazg --data_path=/opt/lmi/data
 
   # Run GUI tests
@@ -231,8 +231,8 @@ cd /opt/lmi/bin
 
   # Test all valid emission types
 
-/opt/lmi/bin/lmi_cli_shared --file=/opt/lmi/src/lmi/sample.ill --accept 
--ash_nazg --data_path=/opt/lmi/data 
--emit=emit_test_data,emit_spreadsheet,emit_text_stream,emit_custom_0,emit_custom_1
  2>&1 |less -S
-/opt/lmi/bin/lmi_cli_shared --file=/opt/lmi/src/lmi/sample.cns --accept 
--ash_nazg --data_path=/opt/lmi/data 
--emit=emit_test_data,emit_spreadsheet,emit_group_roster,emit_text_stream,emit_custom_0,emit_custom_1
  2>&1 |less -S
+/opt/lmi/"$LMI_HOST"/bin/lmi_cli_shared --file=/opt/lmi/src/lmi/sample.ill 
--accept --ash_nazg --data_path=/opt/lmi/data 
--emit=emit_test_data,emit_spreadsheet,emit_text_stream,emit_custom_0,emit_custom_1
  2>&1 |less -S
+/opt/lmi/"$LMI_HOST"/bin/lmi_cli_shared --file=/opt/lmi/src/lmi/sample.cns 
--accept --ash_nazg --data_path=/opt/lmi/data 
--emit=emit_test_data,emit_spreadsheet,emit_group_roster,emit_text_stream,emit_custom_0,emit_custom_1
  2>&1 |less -S
 popd
 
   # Miscellany (no particular screen)
diff --git a/gwc/develop2.txt b/gwc/develop2.txt
index 5d20d1a..c5bcee4 100644
--- a/gwc/develop2.txt
+++ b/gwc/develop2.txt
@@ -55,11 +55,11 @@ git push
 cd /opt/lmi/data
 rm proprietary.dat proprietary.ndx
   # native:
-/opt/lmi/bin/rate_table_tool --accept --file=proprietary 
--merge=/opt/lmi/proprietary/tables
-/opt/lmi/bin/rate_table_tool --accept --file=proprietary --verify
+/opt/lmi/"$LMI_HOST"/bin/rate_table_tool --accept --file=proprietary 
--merge=/opt/lmi/proprietary/tables
+/opt/lmi/"$LMI_HOST"/bin/rate_table_tool --accept --file=proprietary --verify
   # msw cross build:
-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 --verify
+wine /opt/lmi/"$LMI_HOST"/bin/rate_table_tool --accept --file=proprietary 
--merge=/opt/lmi/proprietary/tables
+wine /opt/lmi/"$LMI_HOST"/bin/rate_table_tool --accept --file=proprietary 
--verify
 
   # To recover from errors
 
diff --git a/install_msw.sh b/install_msw.sh
index 33b243b..172ecea 100755
--- a/install_msw.sh
+++ b/install_msw.sh
@@ -224,23 +224,23 @@ make $coefficiency --output-sync=recurse 
PATH=$minimal_path show_flags
 make $coefficiency --output-sync=recurse PATH=$minimal_path clean
 make $coefficiency --output-sync=recurse PATH=$minimal_path install
 
-done
-
 if [ "Cygwin" = "$platform" ]
 then
     # No lmi binary should depend on any Cygwin library.
 
-    for z in /opt/lmi/bin/*; \
+    for z in /opt/lmi/"$LMI_HOST"/bin/*; \
       do cmd /c "$CYGCHECK $z" 2>&1 | grep --silent cygwin \
         && printf '\ncygcheck %s\n' "$z" && cmd /c "$CYGCHECK $z"; \
       done
 fi
 
+done
+
 # To regenerate authentication files:
 # cd /opt/lmi/data
 # printf '2450449 2472011'             >expiry
 # printf '%s\n' "$(md5sum expiry)"     >validated.md5
-# [wine] /opt/lmi/bin/generate_passkey >passkey
+# [wine] /opt/lmi/"$LMI_HOST"/bin/generate_passkey >passkey
 printf '2450449 2472011'                            >/opt/lmi/data/expiry
 printf '5fc68a795c9c60da1b32be989efc299a  expiry\n' 
>/opt/lmi/data/validated.md5
 printf '391daa5cbc54e118c4737446bcb84eea'           >/opt/lmi/data/passkey
@@ -250,6 +250,11 @@ for z in company_logo.png group_quote_banner.png ; \
   do cp --archive /opt/lmi/src/lmi/gwc/$z /opt/lmi/data/ ;
 done
 
+# <print_directory>: Review old history:
+#   git log --patch -G'spool'
+# and reconsider the default value.
+mkdir --parents /var/opt/lmi/spool
+
 # Tailored to msw; for POSIX, s|C:|| and s|CMD /c|/bin/sh| (e.g.).
 
 cat >/opt/lmi/data/configurable_settings.xml <<EOF
@@ -265,7 +270,7 @@ cat >/opt/lmi/data/configurable_settings.xml <<EOF
   <default_input_filename>C:/etc/opt/lmi/default.ill</default_input_filename>
   <libraries_to_preload/>
   <offer_hobsons_choice>0</offer_hobsons_choice>
-  <print_directory>C:/opt/lmi/bin</print_directory>
+  <print_directory>C:/var/opt/lmi/spool</print_directory>
   <seconds_to_pause_between_printouts>10</seconds_to_pause_between_printouts>
   <skin_filename>skin.xrc</skin_filename>
   <spreadsheet_file_extension>.tsv</spreadsheet_file_extension>
diff --git a/tabs/5/startup_script b/tabs/5/startup_script
index 696facd..18f0138 100755
--- a/tabs/5/startup_script
+++ b/tabs/5/startup_script
@@ -2,18 +2,18 @@
 
 a='schroot --chroot=cross-lmi'
 
-b='cd /opt/lmi/bin'
-c='wine ./lmi_wx_shared --ash_nazg --data_path=/opt/lmi/data'
-#d='wine ./wx_test --ash_nazg --data_path=/opt/lmi/data'
+b='cd /opt/lmi/x86_64-w64-mingw32/bin'
+c='LMI_HOST=x86_64-w64-mingw32 ; . /opt/lmi/src/lmi/set_arch.sh'
+d='wine ./lmi_wx_shared --ash_nazg --data_path=/opt/lmi/data'
 e='/opt/lmi/src/lmi/gui_test.sh'
 
 print -rs $b ; echo $b ; eval $b
 print -rs $c ; echo $c
-#print -rs $d ; echo $d
+print -rs $d ; echo $d
 print -rs $e ; echo $e
 
 unset a
 unset b
 unset c
-#unset d
+unset d
 unset e