diff options
| author | Alon Levy <alon@pobox.com> | 2015-04-10 19:02:43 +0200 |
|---|---|---|
| committer | Alon Levy <alon@pobox.com> | 2015-04-10 19:02:43 +0200 |
| commit | af78fe2a58f112c2a89d5731461dff8b59b19647 (patch) | |
| tree | 65881de20b66a4218134397b90933a76724d9fb9 | |
| parent | 2fda66f1ffc7d25359c4399d8cacb50c3a4f0fc8 (diff) | |
server-tools: change destination to separate tools directory
| -rw-r--r-- | build.ant | 12 | ||||
| -rw-r--r-- | src/local/server-tools/rz.py | 2 |
2 files changed, 7 insertions, 7 deletions
@@ -135,13 +135,13 @@ includes="*" /> </copy> - </parallel> + <!-- tools. use cp to preserve permissions (copy doesn't). + out of parallel so ${targetDeploymentDir}/bin is already created --> + <exec executable="cp" failonerror="true"> + <arg line="-R src/local/server-tools ${targetDeploymentDir}/tools"/> + </exec> - <!-- tools. use cp to preserve permissions (copy doesn't). - out of parallel so ${targetDeploymentDir}/bin is already created --> - <exec executable="cp" failonerror="true"> - <arg line="-R src/local/server-tools ${targetDeploymentDir}/bin/tools"/> - </exec> + </parallel> </target> diff --git a/src/local/server-tools/rz.py b/src/local/server-tools/rz.py index 158be707..001512b8 100644 --- a/src/local/server-tools/rz.py +++ b/src/local/server-tools/rz.py @@ -4,7 +4,7 @@ import os # to work both from source dir and from deployment dir path = None -for postfix in [['..'], ['..', '..', 'server']]: +for postfix in [['..', 'bin'], ['..', '..', 'server']]: candidate = os.path.join(*([os.path.dirname(__file__)] + postfix)) if os.path.exists(candidate): path = candidate |