[lmi-commits] [lmi] master 154ede9: Install msw-native java even for cross-building

[Greg Chicares]

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

    Install msw-native java even for cross-building
---
 README.schroot           |   12 ++++++++++++
 install_miscellanea.make |    5 -----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/README.schroot b/README.schroot
index 1d7d58c..fa7f523 100644
--- a/README.schroot
+++ b/README.schroot
@@ -206,6 +206,15 @@ exit
 # The easiest way is to copy existing credentials, e.g.:
 #   cp -a ~/.ssh/ /srv/chroot/cross-lmi/home/greg
 
+# Use an msw-native java to let lmi write illustrations to pdf. See:
+#   http://lists.nongnu.org/archive/html/lmi/2016-10/msg00010.html
+# It's convenient to obtain it outside a chroot, where a web browser
+# is available--e.g., save this file:
+#   
http://www.oracle.com/technetwork/java/javasebusiness/downloads/java-archive-downloads-javase5-419410.html
+# to /srv/cache_for_lmi/, then copy it into the chroot's filesystem:
+#   cp -a /srv/cache_for_lmi/jre-1_5_0-windows-i586.exe 
/srv/chroot/cross-lmi/cache_for_lmi
+# where it can be run later. Only the JRE is wanted, and nothing else.
+
 # Enter the chroot as a normal user
 
 schroot --chroot=cross-lmi
@@ -222,6 +231,9 @@ git config --global push.default simple
 #   http://lists.nongnu.org/archive/html/lmi/2016-10/msg00002.html
 WINEDLLOVERRIDES=mscoree=d wine wineboot
 
+# Install java.
+wine /cache_for_lmi/jre-1_5_0-windows-i586.exe
+
 wget -N 'http://git.savannah.gnu.org/cgit/lmi.git/plain/install_msw.sh'
 chmod +x install_msw.sh
 ./install_msw.sh >log 2>&1
diff --git a/install_miscellanea.make b/install_miscellanea.make
index e09ad10..6b1ab90 100644
--- a/install_miscellanea.make
+++ b/install_miscellanea.make
@@ -126,11 +126,6 @@ scratch_exists = \
 .PHONY: all
 all: boost cgicc fop jing md5sum_msw sample trang xmlwrapp
 
-# The jing and trang code downloaded here is used only for native msw.
-# For GNU/Linux, native tools are used even when lmi is cross-compiled
-# for msw; downloading the archives anyway, as for msw, does no harm,
-# and may be useful for validating the URLs.
-
 # Patches were generated according to this advice:
 #
 # http://www.linuxfromscratch.org/patches/submit.html