update batik to 1.13, auto-download in build

This commit is contained in:
Ben Fry
2021-01-17 15:10:21 -05:00
parent 2a2a607353
commit d9901fe327
11 changed files with 76 additions and 23 deletions
+6 -7
View File
@@ -1,13 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="lib" path="library/batik-awt-util-1.8.jar"/>
<classpathentry kind="lib" path="library/batik-dom-1.8.jar"/>
<classpathentry kind="lib" path="library/batik-ext-1.8.jar"/>
<classpathentry kind="lib" path="library/batik-svggen-1.8.jar"/>
<classpathentry kind="lib" path="library/batik-util-1.8.jar"/>
<classpathentry kind="lib" path="library/batik-xml-1.8.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="library/batik-all-1.13.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/adoptopenjdk-11">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry combineaccessrules="false" kind="src" path="/processing4-core"/>
<classpathentry kind="output" path="bin"/>
</classpath>
+2
View File
@@ -0,0 +1,2 @@
batik-bin-*.zip
library/batik-all-*.jar
@@ -0,0 +1,15 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.release=disabled
org.eclipse.jdt.core.compiler.source=11
+49 -15
View File
@@ -6,27 +6,61 @@
<delete file="library/svg.jar" />
</target>
<target name="compile" description="Compile sources">
<property name="batik.version" value="1.13" />
<!-- the .zip file to be downloaded -->
<property name="batik.zip" value="batik-bin-${batik.version}.zip" />
<!-- the .jar file that's the actual dependency -->
<property name="batik.jar" value="batik-all-${batik.version}.jar" />
<!-- URL for the version of Batik currently supported by this library.
This should probably be changed to (or at leas mirrored at) a
location on download.processing.org so it's available forever. -->
<property name="batik.url" value="https://apache.osuosl.org/xmlgraphics/batik/binaries/${batik.zip}" />
<available file="library/${batik.jar}" property="batik.present" />
<!-- ok to ignore failed downloads if we at least have a version that's local -->
<condition property="batik.ignorable" value="false" else="true">
<isset property="batik.present" />
</condition>
<target name="download-batik" unless="batik.present">
<get src="${batik.url}" dest="."
ignoreerrors="${batik.ignorable}"
usetimestamp="true" />
<!-- <property name="zip.prefix" value="batik-${batik.version}/lib/${batik.jar}" /> -->
<property name="zip.prefix" value="batik-${batik.version}/lib" />
<!-- Formerly used batik-awt-util-1.8.jar, batik-dom-1.8.jar, batik-ext-1.8.jar,
batik-svggen-1.8.jar, batik-util-1.8.jar, batik-xml-1.8.jar but using
the big feller from now on since file size is less important, and there
were complaints about some .jar files not being available. -->
<unzip src="${batik.zip}" dest="library">
<patternset>
<!-- unzip a single jar from the zip.prefix subdirectory in the .zip -->
<include name="${zip.prefix}/${batik.jar}"/>
</patternset>
<mapper>
<!-- remove the zip.prefix from the path when saving the .jar -->
<globmapper from="${zip.prefix}/*" to="*"/>
</mapper>
</unzip>
</target>
<target name="compile" depends="download-batik" description="Compile sources">
<condition property="core-built">
<available file="../../../core/library/core.jar" />
</condition>
<fail unless="core-built" message="Please build the core library first and make sure it sits in ../../../core/library/core.jar" />
<mkdir dir="bin" />
<javac source="11"
target="11"
srcdir="src" destdir="bin"
encoding="UTF-8"
includeAntRuntime="false"
classpath="../../../core/library/core.jar;
library/batik-awt-util-1.8.jar;
library/batik-dom-1.8.jar;
library/batik-ext-1.8.jar;
library/batik-svggen-1.8.jar;
library/batik-util-1.8.jar;
library/batik-xml-1.8.jar"
nowarn="true">
</javac>
<javac source="11" target="11"
srcdir="src" destdir="bin"
encoding="UTF-8"
includeAntRuntime="false"
classpath="../../../core/library/core.jar; library/${batik.jar};"
nowarn="true" />
</target>
<target name="build" depends="compile" description="Build SVG library">
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.