update clean source rules

[packages/chromium-browser.git] / get-source.sh

diff --git a/get-source.sh b/get-source.sh
index 8290a2169495bf7ecaed31eefbb7a88bfeead7b7..a48ee57ec58627e0cd941ae3e7eab1f8956be1e5 100755 (executable)
--- a/get-source.sh
+++ b/get-source.sh
@@ -9,13 +9,14 @@ PACKAGE_NAME=chromium-browser
 PROGRAM=${0##*/}
 WORK_DIR=$(cd "$(dirname "$0")"; pwd)
 LOCKFILE=$WORK_DIR/$PACKAGE_NAME-$CHANNEL.lock
+# Browse URL: http://gsdview.appspot.com/chromium-browser-official/
 OFFICIAL_URL=http://commondatastorage.googleapis.com/chromium-browser-official
 DIST_DIR=$HOME/public_html/chromium-browser/src/$CHANNEL
 
 # skip package build if interactive
 tty -s && build_package=0
 
-VERSION=$(wget -qO - "$CHANNELS_URL?os=linux&channel=$CHANNEL" | awk -F, 'NR > 1{print $3}')
+VERSION=${2:-$(wget -qO - "$CHANNELS_URL?os=linux&channel=$CHANNEL" | awk -F, 'NR > 1{print $3}')}
 if [ -z "$VERSION" ]; then
        echo >&2 "Can't figure out version for $CHANNEL"
        exit 1
@@ -62,7 +63,9 @@ set -x
        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 mesa=0 sqlite=0
+               patch -p1 < $WORK_DIR/remove_bundled_libraries-stale.patch
+               sh -x $WORK_DIR/clean-source.sh emptydirs=1 v8=0 mesa=0 sqlite=0 ffmpeg=0
+               patch -p1 -R < $WORK_DIR/remove_bundled_libraries-stale.patch
        fi
 
        # do not keep REMOVED*.txt in tarball. they are visible in .log anyway
@@ -100,6 +103,7 @@ set -x
                current=$DIST_DIR/$PACKAGE_NAME-$VERSION.tar.$EXT
                if [ "$(basename $base)" != "$(basename $current)" ]; then
                        sh -x $WORK_DIR/make-diff-patch.sh $base $current
+                       chmod 644 $PACKAGE_NAME-$VERSION.patch.xz
                        mv $PACKAGE_NAME-$VERSION.patch.xz $DIST_DIR
                        # for beta and dev channels, update the diff pointer
                        if [ "$CHANNEL" != "stable" ]; then