[packages/chromium-browser/dev-27] extract v8 version properly
glen
glen at pld-linux.org
Tue Apr 9 21:12:32 CEST 2013
commit e00e4177f4d09138172afa43266b845d2709772e
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Tue Apr 9 22:09:53 2013 +0300
extract v8 version properly
chromium-browser.spec | 7 ++++---
get-source.sh | 2 +-
2 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/chromium-browser.spec b/chromium-browser.spec
index 887f3a1..07f2e6c 100644
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -252,13 +252,14 @@ mv %{name}-%{branch}.%{basever}/* .
# Google's versioning is interesting. They never reset "BUILD", which is how we jumped
# from 3.0.201.0 to 4.0.202.0 as they moved to a new major branch
. ./chrome/VERSION
-ver=$MAJOR.$MINOR.$BUILD.$PATCH
-test "$ver" = %{version}
+chrome=$MAJOR.$MINOR.$BUILD.$PATCH
+test "$chrome" = %{version}
gyp_rev=$(grep googlecode_url.*gyp DEPS | cut -d'"' -f6 | cut -d@ -f2)
test "$gyp_rev" = %{gyp_rev} || :
-v8_ver=$(awk 'NR=1 {print $NF; exit}' v8/ChangeLog || :)
+. ./v8.sh
+v8=$MAJOR_VERSION.$MINOR_VERSION.$BUILD_NUMBER.$PATCH_LEVEL
# add chromium and pld to useragent
%define pld_version %(echo %{pld_release} | sed -e 'y/[at]/[AT]/')
diff --git a/get-source.sh b/get-source.sh
index e4a3ec3..30b1ce7 100755
--- a/get-source.sh
+++ b/get-source.sh
@@ -59,7 +59,7 @@ set -x
cd $PACKAGE_NAME-$VERSION
du -sh .
- awk 'NR=1 {print $NF; exit}' v8/ChangeLog | tee -a v8.txt
+ awk '/^#define/ && /(MAJOR|MINOR)_VERSION|BUILD_NUMBER|PATCH_LEVEL/ { printf("%s=%s\n", $2, $3) }' v8/src/version.cc | tee -a v8.sh
if [ "$CHANNEL" != "dev" ]; then
sh -x $WORK_DIR/clean-source.sh emptydirs=1 v8=0 libvpx=0 mesa=0 re2=0
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/chromium-browser.git/commitdiff/7531e4f5762c797507a26f16f29997fc48df219f
More information about the pld-cvs-commit
mailing list