Revision 8174
Added by ben leinfelder over 11 years ago
build.xml | ||
---|---|---|
74 | 74 |
<git command = "pull" dir = "@{dest}" /> |
75 | 75 |
</sequential> |
76 | 76 |
</macrodef> |
77 |
|
|
78 |
<!-- get metacatUI project --> |
|
79 |
<target name="getMetacatUI" depends="init"> |
|
80 |
<git-clone-pull repository="${metacatui.git.repository.url}" dest="${metacatui.build.dir}" /> |
|
81 |
</target> |
|
82 |
|
|
83 |
<target name="build-metacat-ui" description="Calls the Maven build for metacatUI war" depends="getMetacatUI" > |
|
84 |
<artifact:mvn pom="${metacatui.build.dir}/metacatui/pom.xml" mavenhome="${maven.home}" fork="true"> |
|
85 |
<arg value="clean"/> |
|
86 |
</artifact:mvn> |
|
87 |
<artifact:mvn pom="${metacatui.build.dir}/metacatui/pom.xml" mavenhome="${maven.home}" fork="true"> |
|
88 |
<arg value="package"/> |
|
89 |
</artifact:mvn> |
|
90 |
</target> |
|
91 |
|
|
92 |
<target name="dist-metacat-ui" depends="build-metacat-ui"> |
|
93 |
<copy tofile="${dist.dir}/metacatui.war" > |
|
94 |
<fileset dir="${metacatui.build.dir}/metacatui/target" includes="*.war"></fileset> |
|
95 |
</copy> |
|
96 |
</target> |
|
77 | 97 |
|
78 | 98 |
<taskdef resource="axis-tasks.properties" |
79 | 99 |
classpathref="axis.ant.classpath" /> |
... | ... | |
811 | 831 |
<echo>Dev install completed at ${NOW}</echo> |
812 | 832 |
</target> |
813 | 833 |
|
814 |
<target name="build-metacat" depends="install-ecogrid, install-spatial, dist-metacat-index" |
|
834 |
<target name="build-metacat" depends="install-ecogrid, install-spatial, dist-metacat-index, dist-metacat-ui"
|
|
815 | 835 |
description="Build Metacat"> |
816 | 836 |
</target> |
817 | 837 |
|
... | ... | |
916 | 936 |
<echo message="Install Skin completed." /> |
917 | 937 |
</target> |
918 | 938 |
|
919 |
<target name="war" depends="warPrepare,install-spatial, dist-metacat-index" |
|
939 |
<target name="war" depends="warPrepare,install-spatial, dist-metacat-index, dist-metacat-ui"
|
|
920 | 940 |
description="Create a web archive (WAR) for servlet deployment"> |
921 | 941 |
<mkdir dir="${dist.dir}" /> |
922 | 942 |
<war destfile="${dist.dir}/${metacat.context}.war" |
Also available in: Unified diff
include metacatui.war in the Metacat distribution. https://projects.ecoinformatics.org/ecoinfo/issues/6064