Project

General

Profile

« Previous | Next » 

Revision 9803

Added by Jing Tao almost 8 years ago

Add a system property to pass maven home directory to maven call.

View differences:

build.xml
94 94
	
95 95
	<target name="build-metacat-ui" description="Calls the Maven build for metacatUI war" depends="getMetacatUI" unless="build-metacat-ui-called">
96 96
		<artifact:mvn pom="${metacatui.build.dir}/metacatui/pom.xml" mavenhome="${maven.home}" fork="true">
97
			<jvmarg value="-Dmaven.multiModuleProjectDirectory=${maven.home}" />
97 98
			<arg value="clean"/>
98 99
		</artifact:mvn>
99 100
		<artifact:mvn pom="${metacatui.build.dir}/metacatui/pom.xml" mavenhome="${maven.home}" fork="true">
101
			<jvmarg value="-Dmaven.multiModuleProjectDirectory=${maven.home}" />
100 102
		   <arg value="package"/>
101 103
		</artifact:mvn>
102 104
		<property name="build-metacat-ui-called" value="true"/>
......
1340 1342
		description="deletes build dir and files that can be regenerated form the release">
1341 1343
		<delete dir="${build.dir}" />
1342 1344
		<delete dir="${dist.dir}" />
1343
	    <delete dir="${metacatui.build.dir}" />
1345
		<delete dir="${metacatui.build.dir}" />
1344 1346
	</target>
1345 1347

  
1346 1348
	<target name="fullclean" depends="clean"
......
1712 1714
	<!-- build metacat-common jar -->
1713 1715
	<target name="build-metacat-common" description="Calls the Maven build for metacat-common jar" unless="build-metacat-common-called" >
1714 1716
		<artifact:mvn pom="metacat-common/pom.xml" mavenhome="${maven.home}" fork="true">
1717
			        <jvmarg value="-Dmaven.multiModuleProjectDirectory=${maven.home}" />
1715 1718
		            <arg value="clean"/>
1716 1719
		</artifact:mvn>
1717 1720
		<artifact:mvn pom="metacat-common/pom.xml" mavenhome="${maven.home}" fork="true">
1721
			<jvmarg value="-Dmaven.multiModuleProjectDirectory=${maven.home}" />
1718 1722
		   <arg value="install"/>
1719 1723
		</artifact:mvn>
1720 1724
		<property name="build-metacat-common-called" value="true"/>
......
1723 1727
	<!-- build metacat-index war -->
1724 1728
	<target name="build-metacat-index" description="Calls the Maven build for metacat-index.war" >		
1725 1729
		<artifact:mvn pom="metacat-index/pom.xml" mavenhome="${maven.home}" fork="true">
1730
			<jvmarg value="-Dmaven.multiModuleProjectDirectory=${maven.home}" />
1726 1731
			<arg value="clean"/>
1727 1732
		</artifact:mvn>
1728 1733
		<artifact:mvn pom="metacat-index/pom.xml" mavenhome="${maven.home}" fork="true">
1734
			<jvmarg value="-Dmaven.multiModuleProjectDirectory=${maven.home}" />
1729 1735
			<arg value="package"/>
1730 1736
			<!--<arg value="-Dmaven.test.skip=true"/>-->
1731 1737
		</artifact:mvn>

Also available in: Unified diff