On 02/11/2011 19.00, Cyril Hrubis wrote: > Hi! >>>> Fix function 'version_of_ltp' to reference Version in the correct path >>>> Fix Version's path when settign version_date >>>> >>>> Signed-off-by: Carmelo Amoroso <[email protected]> >>>> --- >>>> runltp | 4 ++-- >>>> 1 files changed, 2 insertions(+), 2 deletions(-) >>>> >>>> diff --git a/runltp b/runltp >>>> index 4ef8b38..244cd2f 100755 >>>> --- a/runltp >>>> +++ b/runltp >>>> @@ -97,7 +97,7 @@ setup() >>>> >>>> version_of_ltp() >>>> { >>>> - cat "$LTPROOT/Version" >>>> + cat "$LTPROOT/testcases/bin/Version" >>>> exit 0 >>>> } >>>> >>>> @@ -209,7 +209,7 @@ main() >>>> >>>> local scenfile= >>>> >>>> - version_date=$(cat "$LTPROOT/Version") >>>> + version_date=$(cat "$LTPROOT/testcases/bin/Version") >>>> >>>> while getopts a:c:C:d:D:f:F:ehi:K:g:l:m:M:Nno:pqr:s:S:t:T:w:x:b:B: arg >>>> do case $arg in >>> >>> Right, but there is one more thing to fix. >>> >>> The Version is generated from Changelog, which is abandoned for some >>> time. But we introduced a VERSION file that carries latest version. So >>> the best woul be to drop Changelog completly and use the VERSION file >>> instead, anybody objects to that? >> >> I'd just generate the version like so: >> >> VERSION ?= $(shell echo ltp-nightly-`env LANG=C date +%Y%m%d`) >> >> in the Makefile, or something like that... I just did it based on the >> ChangeLog as it was the defacto source of truth in the LTP 'release >> process' (which fizzled after Subrata couldn't lead that effort >> anymore). > > Now we have the VERSION file, that should defacto carry on that > information for the future. So there is no problem with that, changing > 'head ChangeLog' to 'cat VERSION' should be enough. Maybe it would be > nice to use 'git describe' for builds from git repository too. >
yeah ! git describe is what I'd like. > And we should probably get rid of the ChangeLog and result files, as > they are not maintained anymore, actually if somebody has time to > generate results I would be glad to include them, but I personally don't > have a time to do that. > cheers, carmelo ------------------------------------------------------------------------------ RSA(R) Conference 2012 Save $700 by Nov 18 Register now http://p.sf.net/sfu/rsa-sfdev2dev1 _______________________________________________ Ltp-list mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/ltp-list
