diff options
| author | Andreas Fischer <bantu@owncloud.com> | 2014-05-28 22:57:33 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@owncloud.com> | 2014-05-28 22:57:33 +0200 |
| commit | 5754b0b9e70824786878b847abb6b728ca0414bb (patch) | |
| tree | 9ad1fbc35edde8f54f44c9ef7029e007a16815b9 /build | |
| parent | f81ee94cad8a997c3a2fef0b6aac4f8d509571f6 (diff) | |
| parent | ce9d5df6df37e51587dcde638086dfe501892b56 (diff) | |
| download | nextcloud-server-5754b0b9e70824786878b847abb6b728ca0414bb.tar.gz nextcloud-server-5754b0b9e70824786878b847abb6b728ca0414bb.zip | |
Merge remote-tracking branch 'owncloud/master' into add_resetadminpass_command
* owncloud/master: (238 commits)
Change visibility of scanner internals
[tx-robot] updated from transifex
remove legacy OC_Filesystem being used in a hook callback
add title property to share dialog
forgotten infobox messages translations
reverts 188c543 and translates only mail
fix warning text and margin
Adjust core apps to use "requiremin" instead of "require"
Added requiremin/requiremax fields for apps
[tx-robot] updated from transifex
unwrapped strings fix
allow resharing of files with only share permissions
don't lose file size during rename
drop superflous statement in phpdoc
add preRememberedLogin hook and document this and postRememberedLogin in class descripttion. Also fixes documentation of postLogin hook
[tx-robot] updated from transifex
fix grammar
make user_ldap fully translatable
[tx-robot] updated from transifex
fix typo
...
Conflicts:
core/register_command.php
Diffstat (limited to 'build')
| -rw-r--r-- | build/build.xml | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/build/build.xml b/build/build.xml index 0f9d3605da1..265beb4bccf 100644 --- a/build/build.xml +++ b/build/build.xml @@ -40,6 +40,26 @@ </fileset> </apply> + + <!-- this looks for @brief and @returns annotation in PHP files and fails if it found some --> + <apply executable="egrep" failonerror="false" resultproperty="grepReturnCode"> + <arg value="-rsHn" /> + <arg value="@brief|@returns" /> + + <fileset dir="${basedir}/build"> + <include name="**/*.php" /> + <exclude name="**/3rdparty/**" /> + <exclude name="**/l10n/**" /> + </fileset> + </apply> + + <!-- fail if grep has found something --> + <fail message="Please remove @returns and @brief annotations for PHPDoc (listed above)"> + <condition> + <equals arg1="0" arg2="${grepReturnCode}"/> + </condition> + </fail> + </target> <!-- javascript lint --> |