From d2277e6c4391f38f6373872df1a2911d86aa587d Mon Sep 17 00:00:00 2001
From: Shireesh Anjal <shireesh@gluster.com>
Date: Wed, 31 Aug 2011 16:37:26 +0530
Subject: Modified RPM build to pick up the glustermg.war.tar.gz from current
 directory instead of the last successful build url

---
 build/package-gateway.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'build/package-gateway.sh')

diff --git a/build/package-gateway.sh b/build/package-gateway.sh
index e598e92c..a26c8006 100755
--- a/build/package-gateway.sh
+++ b/build/package-gateway.sh
@@ -1,8 +1,8 @@
 WAR_NAME="glustermg.war"
 WAR_SCRIPTS_DIR=${WAR_NAME}/scripts
-NEW_WAR_NAME="glustermg"
-TAR_NAME=${WAR_NAME}.tar
-SERVER_DIST_DIR="${WORKSPACE}/../../glustermg/lastSuccessful"
+NEW_WAR_NAME="glustermg-${VERSION}"
+TAR_NAME=${NEW_WAR_NAME}.tar
+SERVER_DIST_DIR="${WORKSPACE}/buckminster.output"
 
 prepare-dist-dir()
 {
-- 
cgit 


From 854934135a838392bc00e1f6a32a92dbbfca77be Mon Sep 17 00:00:00 2001
From: Shireesh Anjal <shireesh@gluster.com>
Date: Wed, 31 Aug 2011 18:13:48 +0530
Subject: Modified to correct the output tar name

---
 build/package-gateway.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'build/package-gateway.sh')

diff --git a/build/package-gateway.sh b/build/package-gateway.sh
index a26c8006..692dec14 100755
--- a/build/package-gateway.sh
+++ b/build/package-gateway.sh
@@ -1,7 +1,7 @@
 WAR_NAME="glustermg.war"
 WAR_SCRIPTS_DIR=${WAR_NAME}/scripts
 NEW_WAR_NAME="glustermg-${VERSION}"
-TAR_NAME=${NEW_WAR_NAME}.tar
+TAR_NAME=${NEW_WAR_NAME}.war.tar
 SERVER_DIST_DIR="${WORKSPACE}/buckminster.output"
 
 prepare-dist-dir()
-- 
cgit 


From 326cd3ab76711f8753cd94d9bc359e6612d1bc1e Mon Sep 17 00:00:00 2001
From: Shireesh Anjal <shireesh@gluster.com>
Date: Fri, 2 Sep 2011 13:26:25 +0530
Subject: Modified RPM build to pick up the glustermg.war.tar.gz from SOURCES
 directory. Also changed the name of the back-end tar file to include the word
 'backend'

---
 build/package-gateway.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'build/package-gateway.sh')

diff --git a/build/package-gateway.sh b/build/package-gateway.sh
index 692dec14..38196700 100755
--- a/build/package-gateway.sh
+++ b/build/package-gateway.sh
@@ -1,7 +1,7 @@
 WAR_NAME="glustermg.war"
 WAR_SCRIPTS_DIR=${WAR_NAME}/scripts
-NEW_WAR_NAME="glustermg-${VERSION}"
-TAR_NAME=${NEW_WAR_NAME}.war.tar
+NEW_WAR_NAME="glustermg"
+TAR_NAME=${NEW_WAR_NAME}-${VERSION}.war.tar
 SERVER_DIST_DIR="${WORKSPACE}/buckminster.output"
 
 prepare-dist-dir()
@@ -69,6 +69,7 @@ get-scripts()
 {
 	cp src/com.gluster.storage.management.gateway.scripts/src/common/* ${WAR_SCRIPTS_DIR}
 	cp src/com.gluster.storage.management.gateway.scripts/src/gateway/* ${WAR_SCRIPTS_DIR}
+	chmod +x ${WAR_SCRIPTS_DIR}/*
 }
 
 #---------------------------------------------
-- 
cgit 


From 31350432cdd7ebf94d567052125e0f411fd91921 Mon Sep 17 00:00:00 2001
From: Shireesh Anjal <shireesh@gluster.com>
Date: Fri, 2 Sep 2011 18:17:44 +0530
Subject: Modified to pick the console distributions from the correct job
 (<version>-glustermc)

---
 build/package-gateway.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'build/package-gateway.sh')

diff --git a/build/package-gateway.sh b/build/package-gateway.sh
index 38196700..640f69d5 100755
--- a/build/package-gateway.sh
+++ b/build/package-gateway.sh
@@ -48,7 +48,7 @@ get-dist()
 	OS=${2}
 	WS=${3}
 
-	OUT_DIR="${WORKSPACE}/../../glustermc/workspace/arch/${ARCH}/os/${OS}/ws/${WS}/buckminster.output/com.gluster.storage.management.console.feature.webstart*.feature/glustermc"
+	OUT_DIR="${WORKSPACE}/../../${VERSION}-glustermc/workspace/arch/${ARCH}/os/${OS}/ws/${WS}/buckminster.output/com.gluster.storage.management.console.feature.webstart*.feature/glustermc"
 	NEW_DIR=${WAR_NAME}/${OS}.${WS}.${ARCH}
 	cp -R ${OUT_DIR} ${NEW_DIR}
 
-- 
cgit