add "provided" jars to binary dist bundle
add instruction to pptx rendering
case-insensitive argument handling in PPTX2PNG
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1881416 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/build.xml b/build.xml
index b6604fa..ab3ab57 100644
--- a/build.xml
+++ b/build.xml
@@ -2076,11 +2076,15 @@
<globmapper from="*" to="${zipdir}/lib/*"/>
</mappedresources>
<mappedresources cache="true">
- <fileset dir="${ooxml.lib}" includes="xmlbeans-*.jar,curvesapi-*.jar,commons-compress*.jar"/>
+ <fileset dir="${ooxml.lib}"/>
<regexpmapper from="^(.*\.jar)$$" to="${zipdir}/ooxml-lib/\1"/>
</mappedresources>
<mappedresources cache="true">
- <fileset dir="${dist.dir}/maven" includes="**/*.jar" excludes="**/*-javadoc.jar,**/*-sources.jar"/>
+ <fileset dir="${ooxml-provided.lib}"/>
+ <regexpmapper from="^(.*\.jar)$$" to="${zipdir}/auxiliary/\1"/>
+ </mappedresources>
+ <mappedresources cache="true">
+ <fileset dir="${dist.dir}/maven" includes="**/*.jar" excludes="**/*-javadoc.jar,**/*-sources.jar,**/*-tests.jar"/>
<chainedmapper>
<flattenmapper/>
<globmapper from="*" to="${zipdir}/*"/>
diff --git a/src/ooxml/java/org/apache/poi/xslf/util/PPTX2PNG.java b/src/ooxml/java/org/apache/poi/xslf/util/PPTX2PNG.java
index 07eb125..c9336b2 100644
--- a/src/ooxml/java/org/apache/poi/xslf/util/PPTX2PNG.java
+++ b/src/ooxml/java/org/apache/poi/xslf/util/PPTX2PNG.java
@@ -116,7 +116,7 @@
for (int i = 0; i < args.length; i++) {
String opt = (i+1 < args.length) ? args[i+1] : null;
- switch (args[i]) {
+ switch (args[i].toLowerCase(Locale.ROOT)) {
case "-scale":
if (opt != null) {
scale = Float.parseFloat(opt);
@@ -164,7 +164,7 @@
fixSide = "long";
}
break;
- case "-inputType":
+ case "-inputtype":
if (opt != null) {
defaultFileType = FileMagic.valueOf(opt);
i++;
@@ -172,13 +172,13 @@
defaultFileType = FileMagic.OLE2;
}
break;
- case "-textAsShapes":
+ case "-textasshapes":
textAsShapes = true;
break;
- case "-ignoreParse":
+ case "-ignoreparse":
ignoreParse = true;
break;
- case "-extractEmbedded":
+ case "-extractembedded":
extractEmbedded = true;
break;
case "-charset":
