]> source.dussan.org Git - xmlgraphics-fop.git/commitdiff
Fix ant build on windows
authorSimon Steiner <ssteiner@apache.org>
Mon, 15 Jun 2020 11:41:50 +0000 (11:41 +0000)
committerSimon Steiner <ssteiner@apache.org>
Mon, 15 Jun 2020 11:41:50 +0000 (11:41 +0000)
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1878852 13f79535-47bb-0310-9956-ffa450edef68

fop/build.xml

index 10b02bfeba4dded6f12f5ae574c20640933e668e..3c2509e5321efcd507d97c341a13974a93c89cd6 100644 (file)
@@ -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 ;-) -->
 <!-- =================================================================== -->