tonyair/silverstripe-installer
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-installer synced 2024-10-22 17:05:33 +02:00
Code Issues Projects Releases Wiki Activity

MINOR Auto conflict merges in phing translation tasks

Browse Source 
Also set some default values when targets are executed
individually, and ensure that text collection fails the build if required
This commit is contained in:
Ingo Schommer 2012-06-25 17:37:37 +02:00
parent 6dfd99a313
commit 5cad54578c
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
build.xml
View File

@ -408,13 +408,16 @@ Your friendly automated release script.
<target name="translations-staging-setup"> <target name="translations-staging-setup">
<propertyprompt propertyName="module" <propertyprompt propertyName="module"
promptText="Module name?" promptText="Module name?"
useExistingValue="true" /> useExistingValue="true"
defaultValue="framework" />
<propertyprompt propertyName="getlocalization.${module}.project" <propertyprompt propertyName="getlocalization.${module}.project"
promptText="getlocalization project" promptText="getlocalization project"
useExistingValue="true" /> useExistingValue="true"
defaultValue="sapphire" />
<propertyprompt propertyName="getlocalization.${module}.user" <propertyprompt propertyName="getlocalization.${module}.user"
promptText="getlocalization username" promptText="getlocalization username"
useExistingValue="true" /> useExistingValue="true"
defaultValue="silverstripe" />
<propertyprompt propertyName="getlocalization.${module}.password" <propertyprompt propertyName="getlocalization.${module}.password"
promptText="getlocalization password" promptText="getlocalization password"
useExistingValue="true" /> useExistingValue="true" />
@ -432,8 +435,8 @@ Your friendly automated release script.
<target name="translations-update-git-masterfile" <target name="translations-update-git-masterfile"
description="Collect translation on a module, commit them into a specialized branch and push to the origin repository." description="Collect translation on a module, commit them into a specialized branch and push to the origin repository."
depends="translations-staging-setup"> depends="translations-staging-setup">
<exec command="git merge origin/master" dir="${module}" checkreturn="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" /> <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}" /> <exec command="git status --short" dir="${module}" outputProperty="git.status.${module}" />
<if> <if>
<istrue value="${git.status.${module}}" /> <istrue value="${git.status.${module}}" />