diff options
| author | Shireesh Anjal <shireesh@gluster.com> | 2011-07-31 17:13:30 +0530 |
|---|---|---|
| committer | Shireesh Anjal <shireesh@gluster.com> | 2011-07-31 17:13:30 +0530 |
| commit | 36c1b154f509b4dcfd22fb1a4cb60ecad7e175e1 (patch) | |
| tree | 6f7027300d1cd8652078b060b5474893be850c58 | |
| parent | 8a27c576bbbeea95fc5a0e7b509ce68133619a05 (diff) | |
| parent | c0d303fc1cbce0a50b5486d4a26d53fddf32419a (diff) | |
Merge branch 'work'
| -rwxr-xr-x | build/gmg-buckminster.commands (renamed from build/gmc-server-buckminster.commands) | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | build/junit-buckminster.commands (renamed from build/gmc-junit-buckminster.commands) | 0 | ||||
| -rwxr-xr-x | build/package-backend.sh (renamed from build/package-scripts.sh) | 0 | ||||
| -rwxr-xr-x | build/package-gateway.sh (renamed from build/package-server.sh) | 4 |
4 files changed, 2 insertions, 2 deletions
diff --git a/build/gmc-server-buckminster.commands b/build/gmg-buckminster.commands index 96175b57..96175b57 100755 --- a/build/gmc-server-buckminster.commands +++ b/build/gmg-buckminster.commands diff --git a/build/gmc-junit-buckminster.commands b/build/junit-buckminster.commands index 1d1a7efd..1d1a7efd 100644..100755 --- a/build/gmc-junit-buckminster.commands +++ b/build/junit-buckminster.commands diff --git a/build/package-scripts.sh b/build/package-backend.sh index 8671ae3f..8671ae3f 100755 --- a/build/package-scripts.sh +++ b/build/package-backend.sh diff --git a/build/package-server.sh b/build/package-gateway.sh index c5fa9127..1685d546 100755 --- a/build/package-server.sh +++ b/build/package-gateway.sh @@ -1,7 +1,7 @@ WAR_NAME="glustermg.war" NEW_WAR_NAME="glustermg" TAR_NAME=${WAR_NAME}.tar -SERVER_DIST_DIR="${WORKSPACE}/../../gmc-server/lastSuccessful" +SERVER_DIST_DIR="${WORKSPACE}/../../glustermg/lastSuccessful" prepare-dist-dir() { @@ -28,7 +28,7 @@ get-dist() OS=${2} WS=${3} - OUT_DIR="${WORKSPACE}/../../gmc-gui/workspace/arch/${ARCH}/os/${OS}/ws/${WS}/buckminster.output/com.gluster.storage.management.gui.feature.webstart*.feature/glustermc" + OUT_DIR="${WORKSPACE}/../../glustermc/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} } |
