[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] odd/multiarch 8b9e571 4/5: Make an msw-native 'md5su
From: |
Greg Chicares |
Subject: |
[lmi-commits] [lmi] odd/multiarch 8b9e571 4/5: Make an msw-native 'md5sum' available for cross builds |
Date: |
Fri, 12 Apr 2019 08:32:59 -0400 (EDT) |
branch: odd/multiarch
commit 8b9e571813d023f6d10f4dc198583ccc0f65e87b
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>
Make an msw-native 'md5sum' available for cross builds
---
install_msw.sh | 10 ++++++++++
test_coding_rules.cpp | 1 +
2 files changed, 11 insertions(+)
diff --git a/install_msw.sh b/install_msw.sh
index 42ac433..1c20c56 100755
--- a/install_msw.sh
+++ b/install_msw.sh
@@ -212,6 +212,16 @@ 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 overriding cygwin's own 'md5sum'. However,
+# for cross builds, copy 'md5sum.exe' to a directory that is on $PATH
+# and $WINEPATH: it cannot override the build system's version because
+# of its '.exe' suffix, and it's required for some unit tests.
+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
echo "$PATH"
diff --git a/test_coding_rules.cpp b/test_coding_rules.cpp
index 201c27a..a5ec9b6 100644
--- a/test_coding_rules.cpp
+++ b/test_coding_rules.cpp
@@ -1068,6 +1068,7 @@ void enforce_taboos(file const& f)
if
( !f.is_of_phylum(e_log)
&& !f.is_of_phylum(e_make)
+ && !f.is_of_phylum(e_script)
&& !f.is_of_phylum(e_synopsis)
)
{