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/glustermg.spec     | 15 +++++++++++----
 build/package-backend.sh |  2 +-
 build/package-gateway.sh |  6 +++---
 3 files changed, 15 insertions(+), 8 deletions(-)

(limited to 'build')

diff --git a/build/glustermg.spec b/build/glustermg.spec
index 27662f88..30dd79aa 100644
--- a/build/glustermg.spec
+++ b/build/glustermg.spec
@@ -1,4 +1,5 @@
-%define glustermg_war_url http://build.gluster.com:8080/job/glustermg-package/lastSuccessfulBuild/artifact/glustermg.war.tar.gz
+# the war can be picked up from current directory instead of the url
+# %define glustermg_war_url http://build.gluster.com:8080/job/glustermg-package/lastSuccessfulBuild/artifact/glustermg.war.tar.gz
 
 %define product_family Gluster Management Gateway
 
@@ -53,9 +54,15 @@ mkdir -p $RPM_BUILD_ROOT/opt/glustermg/%{release_version}
 mkdir -p $RPM_BUILD_ROOT/opt/glustermg/keys
 mkdir -p $RPM_BUILD_ROOT/opt/glustermg/etc
 mkdir -p $RPM_BUILD_ROOT/var/log/glustermg
-wget -P $RPM_BUILD_ROOT %{glustermg_war_url}
-tar -C $RPM_BUILD_ROOT/opt/glustermg/%{release_version} -zxf $RPM_BUILD_ROOT/glustermg.war.tar.gz
-rm -f $RPM_BUILD_ROOT/glustermg.war.tar.gz
+
+# following comment to be removed after testing picking up war file from current directory
+# wget -P $RPM_BUILD_ROOT %{glustermg_war_url}
+# tar -C $RPM_BUILD_ROOT/opt/glustermg/%{release_version} -zxf $RPM_BUILD_ROOT/glustermg.war.tar.gz
+# rm -f $RPM_BUILD_ROOT/glustermg.war.tar.gz
+
+tar -C $RPM_BUILD_ROOT/opt/glustermg/%{release_version} -zxf glustermg-${VERSION}.war.tar.gz
+rm -f glustermg-${VERSION}.war.tar.gz
+
 %{__install} -d -m0755 %{buildroot}%{_bindir}
 %{__install} -d -m0755 %{buildroot}%{_sbindir}
 ln -sf /opt/glustermg/%{release_version}/glustermg/scripts/grun.py %{buildroot}%{_bindir}/grun.py
diff --git a/build/package-backend.sh b/build/package-backend.sh
index cb435dde..2a7983a4 100755
--- a/build/package-backend.sh
+++ b/build/package-backend.sh
@@ -22,7 +22,7 @@ get-scripts()
 #---------------------------------------------
 # Main Action Body
 #---------------------------------------------
-echo "Packaging Gluster Management Console Scripts..."
+echo "Packaging Gluster Management Gateway Back-end Scripts..."
 
 prepare-script-dir
 get-scripts
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