X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=get-source.sh;h=89f2f6c86e0d46bf1bec95bd60ed84568ed1d64e;hb=2b086f742aabc664332b8b958249871610388bde;hp=2a2c041276a6f725497f9b80954ea407c076b111;hpb=f20db39729359b92e0fa37d12eedec6c80c2e711;p=packages%2Fchromium-browser.git

diff --git a/get-source.sh b/get-source.sh
index 2a2c041..89f2f6c 100755
--- a/get-source.sh
+++ b/get-source.sh
@@ -4,21 +4,26 @@ set -e
 # CHANNEL: any from CHANNELS_URL: stable, beta, dev
 CHANNEL=${1:-beta}
 
-CHANNELS_URL=http://omahaproxy.appspot.com/all
+CHANNELS_URL=https://omahaproxy.appspot.com/all
 PACKAGE_NAME=chromium-browser
-WORK_DIR=$(cd $(dirname "$0"); pwd)
-CHROMIUM=$HOME/svn/$PACKAGE_NAME-$CHANNEL
+PROGRAM=${0##*/}
+WORK_DIR=$(cd "$(dirname "$0")"; pwd)
 LOCKFILE=$WORK_DIR/$PACKAGE_NAME-$CHANNEL.lock
-OFFICIAL_URL=http://commondatastorage.googleapis.com/chromium-browser-official
+# Browse URL: https://gsdview.appspot.com/chromium-browser-official/
+OFFICIAL_URL=https://commondatastorage.googleapis.com/chromium-browser-official
+ALT_URL=https://github.com/zcbenz/chromium-source-tarball/releases/download
 DIST_DIR=$HOME/public_html/chromium-browser/src/$CHANNEL
 
-VERSION=$(wget -qO - "$CHANNELS_URL?os=linux&channel=$CHANNEL" | awk -F, 'NR > 1{print $3}')
+# skip package build if interactive
+tty -s && build_package=0
+
+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
 fi
 
-# don't use .xz for beta channels, annooying if unpacks that slowly
+# don't use .xz for beta channels, annoying if unpacks that slowly
 if [ "$CHANNEL" = "stable" ]; then
 	EXT=xz
 else
@@ -33,72 +38,94 @@ fi
 
 set -x
 
-# consider lockfile stale after 3h
-if ! lockfile -l 10800 $LOCKFILE; then
-	exit 1
-fi
+(
+	flock -n 9 || { echo "$PROGRAM: locked"; exit 1; }
 
-trap "rm -f $LOCKFILE" EXIT
+	TMP_DIR=$(mktemp -d $WORK_DIR/$PACKAGE_NAME-$CHANNEL-$VERSION-_XXXXXX)
+	LOGFILE=$TMP_DIR/$PACKAGE_NAME-$VERSION.log
 
-TMP_DIR=$(mktemp -d $WORK_DIR/$PACKAGE_NAME-$CHANNEL-$VERSION-_XXXXXX)
-LOGFILE=$TMP_DIR/$PACKAGE_NAME-$VERSION.log
+	(
+	cd "$TMP_DIR"
+	srctarball=$PACKAGE_NAME-$VERSION.tar.xz
 
-(
-cd "$TMP_DIR"
-srctarball=$PACKAGE_NAME-$VERSION.tar.bz2
-wget -c -O $srctarball "$OFFICIAL_URL/chromium-$VERSION.tar.bz2"
+	wget -nc -nv -O $srctarball "$OFFICIAL_URL/chromium-$VERSION.tar.xz" || :
+	test -s $srctarball || rm $srctarball
 
-# repackage cleaned up tarball
-test -d $PACKAGE_NAME-$VERSION || {
-	tar xjf $srctarball
-	install -d $PACKAGE_NAME-$VERSION
-	# relocate to src dir (needed  to workaround some gyp bug)
-	mv chromium-$VERSION $PACKAGE_NAME-$VERSION/src
-}
+	wget -nc -nv -O $srctarball "$ALT_URL/$VERSION/chromium-$VERSION.tar.xz" || :
+	test -s $srctarball || rm $srctarball
 
-ls -lh $srctarball
-rm $srctarball
+	test -f $srctarball
 
-cd $PACKAGE_NAME-$VERSION/src
-du -sh .
+	# repackage cleaned up tarball
+	test -d $PACKAGE_NAME-$VERSION || {
+		tar xvf $srctarball
+		mv chromium-$VERSION $PACKAGE_NAME-$VERSION
+	}
 
-awk 'NR=1 {print $NF; exit}' v8/ChangeLog | tee -a v8.txt
+	ls -lh $srctarball
+	rm $srctarball
 
-# keep v8 in sources if branch is not stable
-if [ "$CHANNEL" = "stable" ]; then
-	v8=0
-else
-	v8=0
-fi
+	cd $PACKAGE_NAME-$VERSION
+	du -sh .
 
-sh -x $WORK_DIR/clean-source.sh v8=$v8 libxml=0 zlib=0
-du -sh .
+	awk '/^#define/ && /(MAJOR|MINOR)_VERSION|BUILD_NUMBER|PATCH_LEVEL/ { printf("%s=%s\n", $2, $3) }' v8/src/version.cc | tee -a v8.sh
 
-# add LASTCHANGE info, take "branch_revision" item
-svnver=$(wget -qO - "$CHANNELS_URL?os=linux&channel=$CHANNEL" | awk -F, 'NR > 1{print $8}')
-echo "$svnver" > build/LASTCHANGE.in
+	if [ "$CHANNEL" = "stable" ]; then
+		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 protobuf=0
+		patch -p1 -R < $WORK_DIR/remove_bundled_libraries-stale.patch
+	fi
 
-cd ../..
+	# do not keep REMOVED*.txt in tarball. they are visible in .log anyway
+	rm -vf REMOVED-*.txt
 
-tarball=$PACKAGE_NAME-$VERSION.tar.$EXT
-XZ_OPT=-9 tar -cf $tarball --$EXT $PACKAGE_NAME-$VERSION
-ls -lh $tarball
+	du -sh .
 
-rm -rf $PACKAGE_NAME-$VERSION
+	# add LASTCHANGE info, take "branch_revision" item
+	svnver=$(wget -qO - "$CHANNELS_URL?os=linux&channel=$CHANNEL" | awk -F, 'NR > 1{print $8}')
+	echo "$svnver" > build/LASTCHANGE.in
 
-chmod 644 $tarball
-mv $tarball $DIST_DIR
+	cd ..
 
-) > $LOGFILE 2>&1
+	tarball=$PACKAGE_NAME-$VERSION.tar.$EXT
+	# xz -9 OOM's on carme
+	XZ_OPT=-e8 tar -caf $tarball $PACKAGE_NAME-$VERSION
+	ls -lh $tarball
 
-chmod 644 $LOGFILE
-mv $LOGFILE $DIST_DIR
+	rm -rf $PACKAGE_NAME-$VERSION
 
-rm -rf $TMP_DIR
+	chmod 644 $tarball
+	mv $tarball $DIST_DIR
 
-# try updating spec and build it as well
-if [ -x $WORK_DIR/update-source.sh ]; then
-	build_package=1 \
-	publish_packages=1 \
-	sh -x $WORK_DIR/update-source.sh
-fi
+	) > $LOGFILE 2>&1
+
+	chmod 644 $LOGFILE
+	mv $LOGFILE $DIST_DIR
+
+	rm -rf $TMP_DIR
+
+	# create diff patches
+	BASEVER=${VERSION%.*}.0
+	if [ -e $DIST_DIR/$PACKAGE_NAME-$BASEVER.tar.$EXT ]; then
+		base=$(readlink -f $DIST_DIR/$PACKAGE_NAME-$BASEVER.tar.$EXT)
+		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
+				ln -sf $PACKAGE_NAME-$VERSION.tar.$EXT $DIST_DIR/$PACKAGE_NAME-$BASEVER.tar.$EXT
+			fi
+		fi
+	fi
+
+	# try updating spec and build it as well
+	if [ -x $WORK_DIR/update-source.sh ]; then
+		build_package=${build_package-1} \
+		publish_packages=${publish_packages-1} \
+		sh -x $WORK_DIR/update-source.sh
+	fi
+
+	rm $LOCKFILE
+) 9>$LOCKFILE