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

[Greg Chicares]

branch: odd/multiarch
commit 3f0d9607773ea7a5715e83924bc711af562fa577
Merge: 283adf6 7448016
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Merge remote-tracking branch 'origin/master' into odd/multiarch
---
 README.schroot               | 12 ------------
 install_libxml2_libxslt.make |  3 +--
 install_msw.sh               | 12 ++++++++----
 install_wx.sh                |  5 ++---
 workhorse.make               | 30 +++++++++++++++++++++---------
 5 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/README.schroot b/README.schroot
index 9822555..17f49ff 100644
--- a/README.schroot
+++ b/README.schroot
@@ -332,18 +332,6 @@ chmod +x install_msw.sh
 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
-# 'md5sum.exe'. Fortuitously, 'install_miscellanea.make' has installed
-# one already, taking care to place it off $PATH so that it doesn't
-# shadow a native 'md5sum' provided, e.g., by cygwin. However, in this
-# chroot it cannot shadow the native GNU/Linux 'md5sum', so copy it to
-# a directory that's on $WINEPATH to make unit 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.
-
-cp -a /opt/lmi/third_party/bin/md5sum.exe /opt/lmi/local/bin
-
 # Symlink the repository's hooks/ directory:
 cd /opt/lmi/src/lmi
 mv .git/hooks .git/hooks-orig
diff --git a/install_libxml2_libxslt.make b/install_libxml2_libxslt.make
index 08db44a..71d2a91 100644
--- a/install_libxml2_libxslt.make
+++ b/install_libxml2_libxslt.make
@@ -48,7 +48,6 @@ $(xz_version).tar.gz: host_path := projects/lzmautils/files
 
 mingw_dir     := /MinGW_
 
-# Move $host_type here to make it configurable.
 host_type     := $(if $(LMI_HOST),$(LMI_HOST),i686-w64-mingw32)
 
 prefix        := /opt/lmi/$(host_type)/local
@@ -56,7 +55,7 @@ exec_prefix   := $(prefix)
 
 cache_dir     := /cache_for_lmi/downloads
 
-build_dir     := /opt/lmi/$(host_type)/xml-ad_hoc
+build_dir     := $(prefix)/../xml-ad_hoc
 
 # Variables that normally should be left alone 
#################################
 
diff --git a/install_msw.sh b/install_msw.sh
index 94cf936..cd5d80c 100755
--- a/install_msw.sh
+++ b/install_msw.sh
@@ -210,10 +210,14 @@ 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.
+# $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
diff --git a/install_wx.sh b/install_wx.sh
index 1b118c7..2c6ddef 100755
--- a/install_wx.sh
+++ b/install_wx.sh
@@ -87,10 +87,9 @@ case "$build_type" in
         ;;
 esac
 
-# Construct a vendor string for this build using the compiler name and version
-# and the unique commit SHA-1.
+# Distinguish wx dll by host type, compiler version, and wx SHA1.
 gcc_version=$(${mingw_bin_dir}${host_type}-gcc -dumpversion|tr -d '\r')
-vendor="$host_type"-$gcc_version-$wx_commit_sha
+vendor=${host_type}-$gcc_version-$wx_commit_sha
 
 # Configuration reference:
 #   http://lists.nongnu.org/archive/html/lmi/2007-11/msg00001.html
diff --git a/workhorse.make b/workhorse.make
index 23b4943..1bff226 100644
--- a/workhorse.make
+++ b/workhorse.make
@@ -1113,18 +1113,30 @@ archive_shared_data_files:
 
 # End-user package for msw. No such thing is needed for posix.
 #
-# Eventually a source archive will be included automatically.
-
-# To create a customized package, override:
+# Planned improvements:
+#  - include a source archive automatically
+#  - copy 'configurable_settings.xml' from a configurable location
+#  - optionally build a tarball containing no subdirectory
+#  - optionally remove the dependency on 'install'
+#      (or keep it from running 'product_files' imperatively)
+#  - separate $(shared_data_files) out of $(fardel_files) below,
+#      making it independently overridable
+#  - consider making $(fardel_dir) local to 'fardel:', because
+#      it probably can't be overridden
+
+# To create a customized package, override one or more of:
 #  - fardel_name
-#  - fardel_dir
-#  - fardel_date_script
 #  - extra_fardel_binaries
 #  - extra_fardel_files
 #  - extra_fardel_checksummed_files
+# thus:
+#   make fardel_name=ThisWayIsGood fardel
+# and not thus:
+#   fardel_name=DoNotDoThisForItWillNotWork make fardel
 
 fardel_name := lmi-$(yyyymmddhhmm)
-fardel_dir  := $(prefix)/fardels/$(fardel_name)
+fardel_root := $(prefix)/fardels
+fardel_dir  := $(fardel_root)/$(fardel_name)
 
 # The obvious y2038 problem is ignored because any breakage it causes
 # will be, well, obvious.
@@ -1194,7 +1206,7 @@ fardel_checksummed_files = \
 fardel: install
        address@hidden -d $(fardel_dir) ] || $(MKDIR) --parents $(fardel_dir)
        @$(MAKE) --file=$(this_makefile) --directory=$(fardel_dir) wrap_fardel
-       @$(ECHO) "Created '$(fardel_name)' archive in '$(prefix)'."
+       @$(ECHO) "Created '$(fardel_name)' archive in '$(fardel_root)'."
 
 # A native 'md5sum$(EXEEXT)' must be provided because lmi uses it for
 # run-time authentication.
@@ -1213,8 +1225,8 @@ wrap_fardel:
        @$(TAR) \
          --bzip2 \
          --create \
-         --directory=$(prefix) \
-         --file=$(prefix)/$(fardel_name).tar.bz2 \
+         --directory=$(fardel_root) \
+         --file=$(fardel_root)/$(fardel_name).tar.bz2 \
          $(fardel_name)
 
 
################################################################################