[lmi-commits] [lmi] master 4dd6725 2/5: Remove configurable <xsl_fo_command>

[Greg Chicares]

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

    Remove configurable <xsl_fo_command>
---
 configurable_settings.cpp   | 15 ++-------------
 configurable_settings.hpp   |  2 --
 install_msw.sh              |  1 -
 wx_test_config_settings.cpp |  7 +------
 4 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/configurable_settings.cpp b/configurable_settings.cpp
index 8bde156..9f35e45 100644
--- a/configurable_settings.cpp
+++ b/configurable_settings.cpp
@@ -142,7 +142,6 @@ configurable_settings::configurable_settings()
     ,skin_filename_                      {"skin.xrc"                           
}
     ,spreadsheet_file_extension_         {".gnumeric"                          
}
     ,use_builtin_calculation_summary_    {false                                
}
-    ,xsl_fo_command_                     {"fo"                                 
}
 {
     ascribe_members();
     load();
@@ -201,7 +200,6 @@ void configurable_settings::ascribe_members()
     ascribe("skin_filename"                      
,&configurable_settings::skin_filename_                      );
     ascribe("spreadsheet_file_extension"         
,&configurable_settings::spreadsheet_file_extension_         );
     ascribe("use_builtin_calculation_summary"    
,&configurable_settings::use_builtin_calculation_summary_    );
-    ascribe("xsl_fo_command"                     
,&configurable_settings::xsl_fo_command_                     );
 }
 
 void configurable_settings::load()
@@ -250,6 +248,7 @@ bool configurable_settings::is_detritus(std::string const& 
s) const
         ,"xslt_html_filename"                // Withdrawn.
         ,"xslt_light_tab_delimited_filename" // Withdrawn.
         ,"xslt_tab_delimited_filename"       // Withdrawn.
+        ,"xsl_fo_command"                    // Withdrawn.
         };
     return contains(v, s);
 }
@@ -381,7 +380,7 @@ bool configurable_settings::offer_hobsons_choice() const
     return offer_hobsons_choice_;
 }
 
-/// Directory to which xsl-fo input and output are written.
+/// Directory to which PDF files are written.
 
 std::string const& configurable_settings::print_directory() const
 {
@@ -419,16 +418,6 @@ bool 
configurable_settings::use_builtin_calculation_summary() const
     return use_builtin_calculation_summary_;
 }
 
-/// Command to execute xsl-fo processor. Making this an external
-/// command permits using a program with a free but not GPL-compatible
-/// license, such as apache fop, which cannot be linked with a GPL
-/// version 2 program.
-
-std::string const& configurable_settings::xsl_fo_command() const
-{
-    return xsl_fo_command_;
-}
-
 namespace
 {
 std::vector<std::string> parse_calculation_summary_columns
diff --git a/configurable_settings.hpp b/configurable_settings.hpp
index c5c19b9..b0a50a9 100644
--- a/configurable_settings.hpp
+++ b/configurable_settings.hpp
@@ -65,7 +65,6 @@ class LMI_SO configurable_settings final
     std::string const& skin_filename                      () const;
     std::string const& spreadsheet_file_extension         () const;
     bool               use_builtin_calculation_summary    () const;
-    std::string const& xsl_fo_command                     () const;
 
   private:
     configurable_settings();
@@ -109,7 +108,6 @@ class LMI_SO configurable_settings final
     std::string skin_filename_;
     std::string spreadsheet_file_extension_;
     bool        use_builtin_calculation_summary_;
-    std::string xsl_fo_command_;
 };
 
 std::string const& LMI_SO configuration_filepath();
diff --git a/install_msw.sh b/install_msw.sh
index 1f601d4..6fa60d3 100755
--- a/install_msw.sh
+++ b/install_msw.sh
@@ -240,7 +240,6 @@ cat >/opt/lmi/data/configurable_settings.xml <<EOF
   <skin_filename>skin.xrc</skin_filename>
   <spreadsheet_file_extension>.tsv</spreadsheet_file_extension>
   <use_builtin_calculation_summary>1</use_builtin_calculation_summary>
-  <xsl_fo_command>CMD /c C:/opt/lmi/third_party/fop-0.20.5/fop</xsl_fo_command>
 </configurable_settings>
 EOF
 
diff --git a/wx_test_config_settings.cpp b/wx_test_config_settings.cpp
index 2020cf2..916e7c3 100644
--- a/wx_test_config_settings.cpp
+++ b/wx_test_config_settings.cpp
@@ -36,9 +36,8 @@
 
      A. The file exists in '/etc/opt/lmi'
 
-     B. These lines always exist like this:
+     B. This element is empty in all distributions:
          <libraries_to_preload/>
-         <xsl_fo_command>CMD /c /fop-0.20.5/fop</xsl_fo_command>
 
      C. We package several distributions each month that have their
         own "skin" and "default" files. Each time this test is run,
@@ -56,9 +55,6 @@
           but "default.ill" really is wanted here for historical reasons.]
 
           ['skin.xrc' deliberately omitted--not currently distributed.]
-
-    The only change is that the xsl_fo_command is checked to contain the 
volume,
-    i.e. is c:/fop-0.20.5/fop, and not just the path.
  */
 
 /// Validate configurable-settings file for binary distributions.
@@ -84,7 +80,6 @@ LMI_WX_TEST_CASE(configurable_settings)
 
     configurable_settings const& settings = configurable_settings::instance();
     LMI_ASSERT_EQUAL(settings.libraries_to_preload(), "");
-    LMI_ASSERT_EQUAL(settings.xsl_fo_command(), "CMD /c /fop-0.20.5/fop");
 
     std::string const& skin = settings.skin_filename();
     std::string const& default_input = settings.default_input_filename();