2015-10-31 13:48 GMT+03:00 <rj...@apache.org>: > Author: rjung > Date: Sat Oct 31 10:48:35 2015 > New Revision: 1711591 > > URL: http://svn.apache.org/viewvc?rev=1711591&view=rev > Log: > buildconf updates: > - don't use "test" when not needed > - indent "case" > - add some checks for contents needed in apr > source directory > - add success check for gen-build.py > - rewrite autoconf success check using same > style > - replace use of "cut" with "sed", which is > already used in other places > - remove unneeded subshell "()" construct > - add console output for final version and > release number used in spec file > > Modified: > tomcat/native/trunk/native/buildconf >
> +echo rebuilding rpm spec file > +REVISION=`build/get-version.sh all include/tcn_version.h TCN` > +# Strip everything behind "-" > +VERSION=`echo $REVISION | sed -e 's/-.*//'` > +# Strip everything before "-" > +RELEASE=`echo $REVISION | sed -e 's/.*-//'` > +# Handle case of no "-" in REVISION > +if [ "x$RELEASE" = "xREVISION" ]; then I think the above was intended to be = "x$REVISION", that is that sed made no replacements. The same in 1.1.x copy of this file. > + RELEASE=1 > fi > - > +echo "Using version '$VERSION' and release '$RELEASE' in RPM spec file" > +sed -e "s/TCN_VERSION/$VERSION/" \ > + -e "s/TCN_RELEASE/$RELEASE/" \ > + ./build/rpm/tcnative.spec.in \ > + > tcnative.spec Best regards, Konstantin Kolinko --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
