diff options
-rw-r--r-- | build.properties | 18 | ||||
-rw-r--r-- | build.xml | 18 |
2 files changed, 22 insertions, 14 deletions
diff --git a/build.properties b/build.properties index 906594cde..e76ff5354 100644 --- a/build.properties +++ b/build.properties @@ -5,23 +5,24 @@ ## The file buil-local.properties is not stored in the code ## repository and ignored for file adds. -## ----------------------- -## 1. Important path settings +## =================================================================== +## 1. Path settings ## All Jars from the optional lib directory are added used for ## compilation and JUnit tests. Put your jars for additional ## dependencies and tools here. # optional.lib.dir = /home/bart/java/lib -## ----------------------- +## =================================================================== ## 2. Switches for common tasks -# Javac switches +## Javac switches # debug = on # optimize = off # deprecation = on # javac.source = 1.3 # javac.target = 1.3 +# javac.fork = on ## JUnit task switches # junit.fork = on @@ -30,10 +31,13 @@ ## Add packages for FOP extensions if necessary. # javadoc.packages = org.apache.fop.*,fopextension.* -## ----------------------- +## =================================================================== ## 3. FOP specific properties -# Specify an alternate file that contains a list of disabled layout -# engine tests. +## Specify an alternate file that contains a list of disabled layout +## engine tests. # layoutengine.disabled = test/layoutengine/disabled-testcases.txt +## Specify an alternate directory to scan for user supplied +## hyphenation pattern files. +# user.hyph.dir = /home/bart/offo
\ No newline at end of file @@ -154,12 +154,12 @@ list of possible build targets. <property name="version" value="1.0dev"/> <property name="year" value="1999-2005"/> - <property name="debug" value="on"/> - <property name="optimize" value="off"/> - <property name="deprecation" value="on"/> + <property name="javac.debug" value="on"/> + <property name="javac.optimize" value="off"/> + <property name="javac.deprecation" value="on"/> <property name="javac.source" value="1.3"/> <property name="javac.target" value="1.3"/> - + <property name="javac.fork" value="off"/> <property name="junit.fork" value="on"/> @@ -360,8 +360,9 @@ list of possible build targets. <target name="compile-java" depends="init, codegen" description="Compiles the source code"> <!-- create directories --> <mkdir dir="${build.classes.dir}"/> - <javac destdir="${build.classes.dir}" debug="${debug}" deprecation="${deprecation}" - optimize="${optimize}" source="${javac.source}" target="${javac.target}"> + <javac destdir="${build.classes.dir}" fork="javac.fork" debug="${javac.debug}" + deprecation="${javac.deprecation}" optimize="${javac.optimize}" + source="${javac.source}" target="${javac.target}"> <src path="${build.gensrc.dir}"/> <src path="${src.java.dir}"/> <src refid="graphics-configuration-adapter"/> @@ -580,7 +581,10 @@ list of possible build targets. <!-- =================================================================== --> <target name="junit" depends="package, transcoder-pkg" description="Runs FOP's JUnit tests" if="junit.present"> <mkdir dir="${build.dir}/test-classes"/> - <javac destdir="${build.dir}/test-classes" debug="${debug}" deprecation="${deprecation}" optimize="${optimize}"> + <javac destdir="${build.dir}/test-classes" fork="javac.fork" + debug="${javac.debug}" deprecation="${javac.deprecation}" + optimize="${javac.optimize}" source="${javac.source}" + target="${javac.target}"> <src path="${basedir}/test/java"/> <classpath> <path refid="libs-build-classpath"/> |