diff options
| author | Simon Steiner <ssteiner@apache.org> | 2020-06-15 11:41:50 +0000 |
|---|---|---|
| committer | Simon Steiner <ssteiner@apache.org> | 2020-06-15 11:41:50 +0000 |
| commit | 5043557fddc2ab375d977603f64872a3f59e7605 (patch) | |
| tree | 04e3161bf8f1aaaed1da59289146e3a16e828350 /fop | |
| parent | 0a508510a0f5a1078eade80e0f5ef1f003d0113d (diff) | |
| download | xmlgraphics-fop-5043557fddc2ab375d977603f64872a3f59e7605.tar.gz xmlgraphics-fop-5043557fddc2ab375d977603f64872a3f59e7605.zip | |
Fix ant build on windows
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1878852 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'fop')
| -rw-r--r-- | fop/build.xml | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/fop/build.xml b/fop/build.xml index 10b02bfeb..3c2509e53 100644 --- a/fop/build.xml +++ b/fop/build.xml @@ -614,7 +614,29 @@ list of possible build targets. <include name="commons-logging*.jar"/> <include name="xmlgraphics-commons*.jar"/> </fileset> - <target name="transcoder-pkg" depends="remove-cache" description="Generates the jar for the transcoder package for Batik"> + + <condition property="isWindows"> + <os family="windows" /> + </condition> + + <condition property="isUnix"> + <os family="unix" /> + </condition> + + <target name="transcoder-pkg" depends="remove-cache,transcoder-pkg-unix" description="Generates the jar for the transcoder package for Batik" if="isWindows"> + <exec executable="cmd" dir="${basedir}/.." failonerror="true"> + <env key="MAVEN_OPTS" value="-Dhttps.protocols=TLSv1,TLSv1.1,TLSv1.2"/> + <arg value="/c"/> + <arg value="mvn"/> + <arg value="clean"/> + <arg value="install"/> + <arg value="-DskipTests"/> + </exec> + <copy file="${basedir}/../fop-transcoder/target/fop-transcoder-${version}.jar" tofile="${build.dir}/fop-transcoder.jar"/> + <copy file="${basedir}/../fop-transcoder-allinone/target/fop-transcoder-allinone-${version}.jar" tofile="${build.dir}/fop-transcoder-allinone.jar"/> + </target> + + <target name="transcoder-pkg-unix" if="isUnix"> <exec executable="mvn" dir="${basedir}/.." failonerror="true"> <env key="MAVEN_OPTS" value="-Dhttps.protocols=TLSv1,TLSv1.1,TLSv1.2"/> <arg value="clean"/> @@ -624,6 +646,7 @@ list of possible build targets. <copy file="${basedir}/../fop-transcoder/target/fop-transcoder-${version}.jar" tofile="${build.dir}/fop-transcoder.jar"/> <copy file="${basedir}/../fop-transcoder-allinone/target/fop-transcoder-allinone-${version}.jar" tofile="${build.dir}/fop-transcoder-allinone.jar"/> </target> + <target name="all" depends="package, servlet, transcoder-pkg, junit"/> <!-- "all" target for us Makefile converts ;-) --> <!-- =================================================================== --> |