aboutsummaryrefslogtreecommitdiffstats
path: root/fop/build.xml
diff options
context:
space:
mode:
authorGlenn Adams <gadams@apache.org>2016-03-13 01:32:45 +0000
committerGlenn Adams <gadams@apache.org>2016-03-13 01:32:45 +0000
commit56a5fe00c829a616178a2b95f371577fa4ff6db1 (patch)
treed39218e04ccfc20e66ddf7a52dee82c96233f997 /fop/build.xml
parent6a719897d6f98ba89aa08e2f97b2b801be066cbf (diff)
downloadxmlgraphics-fop-56a5fe00c829a616178a2b95f371577fa4ff6db1.tar.gz
xmlgraphics-fop-56a5fe00c829a616178a2b95f371577fa4ff6db1.zip
Fixups for ant targets, checkstyle, findbugs.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/maven@1734752 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'fop/build.xml')
-rw-r--r--fop/build.xml16
1 files changed, 8 insertions, 8 deletions
diff --git a/fop/build.xml b/fop/build.xml
index e26d22f75..3f9398c2b 100644
--- a/fop/build.xml
+++ b/fop/build.xml
@@ -153,7 +153,7 @@ list of possible build targets.
<property name="Name" value="Apache FOP"/>
<property name="name" value="fop"/>
<property name="NAME" value="FOP"/>
- <property name="version" value="svn-trunk"/>
+ <property name="version" value="2.2.0-SNAPSHOT"/>
<property name="year" value="1999-2016"/>
<property name="javac.debug" value="on"/>
<property name="javac.optimize" value="off"/>
@@ -194,8 +194,8 @@ list of possible build targets.
<property name="src.java.dir" value="${src.dir}/main/java"/>
<property name="src.resources.dir" value="${src.dir}/main/resources"/>
<property name="src.sandbox.dir" value="${sandbox.src.dir}"/>
- <property name="src.viewer.resources.dir" value="${src.java.dir}/org/apache/fop/render/awt/viewer/resources"/>
- <property name="src.viewer.images.dir" value="${src.java.dir}/org/apache/fop/render/awt/viewer/images"/>
+ <property name="src.viewer.resources.dir" value="${core.src.dir}/main/resources/org/apache/fop/render/awt/viewer/resources"/>
+ <property name="src.viewer.images.dir" value="${core.src.dir}/main/resources/org/apache/fop/render/awt/viewer/images"/>
<property name="fo.examples.dir" value="${basedir}/examples/fo/basic"/>
<property name="fo.examples.userconfig" value="conf/fop.xconf"/>
<property name="fo.examples.include" value="**/*.fo"/>
@@ -523,7 +523,7 @@ list of possible build targets.
<attribute name="Implementation-Vendor" value="The Apache Software Foundation (http://xmlgraphics.apache.org/fop/)"/>
</section>
</manifest>
- <metainf dir="${basedir}" includes="../LICENSE,../NOTICE"/>
+ <metainf dir="${basedir}/.." includes="LICENSE,NOTICE"/>
<fileset dir="${build.classes.dir}">
<exclude name="**/tools/Event*.class"/>
<exclude name="**/tools/*.xsl"/>
@@ -543,7 +543,7 @@ list of possible build targets.
<manifest>
<attribute name="Build-Id" value="${ts} (${user.name} [${os.name} ${os.version} ${os.arch}, Java ${java.runtime.version}, Target Java ${javac.target}])"/>
</manifest>
- <metainf dir="${basedir}" includes="../LICENSE,../NOTICE"/>
+ <metainf dir="${basedir}/.." includes="LICENSE,NOTICE"/>
</jar>
</target>
<target name="uptodate-jar-sources" depends="codegen">
@@ -673,7 +673,7 @@ list of possible build targets.
<attribute name="Implementation-Vendor" value="The Apache Software Foundation (http://xmlgraphics.apache.org/fop/)"/>
<attribute name="Build-Id" value="${ts} (${user.name} [${os.name} ${os.version} ${os.arch}, Java ${java.runtime.version}, Target Java ${javac.target}])"/>
</manifest>
- <metainf dir="${basedir}" includes="../LICENSE,../NOTICE"/>
+ <metainf dir="${basedir}/.." includes="LICENSE,NOTICE"/>
</jar>
<!-- all-in-one transcoder jar -->
<property name="transcoder-deps" value="${build.dir}/transcoder-dependencies"/>
@@ -708,7 +708,7 @@ list of possible build targets.
<attribute name="Implementation-Vendor" value="The Apache Software Foundation (http://xmlgraphics.apache.org/fop/)"/>
<attribute name="Build-Id" value="${ts} (${user.name} [${os.name} ${os.version} ${os.arch}, Java ${java.runtime.version}, Target Java ${javac.target}])"/>
</manifest>
- <metainf dir="${basedir}" includes="../LICENSE,../NOTICE"/>
+ <metainf dir="${basedir}/.." includes="LICENSE,NOTICE"/>
</jar>
</target>
<target name="all" depends="package, servlet, transcoder-pkg, junit"/>
@@ -1074,7 +1074,7 @@ NOTE:
<attribute name="Build-Id" value="${ts} (${user.name} [${os.name} ${os.version} ${os.arch}, Java ${java.runtime.version}, Target Java ${javac.target}])"/>
</manifest>
<fileset dir="${build.javadocs.dir}"/>
- <metainf dir="${basedir}" includes="../LICENSE,../NOTICE"/>
+ <metainf dir="${basedir}/.." includes="LICENSE,NOTICE"/>
</jar>
</target>
<!-- =================================================================== -->