diff options
| author | Simon Steiner <ssteiner@apache.org> | 2023-02-01 12:28:14 +0000 |
|---|---|---|
| committer | Simon Steiner <ssteiner@apache.org> | 2023-02-01 12:28:14 +0000 |
| commit | e4b7085fe47dd0b586554e499ccfa05133d65e2d (patch) | |
| tree | ccdf1684ae0ebbbb9941542ab9421e4974a4831c | |
| parent | 9f4cc961acd53f733debe1203e78bfe97e80cc10 (diff) | |
| download | xmlgraphics-fop-e4b7085fe47dd0b586554e499ccfa05133d65e2d.tar.gz xmlgraphics-fop-e4b7085fe47dd0b586554e499ccfa05133d65e2d.zip | |
Add experimental changes to avoid needing lib dir
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1907184 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | fop/releasedist.xml | 38 |
1 files changed, 35 insertions, 3 deletions
diff --git a/fop/releasedist.xml b/fop/releasedist.xml index bc634757e..cbdd97ccd 100644 --- a/fop/releasedist.xml +++ b/fop/releasedist.xml @@ -54,6 +54,18 @@ <include name="fop/lib/xmlgraphics-commons*"/> </patternset> </fileset> + <fileset id="dist.lib2" dir="${basedir}/.."> + <include name="fop/target/dependency/README*"/> + <include name="fop/target/dependency/batik*"/> + <include name="fop/target/dependency/commons-io*"/> + <include name="fop/target/dependency/commons-logging*"/> + <include name="fop/target/dependency/fontbox*"/> + <include name="fop/target/dependency/serializer*"/> + <include name="fop/target/dependency/xalan*"/> + <include name="fop/target/dependency/xerces*"/> + <include name="fop/target/dependency/xml-apis*"/> + <include name="fop/target/dependency/xmlgraphics-commons*"/> + </fileset> <patternset id="dist.src.lib.build"> <include name="fop/lib/build/asm*"/> <include name="fop/lib/build/hamcrest*"/> @@ -63,7 +75,17 @@ <include name="fop/lib/build/pmd*"/> <include name="fop/lib/build/qdox*"/> <include name="fop/lib/build/xmlunit*"/> - </patternset> + </patternset> + <fileset id="dist.src.lib.build2" dir="${basedir}/.."> + <include name="fop*/target/dependency/asm*"/> + <include name="fop*/target/dependency/hamcrest*"/> + <include name="fop*/target/dependency/jaxen*"/> + <include name="fop*/target/dependency/mockito*"/> + <include name="fop*/target/dependency/objenesis*"/> + <include name="fop*/target/dependency/pmd*"/> + <include name="fop*/target/dependency/qdox*"/> + <include name="fop*/target/dependency/xmlunit*"/> + </fileset> <fileset dir="${basedir}/.." id="dist.src"> <include name="KEYS"/> <include name="LICENSE"/> @@ -146,11 +168,14 @@ </exec> </target> - <target name="dist" depends="dist-src,dist-bin" description="Generates the distribution package"/> + <target name="dist" depends="mvn-build,dist-src,dist-bin" description="Generates the distribution package"/> - <target name="dist-bin" depends="mvn-build"> + <target name="dist-bin"> <echo message="Building the binary distribution files (zip,tar)"/> <mkdir dir="${dist.bin.result.dir}"/> + <!--<copy todir="${dist.bin.result.dir}/fop/lib" flatten="true"> + <fileset refid="dist.lib2"/> + </copy>--> <copy todir="${dist.bin.result.dir}"> <fileset refid="dist.bin"/> <fileset refid="dist.bin.lib"/> @@ -178,6 +203,12 @@ <target name="dist-src"> <echo message="Building the source distribution files (zip,tar)"/> <mkdir dir="${dist.src.result.dir}"/> + <!--<copy todir="${dist.src.result.dir}/fop/lib" flatten="true"> + <fileset refid="dist.lib2"/> + </copy> + <copy todir="${dist.src.result.dir}/fop/lib/build" flatten="true"> + <fileset refid="dist.src.lib.build2"/> + </copy>--> <copy todir="${dist.src.result.dir}"> <fileset refid="dist.src"/> </copy> @@ -201,6 +232,7 @@ <arg value="clean"/> <arg value="install"/> <arg value="javadoc:javadoc"/> + <arg value="dependency:copy-dependencies"/> <arg value="-DskipTests"/> </exec> </target> |