[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [virt-tools-list] [PATCH-v5.5 4/5] make autobuild.sh work



On 04/11/2013 08:47 AM, Gene Czarcinski wrote:
> On 04/10/2013 05:49 PM, Cole Robinson wrote:
>> On 04/09/2013 03:19 PM, Gene Czarcinski wrote:
>>> There a some problems with autobuild.sh and this patch addresses
>>> them:
>>>
>>> 1. "python setup.py install" needs to use --root= instead
>>> of --prefix=
>>>
>>> 2. For the rpmbuild, use dist/*.tar.gz instead of *.tar.gz
>>>
>>> 3. Add "export AUTOBUILD_OVERRIDE_VERSION=y" so that if
>>> the version-id changes are applied, a simpler version-id
>>> is used for autobuild.
>>>
>>> 4. Assume tests are fixed and enable running
>>> "python setup.py test"
>>> .
>>> Signed-off-by: Gene Czarcinski <gene czarc net>
>>> ---
>>>   autobuild.sh | 12 +++++++++---
>>>   1 file changed, 9 insertions(+), 3 deletions(-)
>>>
>>> diff --git a/autobuild.sh b/autobuild.sh
>>> index baa9482..c17521d 100755
>>> --- a/autobuild.sh
>>> +++ b/autobuild.sh
>>> @@ -9,10 +9,16 @@ if [ -z "$AUTOBUILD_INSTALL_ROOT" ] ; then
>>>       exit 1
>>>   fi
>>>   +rm -rf MANIFEST dist/*
>>> +
>>> +# support version-id changes
>>> +export AUTOBUILD_OVERRIDE_VERSION=y
>>> +
>>> +python setup.py sdist
>>> +
>>>   python setup.py build
>>>   python setup.py test
>>> -python setup.py install --prefix=$AUTOBUILD_INSTALL_ROOT
>>> -python setup.py sdist
>>> +python setup.py install --root=$AUTOBUILD_INSTALL_ROOT
>>>     which /usr/bin/rpmbuild > /dev/null 2>&1 || exit 0
>>>   @@ -22,5 +28,5 @@ else
>>>       NOW=`date +"%s"`
>>>       EXTRA_RELEASE=".$USER$NOW"
>>>   fi
>>> -rpmbuild --nodeps --define "extra_release $EXTRA_RELEASE" -ta --clean
>>> *.tar.gz
>>> +rpmbuild --nodeps --define "extra_release $EXTRA_RELEASE" -ta --clean
>>> dist/*.tar.gz
>>>  
>> Thanks, pushed now.
> Not sure this will work properly without the kudgy wrapper solution.
> 

It should AFAICT: install isn't being passed a non-default --prefix, so it
should 'just work'.

- Cole


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]