* added Ivy and AntBuilder to fatjar to people can directly use it in filebot/groovy scripts.
@Grapes dependency management doesn't work for ant, javamail, etc because they require a groovy RootLoader, that in turned messed up caching. After wasting a few sleepless nights I give up and just add things like this.
This commit is contained in:
parent
ebb9f068bb
commit
a8f1b1c57a
37
build.xml
37
build.xml
|
@ -127,10 +127,6 @@
|
|||
<include name="META-INF/services/**" />
|
||||
</zipfileset>
|
||||
|
||||
<zipfileset src="${dir.lib}/ivy.jar">
|
||||
<include name="org/apache/ivy/**" />
|
||||
</zipfileset>
|
||||
|
||||
<zipfileset src="${dir.lib}/icu4j.jar">
|
||||
<include name="com/ibm/icu/**" />
|
||||
</zipfileset>
|
||||
|
@ -150,6 +146,39 @@
|
|||
<zipfileset src="${dir.lib}/sevenzipjbinding.jar">
|
||||
<include name="net/sf/sevenzipjbinding/**" />
|
||||
</zipfileset>
|
||||
|
||||
<!-- Ivy for @Grapes automatic dependency management -->
|
||||
<zipfileset src="${dir.lib}/scripting/ivy.jar">
|
||||
<include name="org/apache/ivy/**" />
|
||||
</zipfileset>
|
||||
|
||||
<!-- AntBuilder including dependencies for ant-javamail, ant-commons-net and ant-jsch -->
|
||||
<zipfileset src="${dir.lib}/scripting/ant.jar">
|
||||
<include name="org/apache/tools/**" />
|
||||
</zipfileset>
|
||||
<zipfileset src="${dir.lib}/scripting/ant-launcher.jar">
|
||||
<include name="org/apache/tools/**" />
|
||||
</zipfileset>
|
||||
<zipfileset src="${dir.lib}/scripting/ant-commons-net.jar">
|
||||
<include name="org/apache/tools/**" />
|
||||
</zipfileset>
|
||||
<zipfileset src="${dir.lib}/scripting/ant-jsch.jar">
|
||||
<include name="org/apache/tools/**" />
|
||||
</zipfileset>
|
||||
<zipfileset src="${dir.lib}/scripting/ant-javamail.jar">
|
||||
<include name="org/apache/tools/**" />
|
||||
</zipfileset>
|
||||
<zipfileset src="${dir.lib}/scripting/commons-net.jar">
|
||||
<include name="org/apache/commons/net/**" />
|
||||
</zipfileset>
|
||||
<zipfileset src="${dir.lib}/scripting/jsch.jar">
|
||||
<include name="com/jcraft/jsch/**" />
|
||||
</zipfileset>
|
||||
<zipfileset src="${dir.lib}/scripting/mail.jar">
|
||||
<include name="javax/mail/**" />
|
||||
<include name="com/sun/mail/**" />
|
||||
<include name="META-INF/*mail*" />
|
||||
</zipfileset>
|
||||
</jar>
|
||||
</target>
|
||||
|
||||
|
|
|
@ -40,9 +40,9 @@
|
|||
<jar href="slf4j.jar" download="eager" />
|
||||
<jar href="slf4j-jdk.jar" download="eager" />
|
||||
<jar href="jgat-custom.jar" download="eager" />
|
||||
<jar href="json-simple.jar" download="lazy" />
|
||||
<jar href="xmlrpc.jar" download="eager" />
|
||||
<jar href="sublight-ws.jar" download="eager" />
|
||||
<jar href="json-simple.jar" download="lazy" />
|
||||
<jar href="junrar-custom.jar" download="lazy" />
|
||||
<jar href="nekohtml.jar" download="lazy" part="scraper" />
|
||||
<jar href="xercesImpl.jar" download="lazy" part="scraper" />
|
||||
|
@ -66,5 +66,5 @@
|
|||
<nativelib href="native/mac-x86_64.jar" download="lazy" part="native" />
|
||||
</resources>
|
||||
|
||||
<application-desc main-class="net.sourceforge.filebot.ApplicationStarter" />
|
||||
<application-desc main-class="net.sourceforge.filebot.Main" />
|
||||
</jnlp>
|
||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue