diff options
| author | Shireesh Anjal <shireesh@gluster.com> | 2011-04-14 20:56:42 +0530 |
|---|---|---|
| committer | Shireesh Anjal <shireesh@gluster.com> | 2011-04-14 20:56:42 +0530 |
| commit | bf3b44b67f6b2f03c66d8783d0e74e5fcd753ddd (patch) | |
| tree | 60a511c8bdbe78b7b9e5f74c153e1494e258c82c | |
| parent | 6044ba8846610911dedbce10eecaef4a7d144abd (diff) | |
| parent | d3acbc0eda74dca6bf261be0a914485a08852b33 (diff) | |
Merge branch 'build'
Conflicts:
build/package-server.sh
| -rwxr-xr-x | build/package-server.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build/package-server.sh b/build/package-server.sh index 5d7159fc..62aae70d 100755 --- a/build/package-server.sh +++ b/build/package-server.sh @@ -1,6 +1,6 @@ WAR_NAME="glustermc.war" TAR_NAME=${WAR_NAME}.tar -SERVER_DIST_DIR="${WORKSPACE}/../../gms-test1/lastSuccessful" +SERVER_DIST_DIR="${WORKSPACE}/../../gmc-server/lastSuccessful" prepare-dist-dir() { @@ -24,7 +24,7 @@ get-dist() OS=${2} WS=${3} - OUT_DIR="${WORKSPACE}/../../gmc-test1/workspace/arch/${ARCH}/os/${OS}/ws/${WS}/buckminster.output/com.gluster.storage.management.gui.feature.webstart*.feature/glustermc" + OUT_DIR="${WORKSPACE}/../../gmc-gui/workspace/arch/${ARCH}/os/${OS}/ws/${WS}/buckminster.output/com.gluster.storage.management.gui.feature.webstart*.feature/glustermc" NEW_DIR=${WAR_NAME}/${OS}.${WS}.${ARCH} cp -R ${OUT_DIR} ${NEW_DIR} } |