Subject: [Boost-commit] svn:boost r66432 - trunk/tools/build/v2/tools
From: dnljms_at_[hidden]
Date: 2010-11-07 09:46:22
Author: danieljames
Date: 2010-11-07 09:46:20 EST (Sun, 07 Nov 2010)
New Revision: 66432
URL: http://svn.boost.org/trac/boost/changeset/66432
Log:
Fix some issues with the fop tool.
* Import boostbook to register `FO`.
* Remove re-initialization check, now overrides previous initialization.
* Set `JAVA_HOME` and `JAVACMD` based on the appropriate parameters.
Text files modified:
trunk/tools/build/v2/tools/fop.jam | 29 ++++++++++++++++-------------
1 files changed, 16 insertions(+), 13 deletions(-)
Modified: trunk/tools/build/v2/tools/fop.jam
==============================================================================
--- trunk/tools/build/v2/tools/fop.jam (original)
+++ trunk/tools/build/v2/tools/fop.jam 2010-11-07 09:46:20 EST (Sun, 07 Nov 2010)
@@ -9,7 +9,8 @@
import os ;
import generators ;
import common ;
-import errors ;
+import errors ;
+import boostbook ;
generators.register-standard fop.render.pdf : FO : PDF ;
generators.register-standard fop.render.ps : FO : PS ;
@@ -19,21 +20,23 @@
fop-command = [ common.get-invocation-command fop : fop : $(fop-command)
: [ modules.peek : FOP_DIR ] ] ;
- if $(.initialized)
+ .FOP_COMMAND = $(fop-command) ;
+ .FOP_SETUP = ;
+
+ # JAVA_HOME is the location that java was installed to.
+
+ if $(java-home)
{
- if $(.FOP_COMMAND) != $(fop-command) || $(JAVA_HOME) != $(java-home)
- || $(JAVACMD) != $(java)
- {
- errors.user-error "fop: reinitialization with different options" ;
- }
+ .FOP_SETUP += [ common.variable-setting-command JAVA_HOME : $(java-home) ] ;
}
- else
+
+ # JAVACMD is the location that of the java executable, useful for a
+ # non-standard java installation, where the executable isn't at
+ # $JAVA_HOME/bin/java.
+
+ if $(java)
{
- .initialized = true ;
- .FOP_COMMAND = $(fop-command) ;
- # What is the meaning of this logic? Needs more comments!! --DWA
- java-home ?= $(java) ;
- .FOP_SETUP = [ common.variable-setting-command JAVA_HOME : $(java-home) ] ;
+ .FOP_SETUP += [ common.variable-setting-command JAVACMD : $(java) ] ;
}
# Make sure the fop command is executed from within the directory where it's located.