Skip to content
Browse files

MINOR Auto conflict merges in phing translation tasks

Also set some default values when targets are executed
individually, and ensure that text collection fails the build if required
  • Loading branch information...
1 parent 6dfd99a commit 5cad54578cd0bd33d8c61cf40b74d41122449c35 @chillu chillu committed Jun 25, 2012
Showing with 8 additions and 5 deletions.
  1. +8 −5 build.xml
View
13 build.xml
@@ -408,13 +408,16 @@ Your friendly automated release script.
<target name="translations-staging-setup">
<propertyprompt propertyName="module"
promptText="Module name?"
- useExistingValue="true" />
+ useExistingValue="true"
+ defaultValue="framework" />
<propertyprompt propertyName="getlocalization.${module}.project"
promptText="getlocalization project"
- useExistingValue="true" />
+ useExistingValue="true"
+ defaultValue="sapphire" />
<propertyprompt propertyName="getlocalization.${module}.user"
promptText="getlocalization username"
- useExistingValue="true" />
+ useExistingValue="true"
+ defaultValue="silverstripe" />
<propertyprompt propertyName="getlocalization.${module}.password"
promptText="getlocalization password"
useExistingValue="true" />
@@ -432,8 +435,8 @@ Your friendly automated release script.
<target name="translations-update-git-masterfile"
description="Collect translation on a module, commit them into a specialized branch and push to the origin repository."
depends="translations-staging-setup">
- <exec command="git merge origin/master" dir="${module}" checkreturn="true" />
- <exec command="php framework/cli-script.php dev/tasks/i18nTextCollectorTask" passthru="true" />
+ <exec command="git merge --strategy recursive -X theirs origin/master" dir="${module}" checkreturn="true" />
+ <exec command="php framework/cli-script.php dev/tasks/i18nTextCollectorTask" passthru="true" checkreturn="true" />
<exec command="git status --short" dir="${module}" outputProperty="git.status.${module}" />
<if>
<istrue value="${git.status.${module}}" />

0 comments on commit 5cad545

Please sign in to comment.
Something went wrong with that request. Please try again.