Revision 8242
Added by ben leinfelder over 11 years ago
build.xml | ||
---|---|---|
64 | 64 |
<macrodef name = "git-clone-pull"> |
65 | 65 |
<attribute name = "repository" /> |
66 | 66 |
<attribute name = "dest" /> |
67 |
<attribute name = "refname" /> |
|
67 | 68 |
<sequential> |
68 | 69 |
<git command = "clone"> |
69 | 70 |
<args> |
... | ... | |
71 | 72 |
<arg value = "@{dest}" /> |
72 | 73 |
</args> |
73 | 74 |
</git> |
74 |
<git command = "pull" dir = "@{dest}" /> |
|
75 |
<git command = "pull" dir = "@{dest}" > |
|
76 |
<args> |
|
77 |
<arg value = "@{repository}" /> |
|
78 |
<arg value = "@{refname}" /> |
|
79 |
</args> |
|
80 |
</git> |
|
81 |
<git command = "checkout" dir = "@{dest}"> |
|
82 |
<args> |
|
83 |
<arg value = "@{refname}" /> |
|
84 |
</args> |
|
85 |
</git> |
|
75 | 86 |
</sequential> |
76 | 87 |
</macrodef> |
77 | 88 |
|
78 | 89 |
<!-- get metacatUI project --> |
79 | 90 |
<target name="getMetacatUI" depends="init"> |
80 |
<git-clone-pull repository="${metacatui.git.repository.url}" dest="${metacatui.build.dir}" /> |
|
91 |
<git-clone-pull repository="${metacatui.git.repository.url}" dest="${metacatui.build.dir}" refname="${metacatui.git.repository.refname}" />
|
|
81 | 92 |
</target> |
82 | 93 |
|
83 | 94 |
<target name="build-metacat-ui" description="Calls the Maven build for metacatUI war" depends="getMetacatUI" unless="build-metacat-ui-called"> |
... | ... | |
404 | 415 |
<!-- the git repo --> |
405 | 416 |
<property name="metacatui.git.repository.url" |
406 | 417 |
value="https://github.com/NCEAS/metacatui.git" /> |
418 |
<property name="metacatui.git.repository.refname" |
|
419 |
value="master" /> |
|
407 | 420 |
<property name="metacatui.build.dir" |
408 | 421 |
value="metacatui_build" /> |
409 | 422 |
<property name="metacatui.resources.dir" |
Also available in: Unified diff
pull a specific tag/branch form git when needed for metacatui.war
https://projects.ecoinformatics.org/ecoinfo/issues/6095