[lmi-commits] [lmi] master d073eeb 4/4: Add a third-party msw binary's directory to $WINEPATH

[Greg Chicares]

branch: master
commit d073eeb5fb9d65c1c4a666d9982b205906ff1772
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Add a third-party msw binary's directory to $WINEPATH
    
    Adding its directory to $WINEPATH is better than copying it to a
    directory that's already on $WINEPATH, because it simplifies the
    msw install script--particularly when multiple architectures are
    supported, and multiple copies that need to be hidden from cygwin
    would become a nuisance.
---
 gwc/.zshrc               |  2 +-
 install_miscellanea.make |  6 ++++++
 install_msw.sh           | 14 --------------
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/gwc/.zshrc b/gwc/.zshrc
index cf30711..4492638 100644
--- a/gwc/.zshrc
+++ b/gwc/.zshrc
@@ -1,6 +1,6 @@
 # Personal configuration for cross-building in a chroot.
 
-export WINEPATH='Z:\\opt\\lmi\\local\\bin;Z:\\opt\\lmi\\local\\lib'
+export 
WINEPATH='Z:\\opt\\lmi\\local\\bin;Z:\\opt\\lmi\\local\\lib;Z:\\opt\\lmi\\third_party\\bin'
 export LMI_HOST=i686-w64-mingw32
 
 # Minimal system path.
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 145eb9e..7a1f7bc 100755
--- a/install_msw.sh
+++ b/install_msw.sh
@@ -204,20 +204,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/local/bin
-fi
-
 find /cache_for_lmi/downloads -type f | xargs md5sum
 
 export PATH=/opt/lmi/local/bin:/opt/lmi/local/lib:$minimal_path