oreolek/batufa
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Minor bugfix to build.xml, and updating checkout order

Browse source
This commit is contained in:
Kiall Mac Innes 2010-12-09 00:59:02 +00:00
parent e29e30a1cc
commit 7fa8a17953
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
build.xml
View file

@ -75,7 +75,7 @@
<property name="dir" value="." /> <property name="dir" value="." />
</phingcall> </phingcall>
<!--<foreach list="${submodules}" param="dir" target="_git-checkout"/>--> <foreach list="${submodules}" param="dir" target="_git-checkout"/>
</target> </target>
<target name="_git-checkout"> <target name="_git-checkout">
@ -92,10 +92,10 @@
</target> </target>
<target name="git-push"> <target name="git-push">
<foreach list="${submodules}" param="dir" target="_git-push"/>
<phingcall target="_git-push"> <phingcall target="_git-push">
<property name="dir" value="." /> <property name="dir" value="." />
</phingcall> </phingcall>
<foreach list="${submodules}" param="dir" target="_git-push"/>
</target> </target>
<target name="_git-push"> <target name="_git-push">
@ -103,10 +103,10 @@
</target> </target>
<target name="git-status"> <target name="git-status">
<foreach list="${submodules}" param="dir" target="_git-status"/>
<phingcall target="_git-status"> <phingcall target="_git-status">
<property name="dir" value="." /> <property name="dir" value="." />
</phingcall> </phingcall>
<foreach list="${submodules}" param="dir" target="_git-status"/>
</target> </target>
<target name="_git-status"> <target name="_git-status">
@ -171,17 +171,21 @@
</target> </target>
<target name="dev-push"> <target name="dev-push">
<foreach list="${submodules}" param="submodule" target="dev-submodule-push"/> <foreach list="${submodules}" param="submodule" target="_dev-push"/>
<phingcall target="_dev-push">
<property name="repository" value="git@github.com:kohana/userguide.git" />
<property name="dir" value="${basedir}/modules/userguide" />
</phingcall>
</target> </target>
<target name="dev-submodule-push"> <target name="_dev-push">
<if> <if>
<isset property="submodule"/> <isset property="submodule"/>
<else> <else>
<fail message="A submodule propery must be supplied." /> <fail message="A submodule propery must be supplied." />
</else> </else>
</if> </if>
<gitpush repository="${basedir}/${submodule}" destination="dev" refspec="${branch}:${branch}" tags="true" /> <!--<gitpush repository="${basedir}/${submodule}" destination="dev" refspec="${branch}:${branch}" tags="true" />-->
</target> </target>
<!-- Run unit tests --> <!-- Run unit tests -->