Merge branch 'kongjian' into 'master'

Kongjian

update tsar-build.sh for abs

See merge request !1

rpm/tsar-build.sh

@@ -18,40 +18,29 @@ usage()
   exit 0
 }
 
-svn_path="Unknown_path"
-svn_revision="Unknown_revision"
-svn_info()
+git_path="Unknown_path"
+git_revision="Unknown_revision"
+git_info()
 {
-  str=`svn info ../ 2>/dev/null |
-  awk -F': ' '{if($1=="URL") print $2}'`
-
-  if [ -z "$str" ]; then return; fi
-
-  svn_path=$str
-  str=`svn info ../ 2>/dev/null |
-  awk -F': ' '{if($1=="Last Changed Rev") print $2}'`
-
-  if [ -z "$str" ]; then
-    echo "!! Please upgrade your subversion: sudo yum install subversion"
-    return;
-  fi
-
-  svn_revision=$str
+  base=19000
+  git_version=`git rev-list --all|wc -l`
+  git_revision=`expr $git_version + $base`
+  echo $git_revision
 }
 
-svn_info
+git_info
 
 if [ `cat /etc/redhat-release|cut -d " " -f 7|cut -d "." -f 1` = 4 ]
 then
-        release="$svn_revision".el4
+        release="$git_revision".el4
 elif [ `cat /etc/redhat-release|cut -d " " -f 7|cut -d "." -f 1` = 5 ]
 then
-        release="$svn_revision".el5
+        release="$git_revision".el5
 elif [ `cat /etc/redhat-release|cut -d " " -f 7|cut -d "." -f 1` = 6 ]
 then
-        release="$svn_revision".el6
+        release="$git_revision".el6
 else
-        release="$svn_revision".el5
+        release="$git_revision".el5
 fi
 
 RPM_MACROS=$HOME/.rpmmacros
@@ -63,8 +52,8 @@ fi
 echo "%_topdir $TOP_DIR" > $RPM_MACROS
 echo "%packager " `whoami` >> $RPM_MACROS
 echo "%vendor TaoBao Inc." >> $RPM_MACROS
-echo "%_svn_path $svn_path" >> $RPM_MACROS
-echo "%_svn_revision $svn_revision" >> $RPM_MACROS
+echo "%_git_path $git_path" >> $RPM_MACROS
+echo "%_git_revision $git_revision" >> $RPM_MACROS
 echo "%_release $release" >> $RPM_MACROS
 echo "%debug_package %{nil}" >> $RPM_MACROS
 
@@ -79,8 +68,7 @@ mkdir -p $TOP_DIR/SPECS
 export fullname=$name-$version
 
 ln -s . $fullname
-tar --exclude=$fullname/*/.svn \
-    --exclude=$fullname/$fullname \
+tar --exclude=$fullname/$fullname \
     --exclude=$fullname/$fullname.tar.gz \
     -cf - $fullname/* | gzip -c9 >$fullname.tar.gz
 cp $fullname.tar.gz $TOP_DIR/SOURCES
@@ -90,7 +78,7 @@ rm $fullname.tar.gz
 rm -rf $fullname
 
 ## create spec file from template
-sed -e "s/_VERSION_/$version/g" -e "s/_RELEASE_/$release/g"  -e "s/SVN_REVISION/$svn_revision/g" < rpm/$name.spec.in > $TOP_DIR/SPECS/$name.spec
+sed -e "s/_VERSION_/$version/g" -e "s/_RELEASE_/$release/g"  -e "s/SVN_REVISION/$git_revision/g" < rpm/$name.spec.in > $TOP_DIR/SPECS/$name.spec
 
 rpmbuild --ba $TOP_DIR/SPECS/$name.spec
 

rpm/tsar.spec.in

@@ -2,7 +2,7 @@ Name: tsar
 Version: _VERSION_
 Release: _RELEASE_
 Summary: Taobao System Activity Reporter
-URL: http://svn.simba.taobao.com/svn/cdn/trunk/tsar/Revision_SVN_REVISION
+URL: https://github.com/alibaba/tsar
 Group: Taobao/Common
 License: Commercial
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)