[lmi-commits] [lmi] master d837b45 3/5: Remove references to apache fop

[Greg Chicares]

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

    Remove references to apache fop
---
 README.schroot              |  2 +-
 gwc/develop1.txt            | 12 ------------
 install_miscellanea.make    | 21 +++------------------
 path_utility.cpp            |  8 ++++----
 test_coding_rules.cpp       |  1 -
 wx_test_config_settings.cpp |  3 +++
 6 files changed, 11 insertions(+), 36 deletions(-)

diff --git a/README.schroot b/README.schroot
index 2a75ee9..ebdfe8c 100644
--- a/README.schroot
+++ b/README.schroot
@@ -100,7 +100,7 @@ mount -t proc -o rw,nosuid,nodev,noexec,relatime proc /proc
 
 apt-get update
 apt-get --assume-yes install wget g++-mingw-w64 automake libtool make \
- pkg-config git cvs zsh bzip2 unzip sudo wine default-jre fop jing trang \
+ pkg-config git cvs zsh bzip2 unzip sudo wine default-jre jing trang \
  g++-multilib libxml2-utils libxslt1-dev vim-gtk vim-doc shellcheck \
  xsltproc \
  >lmi-buster-apt-get-log 2>&1
diff --git a/gwc/develop1.txt b/gwc/develop1.txt
index 965db82..ddf9754 100644
--- a/gwc/develop1.txt
+++ b/gwc/develop1.txt
@@ -236,18 +236,6 @@ cd /opt/lmi/bin
 /opt/lmi/bin/lmi_cli_shared --file=/opt/lmi/src/lmi/sample.cns --accept 
--ash_nazg --data_path=/opt/lmi/data 
--emit=emit_test_data,emit_spreadsheet,emit_group_roster,emit_text_stream,emit_custom_0,emit_custom_1
  2>&1 |less -S
 popd
 
-  # Use native java to produce PDF illustrations from XSL-FO files
-  # created by a cross build--see:
-  #   https://lists.nongnu.org/archive/html/lmi/2018-02/msg00112.html
-  # PDF !! Remove this when XSL-FO is replaced.
-
-for XYZZY in billion; do JAVA_HOME=$(dirname $(dirname $(dirname $(readlink -f 
$(whence java))))) /opt/lmi/third_party/fop-0.20.5/fop.sh -fo 
"/opt/lmi/bin/old/$XYZZY.fo.xml" -pdf "/opt/lmi/bin/old/$XYZZY.pdf"; done 2>&1 
|less -S
-
-  # ...the exact number of "dirname" commands depends on where java is
-  # installed, so try a different number of them if that failed, e.g.:
-
-for XYZZY in billion; do JAVA_HOME=$(dirname $(dirname $(readlink -f $(whence 
java)))) /opt/lmi/third_party/fop-0.20.5/fop.sh -fo 
"/opt/lmi/bin/old/$XYZZY.fo.xml" -pdf "/opt/lmi/bin/old/$XYZZY.pdf"; done 2>&1 
|less -S
-
   # Miscellany (no particular screen)
 
 cd /opt/lmi/src/lmi
diff --git a/install_miscellanea.make b/install_miscellanea.make
index 55939f1..97ad403 100644
--- a/install_miscellanea.make
+++ b/install_miscellanea.make
@@ -44,7 +44,6 @@ third_party_source_dir  := $(destination)/src
 
 boost_archive    := boost_1_33_1.tar.bz2
 cgicc_archive    := cgicc-3.1.4.tar.bz2
-fop_archive      := fop-0.20.5-bin.tar.gz
 jing_archive     := jing-20091111.zip
 md5sum_msw_exe   := md5sum.exe
 sample_archive   := lmi-data-20050618T1440Z.tar.bz2
@@ -54,16 +53,14 @@ xmlwrapp_archive := xmlwrapp-0.9.0.tar.gz
 file_list := \
   $(boost_archive) \
   $(cgicc_archive) \
-  $(fop_archive) \
   $(jing_archive) \
   $(md5sum_msw_exe) \
   $(sample_archive) \
   $(trang_archive) \
   $(xmlwrapp_archive) \
 
-boost cgicc xmlwrapp: stem =               $(basename $(basename 
$(address@hidden)))
-fop:                  stem = $(subst -bin,,$(basename $(basename 
$(address@hidden))))
-jing trang:           stem =                          $(basename 
$(address@hidden))
+boost cgicc xmlwrapp: stem = $(basename $(basename $(address@hidden)))
+jing trang:           stem =            $(basename $(address@hidden))
 md5sum_msw:           stem = $(md5sum_msw_exe)
 sample:               stem = data
 
