boost/build
2
0
Fork 0
mirror of https://github.com/boostorg/build.git synced 2026-02-14 00:32:11 +00:00
Code Issues Projects Releases Wiki Activity

Fix some issues with the fop tool.

Browse Source 
* Import boostbook to register `FO`.
* Remove re-initialization check, now overrides previous initialization.
* Set `JAVA_HOME` and `JAVACMD` based on the appropriate parameters.

[SVN r66432]
This commit is contained in:
Daniel James
2010-11-07 14:46:20 +00:00
parent a5ec6846a6
commit da3daca411
1 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/tools/fop.jam
View File

@@ -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 @@ rule init ( fop-command ? : java-home ? : java ? )
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.