103 lines
5.0 KiB
Diff
103 lines
5.0 KiB
Diff
--- guice-4.1/build.xml 2018-10-30 11:38:11.568428971 +0100
|
|
+++ guice-4.1/build.xml 2018-10-30 11:38:32.188523986 +0100
|
|
@@ -25,15 +25,11 @@
|
|
<target name="dist" depends="distjars, javadoc"
|
|
description="Build entire distribution.">
|
|
<ant antfile="extensions/servlet/build.xml" target="distjars" inheritAll="false"/>
|
|
- <ant antfile="extensions/spring/build.xml" target="distjars" inheritAll="false"/>
|
|
- <ant antfile="extensions/struts2/build.xml" target="distjars" inheritAll="false"/>
|
|
<ant antfile="extensions/assistedinject/build.xml" target="distjars" inheritAll="false"/>
|
|
<ant antfile="extensions/jmx/build.xml" target="distjars" inheritAll="false"/>
|
|
<ant antfile="extensions/jndi/build.xml" target="distjars" inheritAll="false"/>
|
|
<ant antfile="extensions/throwingproviders/build.xml" target="distjars" inheritAll="false"/>
|
|
<ant antfile="extensions/multibindings/build.xml" target="distjars" inheritAll="false"/>
|
|
- <ant antfile="extensions/dagger-adapter/build.xml" target="distjars" inheritAll="false"/>
|
|
- <ant antfile="extensions/persist/build.xml" target="distjars" inheritAll="false"/>
|
|
<ant antfile="extensions/grapher/build.xml" target="distjars" inheritAll="false"/>
|
|
<ant antfile="extensions/testlib/build.xml" target="distjars" inheritAll="false"/>
|
|
|
|
@@ -41,12 +37,6 @@
|
|
<fileset dir="extensions/servlet/build" includes="*.jar"/>
|
|
</copy>
|
|
<copy toDir="${build.dir}/dist">
|
|
- <fileset dir="extensions/spring/build" includes="*.jar"/>
|
|
- </copy>
|
|
- <copy toDir="${build.dir}/dist">
|
|
- <fileset dir="extensions/struts2/build" includes="*.jar"/>
|
|
- </copy>
|
|
- <copy toDir="${build.dir}/dist">
|
|
<fileset dir="extensions/assistedinject/build" includes="*.jar"/>
|
|
</copy>
|
|
<copy toDir="${build.dir}/dist">
|
|
@@ -62,12 +52,6 @@
|
|
<fileset dir="extensions/multibindings/build" includes="*.jar"/>
|
|
</copy>
|
|
<copy toDir="${build.dir}/dist">
|
|
- <fileset dir="extensions/dagger-adapter/build" includes="*.jar"/>
|
|
- </copy>
|
|
- <copy toDir="${build.dir}/dist">
|
|
- <fileset dir="extensions/persist/build" includes="*.jar"/>
|
|
- </copy>
|
|
- <copy toDir="${build.dir}/dist">
|
|
<fileset dir="extensions/grapher/build" includes="*.jar"/>
|
|
</copy>
|
|
<copy toDir="${build.dir}/dist">
|
|
@@ -154,15 +138,11 @@
|
|
<exclude name="com/google/inject/internal/**"/>
|
|
</fileset>
|
|
<fileset dir="${servlet.src.dir}"/>
|
|
- <fileset dir="${spring.src.dir}"/>
|
|
<fileset dir="${assistedinject.src.dir}"/>
|
|
<fileset dir="${jmx.src.dir}"/>
|
|
<fileset dir="${jndi.src.dir}"/>
|
|
<fileset dir="${throwingproviders.src.dir}"/>
|
|
<fileset dir="${multibindings.src.dir}"/>
|
|
- <fileset dir="${daggeradapter.src.dir}"/>
|
|
- <fileset dir="${persist.src.dir}"/>
|
|
- <fileset dir="${struts2.src.dir}"/>
|
|
<fileset dir="${grapher.src.dir}"/>
|
|
<fileset dir="${testlib.src.dir}"/>
|
|
|
|
@@ -216,9 +196,6 @@
|
|
<group title="Multibinder Extension" packages="com.google.inject.multibindings"/>
|
|
<fileset dir="${multibindings.src.dir}"/>
|
|
|
|
- <group title="Dagger Adapter" packages="com.google.inject.daggeradapter"/>
|
|
- <fileset dir="${daggeradapter.src.dir}"/>
|
|
-
|
|
<group title="ThrowingProviders Extension" packages="com.google.inject.throwingproviders"/>
|
|
<fileset dir="${throwingproviders.src.dir}"/>
|
|
|
|
@@ -228,15 +205,6 @@
|
|
<group title="Grapher Extension" packages="com.google.inject.grapher:com.google.inject.grapher.*"/>
|
|
<fileset dir="${grapher.src.dir}"/>
|
|
|
|
- <group title="Persist Extension" packages="com.google.inject.persist:com.google.inject.persist.*"/>
|
|
- <fileset dir="${persist.src.dir}"/>
|
|
-
|
|
- <group title="Spring Extension" packages="com.google.inject.spring"/>
|
|
- <fileset dir="${spring.src.dir}"/>
|
|
-
|
|
- <group title="Struts2 Extension" packages="com.google.inject.struts2"/>
|
|
- <fileset dir="${struts2.src.dir}"/>
|
|
-
|
|
<group title="JNDI Extension" packages="com.google.inject.jndi"/>
|
|
<fileset dir="${jndi.src.dir}"/>
|
|
|
|
@@ -300,15 +268,11 @@
|
|
depends="clean"
|
|
description="Remove generated files.">
|
|
<ant dir="extensions/servlet" antfile="build.xml" target="clean"/>
|
|
- <ant dir="extensions/spring" antfile="build.xml" target="clean"/>
|
|
- <ant dir="extensions/struts2" antfile="build.xml" target="clean"/>
|
|
<ant dir="extensions/assistedinject" antfile="build.xml" target="clean"/>
|
|
<ant dir="extensions/jmx" antfile="build.xml" target="clean"/>
|
|
<ant dir="extensions/jndi" antfile="build.xml" target="clean"/>
|
|
<ant dir="extensions/throwingproviders" antfile="build.xml" target="clean"/>
|
|
<ant dir="extensions/multibindings" antfile="build.xml" target="clean"/>
|
|
- <ant dir="extensions/dagger-adapter" antfile="build.xml" target="clean"/>
|
|
- <ant dir="extensions/persist" antfile="build.xml" target="clean"/>
|
|
<ant dir="extensions/grapher" antfile="build.xml" target="clean"/>
|
|
<ant dir="extensions/testlib" antfile="build.xml" target="clean"/>
|
|
</target>
|