@@ -71,7 +68,6 @@ sample:               stem = data
 
 $(boost_archive)-url    := $(sf_mirror)/boost/$(boost_archive)
 $(cgicc_archive)-url    := ftp://ftp.gnu.org/pub/gnu/cgicc/$(cgicc_archive)
-$(fop_archive)-url      := 
https://archive.apache.org/dist/xmlgraphics/fop/binaries/$(fop_archive)
 $(jing_archive)-url     := 
https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/jing-trang/$(jing_archive)
 $(md5sum_msw_exe)-url   := 
http://etree.org/cgi-bin/counter.cgi/software/md5sum.exe#!md5!eb574b236133e60c989c6f472f07827b
 $(sample_archive)-url   := 
https://download.savannah.gnu.org/releases/lmi/$(sample_archive)
@@ -80,7 +76,6 @@ $(xmlwrapp_archive)-url := 
https://github.com/vslavik/xmlwrapp/releases/download
 
 $(boost_archive)-md5    := 2b999b2fb7798e1737d1fff8fac602ef
 $(cgicc_archive)-md5    := 6cb5153fc9fa64b4e50c7962aa557bbe
-$(fop_archive)-md5      := d6b43e3eddf9378536ad8127bc057d41
 $(jing_archive)-md5     := 13eef193921409a1636377d1efbf9843
 $(md5sum_msw_exe)-md5   := eb574b236133e60c989c6f472f07827b
 $(sample_archive)-md5   := e7f07133abfc3b9c2252dfa3b61191bc
@@ -124,7 +119,7 @@ scratch_exists = \
 # Targets 
######################################################################
 
 .PHONY: all
-all: boost cgicc fop jing md5sum_msw sample trang xmlwrapp
+all: boost cgicc jing md5sum_msw sample trang xmlwrapp
 
 # Patches were generated according to this advice:
 #
@@ -186,16 +181,6 @@ cgicc: $(file_list)
        $(SORT) --key=2 --output=$(stem).Y $(destination)/$(stem).md5sums
        $(DIFF) --unified $(stem).X $(stem).Y && $(RM) 
$(destination)/$(stem).md5sums $(stem).X $(stem).Y
 
-# When the 'fop' tarball is extracted, this message:
-#   tar: A lone zero block at 20398
-# is expected, and harmless--see:
-#   http://issues.apache.org/bugzilla/show_bug.cgi?id=28776
-
-.PHONY: fop
-fop: $(file_list)
-       $(MKDIR) $(destination)/$(stem)
-       $(MV) scratch/$(stem)/* $(destination)/$(stem)
-
 .PHONY: jing
 jing: $(file_list)
        $(MKDIR) --parents $(destination)/rng
diff --git a/path_utility.cpp b/path_utility.cpp
index b230f40..617c207 100644
--- a/path_utility.cpp
+++ b/path_utility.cpp
@@ -101,10 +101,10 @@ void initialize_filesystem()
 /// or [0-9A-Za-z_] matches the result, '_' having replaced all
 /// other characters.
 ///
-/// Motivation: create a valid filename for apache fop, which, being
-/// written in 'java', has its own notion of portability that may
-/// clash with every platform it's implemented on. Thus, only pathless
-/// filenames should be operated upon: hypothetically, given
+/// Original motivation: create a valid filename for apache fop, which
+/// used the 'java' notion of portability that may clash with every
+/// platform it's implemented on. Thus, only pathless filenames should
+/// be operated upon: hypothetically, given
 ///   /Fyodor Dostoyevskiy/Crime and Punishment.text
 /// it would be all right to create
 ///   /Fyodor Dostoyevskiy/Crime_and_Punishment.pdf
diff --git a/test_coding_rules.cpp b/test_coding_rules.cpp
index efca3e8..dd7f504 100644
--- a/test_coding_rules.cpp
+++ b/test_coding_rules.cpp
@@ -691,7 +691,6 @@ void check_defect_markers(file const& f)
         boost::smatch const& z(*i);
         bool const error_preceding =
                 true
-            &&  "APACHE "      != z[1]
             &&  "BOOST "       != z[1]
             &&  "COMPILER "    != z[1]
             &&  "CYGWIN "      != z[1]
diff --git a/wx_test_config_settings.cpp b/wx_test_config_settings.cpp
index 916e7c3..94683eb 100644
--- a/wx_test_config_settings.cpp
+++ b/wx_test_config_settings.cpp
@@ -43,6 +43,9 @@
         own "skin" and "default" files. Each time this test is run,
         only one pair of the following lines exists at a time:
 
+PDF !! Here and passim, change 'fop' to something reasonable, e.g.:
+  
<default_input_filename>c:/spool/coli_boli_default.ill</default_input_filename>
+
           <skin_filename>skin_coli_boli.xrc</skin_filename>
           
<default_input_filename>c:/fop-0.20.5/coli_boli_default.ill</default_input_filename>