update get-source script to use git

diff --git a/gclient.conf b/gclient.conf
index c318e1eff0fba096032dcaa532137a5824d3e9e3..29506467dc2070262f6c6ba59495d3fd5d23ba42 100644 (file)
--- a/gclient.conf
+++ b/gclient.conf
@@ -1,9 +1,9 @@
 # vim:ft=python
 solutions = [{
        "name"        : "src",
-       "url"         : "http://modpagespeed.googlecode.com/svn/branches/latest-beta/src",
+       "url"         : "https://github.com/pagespeed/mod_pagespeed.git",
        "deps_file"   : "DEPS",
-       "managed"     : True,
+       "managed"     : False,
 
        # deps that can be overriden, are top rooted for names in "deps" in src/DEPS
     "custom_deps" : {
@@ -56,3 +56,4 @@ solutions = [{
        "safesync_url": "",
 },
 ]
+cache_dir = None

diff --git a/get-source.sh b/get-source.sh
index 064638af372610ae8b9427beb084e18f8e940ecd..10822d11334717833209fdce1e820dd67f0749ab 100755 (executable)
--- a/get-source.sh
+++ b/get-source.sh
@@ -5,12 +5,17 @@
 #
 # To see release notes, see this page:
 # https://developers.google.com/speed/docs/mod_pagespeed/release_notes
+# Bulding from source notes:
+# https://developers.google.com/speed/pagespeed/module/build_mod_pagespeed_from_source
 
 package=modpagespeed
-baseurl=http://modpagespeed.googlecode.com/svn
+repo_url=https://github.com/pagespeed/mod_pagespeed.git
 # leave empty to use latest tag, or "trunk" for trunk
-version=
+# specific version, "latest-stable" or "master" (bleeding edge version)
+version=latest-stable
 spec=apache-mod_pagespeed.spec
+# depth to clone, do not use this as ./build/lastchange.sh uses 'git rev-list --all --count' to count revision
+depth=
 force=0
 
 # abort on errors
@@ -28,24 +33,30 @@ if [ "$1" ]; then
        version=$1
 fi
 
-if [ -z "$version" ]; then
-       echo "Looking for latest version..."
-       # exclude 1.9.x beta
-       version=$(svn ls $baseurl/tags/ | grep '^[0-9]' | grep -vE '^1\.9\.' | sort -V | tail -n1)
-       version=${version%/}
-fi
+export GIT_DIR=$package/src/.git
+
+# refs to fetch: master and latest-stable
+refs="refs/heads/master:refs/remotes/origin/master refs/heads/latest-stable:refs/remotes/origin/latest-stable"
 
-if [ "$version" = "trunk" ]; then
-       echo "Using trunk"
-       svnurl=$baseurl/trunk/src
-       version=$(date +%Y%m%d)
+if [ ! -d $GIT_DIR ]; then
+       install -d $GIT_DIR
+#      git init --bare
+       git init
+       git remote add origin $repo_url
+       git fetch ${depth:+--depth $depth} origin $refs
 else
-       echo "Version: $version"
-       svnurl=$baseurl/tags/$version/src
+       git fetch origin $refs
 fi
+unset GIT_DIR
+
+cd $package/src
+git checkout $version
+
+version=$(git describe --tags)
+echo "Version: $version"
 
 release_dir=$package-$version
-tarball=$release_dir.tar.xz
+tarball=$dir/$release_dir.tar.xz
 
 if [ -f $tarball -a $force != 1 ]; then
        echo "Tarball $tarball already exists"
@@ -68,23 +79,21 @@ if [ -z "$gclient" ]; then
                unzip -qq depot_tools.zip
                chmod a+x depot_tools/gclient depot_tools/update_depot_tools
        }
-       gclient=$topdir/depot_tools/gclient
+       gclient=$dir/depot_tools/gclient
 fi
 
-topdir=${PWD:-($pwd)}
-gclientfile=$topdir/gclient.conf
-install -d $package
-cd $package
+gclientfile=$dir/gclient.conf
+cd $dir/$package
 
 if [ ! -f $gclientfile ]; then
        # create initial config that can be later modified
-       $gclient config $svnurl --gclientfile=$gclientfile
+       $gclient config $repo_url --gclientfile=$gclientfile --unmanaged --name=src
 fi
 
 cp -p $gclientfile .gclient
 
 # emulate gclient config, preserving our deps
-sed -i -re '/"url"/ s,"http[^"]+","'$svnurl'",' .gclient
+sed -i -re '/"url"/ s,"http[^"]+","'$repo_url'",' .gclient
 
 $gclient sync --nohooks -v