Mercurial > hg

diff contrib/buildrpm @ 21639:57e0f053e529

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
buildrpm: collect code for building local hg and using it in one place
author Mads Kiilerich <madski@unity3d.com>
date Thu, 15 May 2014 01:48:37 +0200
parents 5337cb17fa1f
children 4bfb721de6dd
line wrap: on
line diff
--- a/contrib/buildrpm	Tue May 20 03:57:21 2014 +0200
+++ b/contrib/buildrpm	Thu May 15 01:48:37 2014 +0200
@@ -8,9 +8,6 @@
 # - centOS 6
 
 cd "`dirname $0`/.."
-HG="$PWD/hg"
-PYTHONPATH="$PWD/mercurial/pure"
-export PYTHONPATH
 
 specfile=contrib/mercurial.spec
 if [ ! -f $specfile ]; then
@@ -31,13 +28,17 @@
     fi
 fi
 
+# build local hg and use it
+python setup.py build_py -c -d .
+HG="$PWD/hg"
+PYTHONPATH="$PWD/mercurial/pure"
+export PYTHONPATH
+
 rpmdir="$PWD/rpmbuild"
 
 rm -rf $rpmdir
 mkdir -p $rpmdir/SOURCES $rpmdir/SPECS $rpmdir/RPMS $rpmdir/SRPMS $rpmdir/BUILD
 
-# make setup.py build the version string
-python setup.py build_py -c -d .
 hgversion=`$HG version | sed -ne 's/.*(version \(.*\))$/\1/p'`
 
 if echo $hgversion | grep -- '-' > /dev/null 2>&1; then