As requested by Andy, a big change to how the maven-dist occurs. Now, we copy over the main jars to the maven directory, rather than making their own. We then have a different pom for each of poi, -scratchpad and -contrib. Finally, put all the files under maven-dist into the right place for upload

git-svn-id: https://svn.apache.org/repos/asf/jakarta/poi/trunk@545491 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Nick Burch 2007-06-08 12:31:21 +00:00
parent 36fa9aa046
commit 3b0d7ca987
3 changed files with 108 additions and 47 deletions

143
build.xml
View File

@ -127,6 +127,8 @@ under the License.
<property name="changelog.file" location="${build.site}/changelog.html"/> <property name="changelog.file" location="${build.site}/changelog.html"/>
<property name="dist.dir" location="build/dist"/> <property name="dist.dir" location="build/dist"/>
<property name="mavendist.dir" location="build/maven-dist"/> <property name="mavendist.dir" location="build/maven-dist"/>
<property name="mavendist.poi.dir" location="build/maven-dist/poi"/>
<property name="mavendist.oap.dir" location="build/maven-dist/org.apache.poi"/>
<property name="jar.name" value="poi"/> <property name="jar.name" value="poi"/>
<property name="version.id" value="3.0.1-alpha1"/> <property name="version.id" value="3.0.1-alpha1"/>
<property name="halt.on.test.failure" value="true"/> <property name="halt.on.test.failure" value="true"/>
@ -234,9 +236,15 @@ under the License.
<mkdir dir="${jdepend.report.out.dir}"/> <mkdir dir="${jdepend.report.out.dir}"/>
<mkdir dir="${apidocs.report.dir}"/> <mkdir dir="${apidocs.report.dir}"/>
<mkdir dir="${dist.dir}"/> <mkdir dir="${dist.dir}"/>
<mkdir dir="${mavendist.dir}"/>
<mkdir dir="${build.site.src}/${main.documentation}"/> <mkdir dir="${build.site.src}/${main.documentation}"/>
<mkdir dir="${mavendist.dir}"/>
<mkdir dir="${mavendist.poi.dir}"/>
<mkdir dir="${mavendist.poi.dir}/poms"/>
<mkdir dir="${mavendist.oap.dir}"/>
<mkdir dir="${mavendist.oap.dir}/jars"/>
<mkdir dir="${mavendist.oap.dir}/poms"/>
<copy todir="${build.site.src}/${main.documentation}"> <copy todir="${build.site.src}/${main.documentation}">
<fileset dir="${main.documentation}"/> <fileset dir="${main.documentation}"/>
</copy> </copy>
@ -807,57 +815,102 @@ FORREST_HOME environment variable!</echo>
description="Generates POI's website's contents"/> description="Generates POI's website's contents"/>
<target name="maven-dist" depends="clean,compile" description="Builds the jar files for a maven distribution, and the POM to go with them"> <target name="maven-dist" depends="jar" description="Builds the POM files for a maven distribution, and copies these and the jars to the appropriate locations">
<!-- Build a Jar of all the class files --> <!-- Copy the jar files into the maven jar directory -->
<jar destfile="${mavendist.dir}/${jar.name}-${version.id}.jar"> <copy
<manifest> file="${dist.dir}/${jar.name}-${version.id}-${DSTAMP}.jar"
<attribute name="Built-By" value="${user.name}"/> todir="${mavendist.oap.dir}/jars/" />
<attribute name="Specification-Title" value="Apache POI"/> <copy
<attribute name="Specification-Version" value="${version.id}-${DSTAMP}"/> file="${dist.dir}/${jar.name}-contrib-${version.id}-${DSTAMP}.jar"
<attribute name="Specification-Vendor" value="Apache"/> todir="${mavendist.oap.dir}/jars/" />
<attribute name="Implementation-Title" value="Apache POI"/> <copy
<attribute name="Implementation-Version" value="${version.id}-${DSTAMP}"/> file="${dist.dir}/${jar.name}-scratchpad-${version.id}-${DSTAMP}.jar"
<attribute name="Implementation-Vendor" value="Apache"/> todir="${mavendist.oap.dir}/jars/" />
</manifest>
<fileset dir="${main.output.dir}" />
<fileset dir="${contrib.output.dir}" />
<fileset dir="${scratchpad.output.dir}" />
<fileset dir="legal/" />
</jar>
<!-- Build a Jar file of all the source files --> <!-- Build the org.apache.poi poms -->
<jar destfile="${mavendist.dir}/${jar.name}-${version.id}-sources.jar"> <!-- Copy from the base file, substituting in the version and -->
<manifest> <!-- artificat, plus doing the core poi dependency as needed -->
<attribute name="Built-By" value="${user.name}"/>
<attribute name="Specification-Title" value="Apache POI"/>
<attribute name="Specification-Version" value="${version.id}-${DSTAMP}"/>
<attribute name="Specification-Vendor" value="Apache"/>
<attribute name="Implementation-Title" value="Apache POI"/>
<attribute name="Implementation-Version" value="${version.id}-${DSTAMP}"/>
<attribute name="Implementation-Vendor" value="Apache"/>
</manifest>
<fileset dir="${main.src}" includes="**/*.java" />
<fileset dir="${contrib.src}" includes="**/*.java" />
<fileset dir="${scratchpad.src}" includes="**/*.java" />
<fileset dir="legal/" />
</jar>
<!-- Build the main pom --> <!-- Build the main pom -->
<!-- Copy from the base file, and substitute in the version -->
<filter token="VERSION" value="${version.id}" />
<copy <copy
filtering="true"
file="poi.pom" file="poi.pom"
tofile="${mavendist.dir}/${jar.name}-${version.id}.pom" tofile="${mavendist.oap.dir}/poms/${jar.name}-${version.id}.pom"
/> >
<!-- Build the poi => org.apache.poi redirect pom --> <filterchain>
<!-- Copy from the base file, and substitute in the version --> <replacetokens>
<filter token="VERSION" value="${version.id}" /> <token key="VERSION" value="${version.id}" />
<token key="ARTIFICAT" value="poi" />
</replacetokens>
<tokenfilter>
<filetokenizer/>
<replaceregex pattern="START_NON_MAIN.*END_NON_MAIN_DEPENDENCY" replace="No POI dependency on the main jar" flags="s" />
</tokenfilter>
</filterchain>
</copy>
<!-- And the contrib pom -->
<copy
file="poi.pom"
tofile="${mavendist.oap.dir}/poms/${jar.name}-contrib-${version.id}.pom"
>
<filterchain>
<replacetokens>
<token key="VERSION" value="${version.id}" />
<token key="ARTIFICAT" value="poi-contrib" />
</replacetokens>
<tokenfilter>
<replaceregex pattern="..-- START_NON_MAIN_DEPENDENCY --." replace="" flags="s"/>
<replaceregex pattern="..-- END_NON_MAIN_DEPENDENCY --." replace="" flags="s"/>
</tokenfilter>
</filterchain>
</copy>
<!-- And the scratchpad pom -->
<copy
file="poi.pom"
tofile="${mavendist.oap.dir}/poms/${jar.name}-scratchpad-${version.id}.pom"
>
<filterchain>
<replacetokens>
<token key="VERSION" value="${version.id}" />
<token key="ARTIFICAT" value="poi-scratchpad" />
</replacetokens>
<tokenfilter>
<replaceregex pattern="..-- START_NON_MAIN_DEPENDENCY --." replace="" flags="s"/>
<replaceregex pattern="..-- END_NON_MAIN_DEPENDENCY --." replace="" flags="s"/>
</tokenfilter>
</filterchain>
</copy>
<!-- Build the poi => org.apache.poi redirect poms -->
<!-- Copy from the base file, substituting in the version+artifact -->
<copy <copy
filtering="true"
file="poi-redirect.pom" file="poi-redirect.pom"
tofile="${mavendist.dir}/${jar.name}-${version.id}-redirect.pom" tofile="${mavendist.poi.dir}/poms/${jar.name}-${version.id}.pom"
/> >
<filterchain><replacetokens>
<token key="VERSION" value="${version.id}" />
<token key="ARTIFICAT" value="poi" />
</replacetokens></filterchain>
</copy>
<copy
file="poi-redirect.pom"
tofile="${mavendist.poi.dir}/poms/${jar.name}-contrib-${version.id}.pom"
>
<filterchain><replacetokens>
<token key="VERSION" value="${version.id}" />
<token key="ARTIFICAT" value="poi-contrib" />
</replacetokens></filterchain>
</copy>
<copy
file="poi-redirect.pom"
tofile="${mavendist.poi.dir}/poms/${jar.name}-scratchpad-${version.id}.pom"
>
<filterchain><replacetokens>
<token key="VERSION" value="${version.id}" />
<token key="ARTIFICAT" value="poi-scratchpad" />
</replacetokens></filterchain>
</copy>
<!-- And that's it for maven -->
</target> </target>
<target name="jar" depends="compile" description="Creates jar files for distribution"> <target name="jar" depends="compile" description="Creates jar files for distribution">

View File

@ -25,7 +25,7 @@ under the License.
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>poi</groupId> <groupId>poi</groupId>
<artifactId>poi</artifactId> <artifactId>@ARTIFICAT@</artifactId>
<version>@VERSION@</version> <version>@VERSION@</version>
<distributionManagement> <distributionManagement>

10
poi.pom
View File

@ -25,7 +25,7 @@ under the License.
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.apache.poi</groupId> <groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId> <artifactId>@ARTIFICAT@</artifactId>
<version>@VERSION@</version> <version>@VERSION@</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>Apache POI</name> <name>Apache POI</name>
@ -33,6 +33,14 @@ under the License.
<description>Apache POI - Java API To Access Microsoft Format Files</description> <description>Apache POI - Java API To Access Microsoft Format Files</description>
<dependencies> <dependencies>
<!-- START_NON_MAIN_DEPENDENCY -->
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
<version>@VERSION@</version>
</dependency>
<!-- END_NON_MAIN_DEPENDENCY -->
<dependency> <dependency>
<groupId>commons-logging</groupId> <groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId> <artifactId>commons-logging</artifactId>