diff options
author | Vincent Hennebert <vhennebert@apache.org> | 2012-03-23 17:38:56 +0000 |
---|---|---|
committer | Vincent Hennebert <vhennebert@apache.org> | 2012-03-23 17:38:56 +0000 |
commit | 2874695d34037474b121b41b178b70cbfb229490 (patch) | |
tree | 8b50ef38808d634b80e63b2ba1cdd38c0721dfdc /build.xml | |
parent | d88a9fb1d1b932acd92af25d9e8c931bee926adb (diff) | |
download | xmlgraphics-fop-2874695d34037474b121b41b178b70cbfb229490.tar.gz xmlgraphics-fop-2874695d34037474b121b41b178b70cbfb229490.zip |
Removed reference to XML schema from IF schema.
Copied the definition of xml:space into the IF schema.
Removed the setup-xml-schema Ant ask.
xml.xsd is a file under the W3C Document License and we cannot (yet?) redistribute files under such a license.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1304524 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'build.xml')
-rw-r--r-- | build.xml | 19 |
1 files changed, 4 insertions, 15 deletions
@@ -806,7 +806,8 @@ list of possible build targets. </junit> </sequential> </macrodef> - <target name="junit-all" depends="junit-compile, junit-transcoder, junit-layout-hyphenation, setup-xml-schema" description="Runs FOP's JUnit basic tests" if="junit.present"> + <target name="junit-all" depends="junit-compile, junit-transcoder, junit-layout-hyphenation" + description="Runs FOP's JUnit basic tests" if="junit.present"> <junit dir="${basedir}" haltonfailure="yes" fork="${junit.fork}" forkmode="once" errorproperty="fop.junit.error" failureproperty="fop.junit.failure"> <sysproperty key="jawa.awt.headless" value="true"/> @@ -844,25 +845,13 @@ list of possible build targets. <target name="junit-area-tree-xml-format" depends="junit-compile" description="Runs FOP's area tree XML format JUnit tests" if="xmlunit.present"> <junit-run title="area tree XML format" testsuite="org.apache.fop.intermediate.AreaTreeXMLFormatTestSuite" outfile="TEST-area-tree-xml-format"/> </target> - <target name="junit-intermediate-layout" depends="junit-compile,setup-xml-schema" - if="xmlunit.present"> + <target name="junit-intermediate-layout" depends="junit-compile" if="xmlunit.present"> <junit-run title="intermediate format from layout tests" testsuite="org.apache.fop.intermediate.LayoutIFTestSuite" outfile="TEST-intermediate-format-from-layout"/> </target> - <target name="setup-xml-schema"> - <local name="cache-dir"/> - <property name="cache-dir" value="${basedir}/.cache/junit/intermediate"/> - <mkdir dir="${cache-dir}"/> - <get src="http://www.w3.org/2001/xml.xsd" - dest="${cache-dir}/xml.xsd" - usetimestamp="true"/> - <copy file="${cache-dir}/xml.xsd" - todir="${build.dir}/test-classes/org/apache/fop/intermediate"/> - </target> - <target name="junit-intermediate-format" - depends="junit-compile,setup-xml-schema,junit-intermediate-layout" + <target name="junit-intermediate-format" depends="junit-compile,junit-intermediate-layout" description="Runs FOP's intermediate format JUnit tests" if="xmlunit.present"> <junit-run title="intermediate format" testsuite="org.apache.fop.intermediate.IntermediateFormatTestSuite" |