diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-05-08 16:35:11 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-05-08 16:35:11 +0200 |
| commit | 208fc767611d32378b116d8269760b64cf455574 (patch) | |
| tree | 95d738770aeec93d5838822d608244974626c96b /build | |
| parent | 6a3f34ae61287e8390ed22fa118c134f7102346b (diff) | |
| parent | 52316bb3f55235cc3e6bd3317c83b391a80c66da (diff) | |
| download | forums-208fc767611d32378b116d8269760b64cf455574.tar forums-208fc767611d32378b116d8269760b64cf455574.tar.gz forums-208fc767611d32378b116d8269760b64cf455574.tar.bz2 forums-208fc767611d32378b116d8269760b64cf455574.tar.xz forums-208fc767611d32378b116d8269760b64cf455574.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10178] Add path to find command to build packages on FreeBSD.
[ticket/10177] Add `-f -` to tar command to build packages with bsdtar.
Diffstat (limited to 'build')
| -rw-r--r-- | build/build.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/build/build.xml b/build/build.xml index 268f09d674..bc9240f37c 100644 --- a/build/build.xml +++ b/build/build.xml @@ -133,7 +133,7 @@ --> <target name="export"> <exec dir="phpBB" - command="git archive ${revision} | tar -x -C ../${dir}" + command="git archive ${revision} | tar -xf - -C ../${dir}" checkreturn="true" /> <delete file="${dir}/config.php" /> <delete dir="${dir}/develop" /> @@ -141,8 +141,8 @@ <echo msg="Setting permissions for checkout of ${revision} in ${dir}" /> <!-- set permissions of all files to 644, directories to 755 --> - <exec dir="${dir}" command="find -type f|xargs chmod 644" escape="false" /> - <exec dir="${dir}" command="find -type d|xargs chmod 755" escape="false" /> + <exec dir="${dir}" command="find . -type f|xargs chmod 644" escape="false" /> + <exec dir="${dir}" command="find . -type d|xargs chmod 755" escape="false" /> <!-- set permissions of some directories to 777 --> <chmod mode="0777" file="${dir}/cache" /> <chmod mode="0777" file="${dir}/store" /> |