[lmi-commits] [lmi] odd/multiarch 4179145 5/5: Merge remote-tracking branch 'origin/master' into odd/multiarch

[Greg Chicares]

branch: odd/multiarch
commit 4179145d8410f599e989bb6a54d4f47576a7156c
Merge: 63e14f0 d073eeb
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Merge remote-tracking branch 'origin/master' into odd/multiarch
---
 configurable_settings.cpp |  2 +-
 gwc/.zshrc                |  2 +-
 install_miscellanea.make  |  6 ++++++
 install_msw.sh            | 25 +++++--------------------
 4 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/configurable_settings.cpp b/configurable_settings.cpp
index d074ff7..3aead37 100644
--- a/configurable_settings.cpp
+++ b/configurable_settings.cpp
@@ -137,7 +137,7 @@ configurable_settings::configurable_settings()
     ,default_input_filename_             {"/etc/opt/lmi/default.ill"           
}
     ,libraries_to_preload_               {""                                   
}
     ,offer_hobsons_choice_               {false                                
}
-    ,print_directory_                    {"/var/opt/lmi/spool"                 
}
+    ,print_directory_                    {"/opt/lmi/print"                     
}
     ,seconds_to_pause_between_printouts_ {10                                   
}
     ,skin_filename_                      {"skin.xrc"                           
}
     ,spreadsheet_file_extension_         {".gnumeric"                          
}
diff --git a/gwc/.zshrc b/gwc/.zshrc
index 34cecf1..6b22385 100644
--- a/gwc/.zshrc
+++ b/gwc/.zshrc
@@ -20,7 +20,7 @@ export DISPLAY=":0.0"
 export coefficiency='--jobs=32'
 
 # export TZ=UCT
-export LANG=en_US.UTF-8 LC_TIME=en_DK.UTF-8 LC_COLLATE=C.UTF-8
+export LANG=en_US.UTF-8 LC_ALL=C.UTF-8 LC_TIME=en_DK.UTF-8 LC_COLLATE=C.UTF-8
 # It is generally preferable to do this:
 # update-locale LANG=en_US.UTF-8 LC_TIME=en_DK.UTF-8 LC_COLLATE=C.UTF-8
 # but neither the chroot's nor the host's /etc/default/locale is
diff --git a/install_miscellanea.make b/install_miscellanea.make
index 34fca94..5a56137 100644
--- a/install_miscellanea.make
+++ b/install_miscellanea.make
@@ -196,6 +196,12 @@ jing: $(file_list)
 #
 # It is placed in lmi's 'third_party/bin/' subdirectory--imperatively
 # not in lmi's 'local/bin/' subdirectory, which is added to $PATH.
+# For cygwin builds, the expressly downloaded 'md5sum.exe' is kept off
+# $PATH to prevent it from shadowing cygwin's own version. However,
+# for cross builds, it cannot shadow the native 'md5sum', yet some
+# cross-built unit tests require an msw binary, so add its directory
+# to $WINEPATH to make those tests work (incidentally, 'wine' doesn't
+# find it if it's simply symlinked).
 #
 # Should the given URL ever become invalid, see:
 #   http://www.openoffice.org/dev_docs/using_md5sums.html#links
diff --git a/install_msw.sh b/install_msw.sh
index e3ae9b6..666a012 100755
--- a/install_msw.sh
+++ b/install_msw.sh
@@ -209,20 +209,6 @@ make $coefficiency --output-sync=recurse -f 
install_libxml2_libxslt.make
 
 ./install_wxpdfdoc.sh
 
-# For cygwin builds, the expressly downloaded 'md5sum.exe' is kept off
-# $PATH to prevent it from shadowing cygwin's own version. However,
-# for cross builds, it cannot shadow the native 'md5sum', yet some
-# cross-built unit tests require an msw binary, so copy it to a
-# directory that's on $WINEPATH to make those tests work. It doesn't
-# matter that this directory is also on $PATH. The file is tiny, so a
-# copy isn't too wasteful, and 'wine' doesn't find it if it's simply
-# symlinked.
-
-if [ "Cygwin" != "$platform" ]
-then
-    cp --archive /opt/lmi/third_party/bin/md5sum.exe 
/opt/lmi/"$LMI_HOST"/local/bin
-fi
-
 find /cache_for_lmi/downloads -type f | xargs md5sum
 
 . ./set_arch.sh
@@ -258,13 +244,12 @@ 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
-
+# Configurable settings.
+#
 # Tailored to msw; for POSIX, s|C:|| and s|CMD /c|/bin/sh| (e.g.).
 
+mkdir --parents /opt/lmi/print
+
 cat >/opt/lmi/data/configurable_settings.xml <<EOF
 <?xml version="1.0"?>
 <configurable_settings version="2">
@@ -278,7 +263,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:/var/opt/lmi/spool</print_directory>
+  <print_directory>C:/opt/lmi/print</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>