Add submodules for our DEPS (#1423)

Replace gclient deps management with git submodules. Does not remove gclient entirely (yet).
2016-10-28 16:47:22 -04:00
parent 654230d558
commit c6ff02ea03
42 changed files with 156 additions and 239 deletions
@@ -9,38 +9,3 @@ hooks.timestamp
 build/gyp_helper.pyc
 build/landmine_utils.pyc
 out/
-third_party/apr/src/
-third_party/aprutil/src/
-third_party/boringssl/
-third_party/brotli/src/
-third_party/chromium/src/base/
-third_party/chromium/src/build/
-third_party/chromium/src/net/base/
-third_party/chromium/src/googleurl/
-third_party/chromium_deps/
-third_party/closure_library/
-third_party/domain_registry_provider/
-third_party/gflags/arch/
-third_party/gflags/src/
-third_party/giflib/
-third_party/google-sparsehash/src/
-third_party/grpc/src/
-third_party/hiredis/src/
-third_party/httpd/src/
-third_party/httpd24/src/
-third_party/icu/
-third_party/jsoncpp/src/
-third_party/libjpeg_turbo/src/
-third_party/libjpeg_turbo/yasm/source/patched-yasm/
-third_party/libpng/src/
-third_party/libwebp/
-third_party/mod_spdy/
-third_party/modp_b64/
-third_party/optipng/
-third_party/protobuf/src/
-third_party/re2/src/
-third_party/serf/src/
-third_party/zlib/
-testing/gmock/
-testing/gtest/
-tools/
@@ -0,0 +1,106 @@
+# The two httpds are the longest syncs, so we'd like to start them first.
+[submodule "third_party/httpd/src"]
+	path = third_party/httpd/src
+	url = git://git.apache.org/httpd.git
+[submodule "third_party/httpd24/src"]
+	path = third_party/httpd24/src
+	url = git://git.apache.org/httpd.git
+[submodule "third_party/brotli/src"]
+	path = third_party/brotli/src
+	url = https://github.com/google/brotli.git
+[submodule "third_party/giflib"]
+	path = third_party/giflib
+	url = https://github.com/pagespeed/giflib.git
+[submodule "third_party/closure_library"]
+	path = third_party/closure_library
+	url = https://github.com/google/closure-library.git
+[submodule "third_party/aprutil/src"]
+	path = third_party/aprutil/src
+	url = git://git.apache.org/apr-util.git
+[submodule "third_party/re2/src"]
+	path = third_party/re2/src
+	url = https://github.com/google/re2.git
+[submodule "third_party/icu"]
+	path = third_party/icu
+	url = https://github.com/pagespeed/icu.git
+[submodule "third_party/libjpeg_turbo/src"]
+	path = third_party/libjpeg_turbo/src
+	url = https://chromium.googlesource.com/chromium/deps/libjpeg_turbo
+# For gyp generated makefiles.
+  ignore = untracked
+[submodule "third_party/libjpeg_turbo/yasm/source/patched-yasm"]
+	path = third_party/libjpeg_turbo/yasm/source/patched-yasm
+	url = https://chromium.googlesource.com/chromium/deps/yasm/patched-yasm
+[submodule "third_party/libpng/src"]
+	path = third_party/libpng/src
+	url = https://github.com/glennrp/libpng.git
+[submodule "third_party/hiredis/src"]
+	path = third_party/hiredis/src
+	url = https://github.com/redis/hiredis.git
+[submodule "third_party/apr/src"]
+	path = third_party/apr/src
+	url = git://git.apache.org/apr.git
+[submodule "third_party/optipng"]
+	path = third_party/optipng
+	url = https://github.com/pagespeed/optipng.git
+[submodule "third_party/libwebp"]
+	path = third_party/libwebp
+	url = https://chromium.googlesource.com/webm/libwebp.git
+[submodule "third_party/serf/src"]
+	path = third_party/serf/src
+	url = https://git.apache.org/serf.git
+[submodule "third_party/grpc/src"]
+	path = third_party/grpc/src
+	url = https://github.com/grpc/grpc.git
+[submodule "third_party/protobuf/src"]
+	path = third_party/protobuf/src
+	url = https://github.com/google/protobuf.git
+[submodule "third_party/modp_b64"]
+	path = third_party/modp_b64
+	url = https://chromium.googlesource.com/chromium/src/third_party/modp_b64
+# For gyp generated makefiles.
+  ignore = untracked
+[submodule "third_party/boringssl/src"]
+	path = third_party/boringssl/src
+	url = https://boringssl.googlesource.com/boringssl.git
+[submodule "third_party/zlib"]
+	path = third_party/zlib
+	url = https://github.com/pagespeed/zlib.git
+[submodule "third_party/chromium/src/base"]
+	path = third_party/chromium/src/base
+	url = https://chromium.googlesource.com/chromium/src/base
+# For gyp generated makefiles.
+  ignore = untracked
+[submodule "third_party/chromium/src/build"]
+	path = third_party/chromium/src/build
+	url = https://chromium.googlesource.com/chromium/src/build
+[submodule "third_party/chromium/src/googleurl"]
+	path = third_party/chromium/src/googleurl
+	url = https://chromium.googlesource.com/external/google-url
+[submodule "third_party/google-sparsehash/src"]
+	path = third_party/google-sparsehash/src
+	url = https://github.com/google/sparsehash.git
+[submodule "third_party/domain_registry_provider"]
+	path = third_party/domain_registry_provider
+	url = https://github.com/pagespeed/domain-registry-provider.git
+[submodule "third_party/jsoncpp/src"]
+	path = third_party/jsoncpp/src
+	url = https://github.com/open-source-parsers/jsoncpp.git
+[submodule "third_party/gflags/arch"]
+	path = third_party/gflags/arch
+	url = https://chromium.googlesource.com/external/webrtc/trunk/third_party/gflags
+[submodule "third_party/gflags/src"]
+	path = third_party/gflags/src
+	url = https://chromium.googlesource.com/external/gflags/src
+[submodule "testing/gtest"]
+	path = testing/gtest
+	url = https://github.com/google/googletest.git
+[submodule "testing/gmock"]
+	path = testing/gmock
+	url = https://github.com/google/googlemock.git
+[submodule "tools/clang"]
+	path = tools/clang
+	url = https://chromium.googlesource.com/chromium/src/tools/clang
+[submodule "tools/gyp"]
+	path = tools/gyp
+	url = https://chromium.googlesource.com/external/gyp
@@ -13,213 +13,12 @@
 # limitations under the License.

 vars = {
-  # chromium.org and googlecode.com will redirect https URLs for directories
-  # that don't end with a trailing slash to http. We therefore try to make sure
-  # all https URLs include the trailing slash, but it's unclear if SVN actually
-  # respects this.
-  "chromium_git": "https://chromium.googlesource.com",
  # We don't include @ inside the revision here as is customary since
  # we want to pass this into a -D flag
  "chromium_revision_num": "256281",
-
-  "optipng_src": "https://github.com/pagespeed/optipng.git",
-  "optipng_revision": "d48f8e496e59ba6a9f90fecdd8f6f80685abb324",
-
-  "giflib_src": "https://github.com/pagespeed/giflib.git",
-  "giflib_revision": "cbbe2391f92b3fbee6c68216a1a99cbd32596e61",
-
-  "icu_src": "https://github.com/pagespeed/icu.git",
-  "icu_revision": "e8c51b17d1467b8a1927baf2215702c3a7682cc8",
-
-  # TODO(cheesy): There's a perfectly fine zlib repo at
-  # https://github.com/madler/zlib.git. We should copy the gyp file into our
-  # repo and then switch to it. After that, we should delete the zlib
-  # repo from pagespeed.
-  "zlib_src": "https://github.com/pagespeed/zlib.git",
-  "zlib_revision": "877ddb5c3793ff6f61e45d5f51a2399a7d4098ca",
-
-  # Import libwebp 0.5.1 from the official repo.
-  "libwebp_src": "https://chromium.googlesource.com/webm/libwebp.git",
-  "libwebp_revision": "@v0.5.1",
-
-  "serf_src": "https://git.apache.org/serf.git",
-  "serf_revision": "@1.3.8",
-
-  "apr_src": "git://git.apache.org/apr.git",
-  "apr_revision": "@1.5.1",
-
-  "aprutil_src": "git://git.apache.org/apr-util.git",
-  "aprutil_revision": "@1.5.4",
-
-  "apache_httpd_src":
-    "git://git.apache.org/httpd.git",
-  "apache_httpd_revision": "@2.2.29",
-
-  "apache_httpd24_src":
-    "git://git.apache.org/httpd.git",
-  "apache_httpd24_revision": "@2.4.10",
-
-  # If the closure library version is updated, the closure compiler version
-  # listed in third_party/closure/download.sh should be updated as well.
-  "closure_library": "https://github.com/google/closure-library.git",
-  "closure_library_revision": "@v20160713",
-
-  "jsoncpp_src": "https://github.com/open-source-parsers/jsoncpp.git",
-  "jsoncpp_revision": "@7165f6ac4c482e68475c9e1dac086f9e12fff0d0",
-
-  "gflags_src_revision": "@e7390f9185c75f8d902c05ed7d20bb94eb914d0c",
-  "gflags_revision": "@cc7e9a4b374ff7b6a1cae4d76161113ea985b624",
-
-  "google_sparsehash_root":
-    "https://github.com/google/sparsehash.git",
-  "google_sparsehash_revision": "@6ff8809259d2408cb48ae4fa694e80b15b151af3",
-
-  "gtest_src": "https://github.com/google/googletest.git",
-  "gtest_revision": "@c99458533a9b4c743ed51537e25989ea55944908",
-
-  "gmock_src": "https://github.com/google/googlemock.git",
-  "gmock_revision": "@c440c8fafc6f60301197720617ce64028e09c79d",
-
-  # Comment this out to disable HTTPS fetching via serf.  See also the
-  # references in src/third_party/serf/serf.gyp.
-  #
-  # TODO(jmarantz): create an easy way to choose this option from the
-  # 'gclient' command, without having to edit the gyp & DEPS files.
-  # On releases, change this tag from chromium-stable, to the tag of the pinned
-  # chromium release at the time of release, eg) "@52.0.2743.116"
-  "boringssl_src": "https://boringssl.googlesource.com/boringssl.git",
-  "boringssl_git_revision": "@chromium-stable",
-
-  "domain_registry_provider_src":
-     "https://github.com/pagespeed/domain-registry-provider.git",
-  "domain_registry_provider_revision":
-     "@e9b72eaef413335eb054a5982277cb2e42eaead7",
-
-  "libpng_src": "https://github.com/glennrp/libpng.git",
-  "libpng_revision": "@a36c4f3f165fb2dd1772603da7f996eb40326621",
-
-  # Brotli v0.5.0-snapshot
-  "brotli_src": "https://github.com/google/brotli.git",
-  "brotli_revision": "@882f41850b679c1ff4a3804d5515d142a5807376",
-
-  "proto_src": "https://github.com/google/protobuf.git",
-  "protobuf_revision": "v3.0.0",
-
-  ## grpc uses nanopb as a git submodule, which gclient doesn't support.
-  ## When updating grpc, you should check the nanopb submodule version
-  ## specified by your tag, by looking for it under:
-  ## https://github.com/grpc/grpc/tree/<TAG>/third_party
-  "grpc_src": "https://github.com/grpc/grpc.git",
-  "grpc_revision": "v1.0.0",
-  "nanopb_src": "https://github.com/nanopb/nanopb.git",
-  "nanopb_revision": "f8ac463766281625ad710900479130c7fcb4d63b",
-
-  # When updating Hiredis please ensure that freeReplyObject() is still
-  # thread-safe, RedisCache relies on that (see comments in redis_cache.cc).
-  # Updates on that matter will probably be tracked here:
-  # https://github.com/redis/hiredis/issues/465.
-  "hiredis_src": "https://github.com/redis/hiredis.git",
-  "hiredis_revision": "v0.13.3",
-}
-
-deps = {
-  "third_party/giflib": Var("giflib_src") + "@" + Var("giflib_revision"),
-  "third_party/icu": Var("icu_src") + "@" + Var("icu_revision"),
-  "third_party/optipng": Var("optipng_src") + "@" + Var("optipng_revision"),
-  "third_party/zlib": Var("zlib_src") + "@" + Var("zlib_revision"),
-
-  "third_party/libjpeg_turbo/yasm/source/patched-yasm":
-    Var("chromium_git") + "/chromium/deps/yasm/patched-yasm@7da28c6c7c6a1387217352ce02b31754deb54d2a",
-  "third_party/libjpeg_turbo/src":
-    Var("chromium_git") + "/chromium/deps/libjpeg_turbo/@7260e4d8b8e1e40b17f03fafdf1cd83296900f76",
-
-  "testing/gtest": Var("gtest_src") + Var("gtest_revision"),
-  "testing/gmock": Var("gmock_src") + Var("gmock_revision"),
-
-  "third_party/apr/src":
-    Var("apr_src") + Var("apr_revision"),
-
-  "third_party/aprutil/src":
-    Var("aprutil_src") + Var("aprutil_revision"),
-
-  "third_party/httpd/src":
-    Var("apache_httpd_src") + Var("apache_httpd_revision"),
-
-  "third_party/httpd24/src":
-    Var("apache_httpd24_src") + Var("apache_httpd24_revision"),
-
-  "third_party/chromium/src/base":
-    Var("chromium_git") + "/chromium/src/base@ccf3c2f324c4ae0d1aa878921b7c98f7deca5ee8",
-
-  "third_party/chromium/src/build":
-    Var("chromium_git") + "/chromium/src/build/@06b7bd9c7a8adb3708db8df4dc058de94f0d5554",
-
-  # This revision is before headers got moved to main chromium repo.
-  "third_party/chromium/src/googleurl":
-    Var("chromium_git") + "/external/google-url@405b6e1798f88e85291820b30344723512e0c38f",
-
-  "third_party/closure_library":
-    Var("closure_library") + Var("closure_library_revision"),
-
-  "third_party/gflags/arch":
-    Var('chromium_git') + '/external/webrtc/trunk/third_party/gflags' +
-    Var('gflags_revision'),
-  "third_party/gflags/src":
-    Var('chromium_git') + '/external/gflags/src' + Var("gflags_src_revision"),
-
-  "third_party/google-sparsehash/src":
-    Var("google_sparsehash_root") + Var("google_sparsehash_revision"),
-
-  "third_party/protobuf/src":
-    Var("proto_src") + '@' + Var("protobuf_revision"),
-
-  # Json cpp.
-  "third_party/jsoncpp/src":
-    Var("jsoncpp_src") + Var("jsoncpp_revision"),
-
-  # Serf
-  "third_party/serf/src": Var("serf_src") + Var("serf_revision"),
-
-  "third_party/libwebp": Var("libwebp_src") + Var("libwebp_revision"),
-
-  "tools/clang":
-    Var("chromium_git") + "/chromium/src/tools/clang/@bf272f7b05896b9a18de8497383f8b873a86cfbc",
-
-  # This is the same commit as the version from svn included from chromium_deps,
-  # but the svn is down, so we take it from chromium-git.
-  "tools/gyp":
-    Var("chromium_git") + "/external/gyp@" + "0fb31294ae844bbf83eba05876b7a241b66f1e99",
-
-  "third_party/modp_b64":
-    Var("chromium_git") + "/chromium/src/third_party/modp_b64/@aae60754fa997799e8037f5e8ca1f56d58df763d",
-
-  # RE2.
-  "third_party/re2/src":
-    "https://github.com/google/re2.git/@78dd4fa1f86bafbf5a5eb006778d9e6e27297af6",
-
-  # Comment to disable HTTPS fetching via serf.  See also the
-  # references in src/third_party/serf/serf.gyp.
-  "third_party/boringssl/src":
-    Var("boringssl_src") + Var("boringssl_git_revision"),
-
-  # Domain Registry Provider gives us the Public Suffix List.
-  "third_party/domain_registry_provider":
-    Var("domain_registry_provider_src") +
-        Var("domain_registry_provider_revision"),
-
-  "third_party/libpng/src": Var("libpng_src") + Var("libpng_revision"),
-
-  "third_party/brotli/src": Var("brotli_src") + Var("brotli_revision"),
-
-  "third_party/grpc/src": Var("grpc_src") + '@' + Var("grpc_revision"),
-
-  "third_party/grpc/src/third_party/nanopb":
-    Var("nanopb_src") + '@' + Var("nanopb_revision"),
-
-  "third_party/hiredis/src":
-    Var("hiredis_src") + '@' + Var("hiredis_revision"),
 }

+deps = { }

 include_rules = [
  # Everybody can use some things.
@@ -88,6 +88,7 @@ git clone https://github.com/pagespeed/mod_pagespeed.git src
 cd src
 gclient config https://github.com/pagespeed/mod_pagespeed.git --unmanaged --name=$PWD
 git checkout $VERSION
+git submodule update --init --recursive
 gclient sync --force --jobs=1

 build_dir="$PWD"
@@ -226,6 +226,8 @@ fi
 cd $build_dir/src
 check gclient.log \
    gclient config https://github.com/pagespeed/mod_pagespeed.git --unmanaged --name=$PWD
+check gclient.log gclient sync --nohooks
+check gclient.log git submodule update --init --recursive
 check gclient.log gclient sync --force

 # Neither buildbot is using a compiler recent enough to provide stdalign.h,
@@ -0,0 +1,5 @@
+We currently pull zlib from a pagespeed git mirror, however there's a there's
+a perfectly fine zlib repo at https://github.com/madler/zlib.git.
+We should copy the gyp file out of the zlib repo and into the mod_pagespeed
+one, after which we can switch to the official zlib repo and delete
+https://github.com/pagespeed/zlib.
@@ -0,0 +1,2 @@
+If the closure library is updated (third_party/closure_library), the closure
+compiler version listed in third_party/closure/download.sh must also be updated.
@@ -26,8 +26,8 @@ fi

 DIR="$1"

-# If the version of the compiler is updated, the closure library verison in DEPS
-# should be updated as well.
+# If the version of the compiler is updated, the closure library submodule in
+# third_party/closure_library must also be updated.
 VERSION=20160713
 ZIP=compiler-$VERSION.zip
 JAR_IN=$DIR/closure-compiler-v$VERSION.jar
@@ -0,0 +1,4 @@
+When updating Hiredis please, ensure that freeReplyObject() is still
+thread-safe; RedisCache relies on that.
+Updates on that matter will probably be tracked here:
+https://github.com/redis/hiredis/issues/465.