changed generate-maven-artifacts target to place all maven artifacts in one place: modules/dist/maven/; added modules/dist/ to list of dirs to remove with the 'clean' target; added modules/dist/ to svn:ignore list on modules/

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1062308 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Steven Rowe 2011-01-23 01:42:19 +00:00
parent c76ffeaa70
commit 11146b8c3c
5 changed files with 3 additions and 6 deletions

View File

@ -25,7 +25,6 @@
<property name="build.dir" location="../build/common" /> <property name="build.dir" location="../build/common" />
<property name="dist.dir" location="../dist/common" /> <property name="dist.dir" location="../dist/common" />
<property name="maven.dist.dir" location="../dist/maven" />
<import file="../../../lucene/contrib/contrib-build.xml"/> <import file="../../../lucene/contrib/contrib-build.xml"/>

View File

@ -25,7 +25,6 @@
<property name="build.dir" location="../build/smartcn" /> <property name="build.dir" location="../build/smartcn" />
<property name="dist.dir" location="../dist/smartcn" /> <property name="dist.dir" location="../dist/smartcn" />
<property name="maven.dist.dir" location="../dist/maven" />
<import file="../../../lucene/contrib/contrib-build.xml"/> <import file="../../../lucene/contrib/contrib-build.xml"/>

View File

@ -25,7 +25,6 @@
<property name="build.dir" location="../build/stempel" /> <property name="build.dir" location="../build/stempel" />
<property name="dist.dir" location="../dist/stempel" /> <property name="dist.dir" location="../dist/stempel" />
<property name="maven.dist.dir" location="../dist/maven" />
<import file="../../../lucene/contrib/contrib-build.xml"/> <import file="../../../lucene/contrib/contrib-build.xml"/>

View File

@ -7,7 +7,7 @@
<property name="build.dir" location="build/" /> <property name="build.dir" location="build/" />
<property name="dist.dir" location="dist/" /> <property name="dist.dir" location="dist/" />
<property name="maven.dist.dir" location="dist/maven" /> <property name="maven.dist.dir" location="../dist/maven" />
<import file="../../lucene/contrib/contrib-build.xml"/> <import file="../../lucene/contrib/contrib-build.xml"/>
<property name="working.dir" location="work"/> <property name="working.dir" location="work"/>

View File

@ -57,7 +57,6 @@
<target name="generate-maven-artifacts" description="Generate Maven Artifacts for Modules"> <target name="generate-maven-artifacts" description="Generate Maven Artifacts for Modules">
<sequential> <sequential>
<ant target="get-maven-poms" inheritAll="false" dir=".."/> <ant target="get-maven-poms" inheritAll="false" dir=".."/>
<subant target="dist-maven" inheritall="false" failonerror="true"> <subant target="dist-maven" inheritall="false" failonerror="true">
<fileset dir="analysis" includes="build.xml" /> <fileset dir="analysis" includes="build.xml" />
<fileset dir="benchmark" includes="build.xml" /> <fileset dir="benchmark" includes="build.xml" />
@ -67,6 +66,7 @@
<target name="clean" description="Clean all modules"> <target name="clean" description="Clean all modules">
<sequential> <sequential>
<delete dir="dist"/>
<subant target="clean" inheritall="false" failonerror="true"> <subant target="clean" inheritall="false" failonerror="true">
<fileset dir="analysis" includes="build.xml" /> <fileset dir="analysis" includes="build.xml" />
<fileset dir="benchmark" includes="build.xml" /> <fileset dir="benchmark" includes="build.xml" />