Skip to content
This repository has been archived by the owner on Apr 21, 2023. It is now read-only.

Commit

Permalink
Create tag 1.7.30.5
Browse files Browse the repository at this point in the history
  • Loading branch information
@morlovich
morlovich committed Jun 17, 2014
1 parent 669fddd commit 5b4063b
Show file tree
Hide file tree
Showing 754 changed files with 13,769 additions and 79,402 deletions.
215 changes: 122 additions & 93 deletions src/DEPS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,123 +13,123 @@
# 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_trunk": "https://src.chromium.org/svn/trunk/",
# Note that the chromium_revision should be kept in sync with the
# one in libpagespeed's DEPS file. Allowing them to drift out of
# sync means that we will end up linking different versions of code
# that may be incompatible with each other, which can lead to bugs.
"chromium_trunk": "http://src.chromium.org/svn/trunk",
# 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",
"chromium_revision_num": "161115",
"chromium_deps_root": "src/third_party/chromium_deps",

"libpagespeed_svn_root": "https://page-speed.googlecode.com/svn/",
"libpagespeed_trunk": "https://page-speed.googlecode.com/svn/lib/trunk/",
# Version of libwebp and android we use. This should normally match the
# chromium base, but sometimes it's easier to update it separately.
"chromium_webp_android_revision": "@200538",

"libpagespeed_svn_root": "http://page-speed.googlecode.com/svn",
"libpagespeed_trunk": "http://page-speed.googlecode.com/svn/lib/trunk",
"libpagespeed_revision": "@2439",
"libpagespeed_deps_root": "src/third_party/libpagespeed_deps",

"modspdy_src": "https://mod-spdy.googlecode.com/svn/trunk/src/",
"modspdy_src": "http://mod-spdy.googlecode.com/svn/trunk/src",
"modspdy_revision": "@387",

"serf_src": "https://serf.googlecode.com/svn/tags/1.1.0/",
"serf_src": "http://serf.googlecode.com/svn/tags/1.1.0",
"serf_revision": "@head",

"apr_src": "https://svn.apache.org/repos/asf/apr/apr/tags/1.4.2/",
"apr_src": "http://svn.apache.org/repos/asf/apr/apr/tags/1.4.2",
"apr_revision": "@head",

"aprutil_src": "https://svn.apache.org/repos/asf/apr/apr-util/tags/1.3.9/",
"aprutil_src": "http://svn.apache.org/repos/asf/apr/apr-util/tags/1.3.9",
"aprutil_revision": "@head",

"apache_httpd_src":
"https://svn.apache.org/repos/asf/httpd/httpd/tags/2.2.15/",
"apache_httpd_src": "http://svn.apache.org/repos/asf/httpd/httpd/tags/2.2.15",
"apache_httpd_revision": "@head",

# TODO(morlovich) We can't actually run with 2.4.1; but 2.4.2 isn't tagged yet
# TOD(morlovich) We can't actually run with 2.4.1; but 2.4.2 isn't tagged yet
# and the headers are certainly good enough.
"apache_httpd24_src":
"https://svn.apache.org/repos/asf/httpd/httpd/tags/2.4.1/",
"http://svn.apache.org/repos/asf/httpd/httpd/tags/2.4.1",
"apache_httpd24_revision": "@head",

"jsoncpp_src": "https://svn.code.sf.net/p/jsoncpp/code/trunk/",
"jsoncpp_src": "https://svn.code.sf.net/p/jsoncpp/code/trunk",
"jsoncpp_revision": "@247",

"gflags_root":
"https://gflags.googlecode.com/svn/tags/gflags-1.5/src/",
"gflags_root": "http://google-gflags.googlecode.com/svn/tags/gflags-1.5/src",
"gflags_revision": "@head",

"google_sparsehash_root":
"https://sparsehash.googlecode.com/svn/tags/sparsehash-1.8.1/src/",
"google_sparsehash_root": "http://google-sparsehash.googlecode.com/svn/tags/sparsehash-1.8.1/src",
"google_sparsehash_revision": "@head",

"re2_src": "http://re2-svn.googlecode.com/svn/trunk/",
"re2_revision": "@2",

# 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.
#
# The revision we are picking here is to a specific commit found on
# https://git.chromium.org/gitweb/?p=chromium/deps/openssl.git;a=summary :
# 2014-06-09 [email protected] Pull in more changes from OpenSSL 1.0.1h.
# http://git.chromium.org/gitweb/?p=chromium/deps/openssl.git;a=summary :
# 2014-06-05 [email protected] OpenSSL: fix copy of ssl3.h
# This point includes all CVE fixes in 1.0.1h, including the CCS fix.
"openssl_src": "https://git.chromium.org/chromium/deps/openssl.git",
"openssl_revision": "@063a4b93646788bd883fc0cb1b5eafc991ddacc4",

"domain_registry_provider_src":
"https://domain-registry-provider.googlecode.com/svn/trunk/",
"domain_registry_provider_revision": "@31",
"openssl_src": "http://git.chromium.org/chromium/deps/openssl.git",
"openssl_revision": "@91df33371f74906f255df571daa236be67565c4f",
}

deps = {

# Fetch dependent DEPS so we can sync our other dependencies relative
# to them.
Var("chromium_deps_root"):
File(Var("chromium_trunk") + "src/DEPS@" + Var("chromium_revision_num")),
File(Var("chromium_trunk") + "/src/DEPS@" + Var("chromium_revision_num")),

Var("libpagespeed_deps_root"):
File(Var("libpagespeed_trunk") + "/src/DEPS" +
Var("libpagespeed_revision")),

# Other dependencies.
"src/base":
Var("libpagespeed_trunk") + "/src/base" + Var("libpagespeed_revision"),

"src/build/temp_gyp":
Var("libpagespeed_trunk") + "src/build/temp_gyp/" +
Var("libpagespeed_revision"),
Var("libpagespeed_trunk") + "/src/build/temp_gyp" +
Var("libpagespeed_revision"),

# We check 'build/android' out of Chromium repo to get
# 'android/cpufeatures.gypi', which is needed to compile libwebp.
"src/build/android":
Var("chromium_trunk") + "src/build/android/@" +
Var("chromium_revision_num"),
"src/build/ios":
Var("chromium_trunk") + "src/build/ios/@" + Var("chromium_revision_num"),
"src/build/internal":
Var("chromium_trunk") + "src/build/internal/@" +
Var("chromium_revision_num"),
"src/build/linux":
Var("chromium_trunk") + "src/build/linux/@" + Var("chromium_revision_num"),
"src/build/mac":
Var("chromium_trunk") + "src/build/mac/@" + Var("chromium_revision_num"),
"src/build/win":
Var("chromium_trunk") + "src/build/win/@" + Var("chromium_revision_num"),
"src/build/ios": From(Var("libpagespeed_deps_root")),
"src/build/internal": From(Var("libpagespeed_deps_root")),
"src/build/linux": From(Var("libpagespeed_deps_root")),
"src/build/mac": From(Var("libpagespeed_deps_root")),
"src/build/win": From(Var("libpagespeed_deps_root")),

# TODO(huibao): Remove references to libpagespeed.
"src/third_party/giflib":
Var("libpagespeed_svn_root") + "deps/giflib-4.1.6/",
"src/third_party/icu": Var("libpagespeed_svn_root") + "deps/icu461/",
"src/third_party/optipng":
Var("libpagespeed_svn_root") + "deps/optipng-0.7.4/",
"src/third_party/zlib": Var("libpagespeed_svn_root") + "deps/zlib-1.2.5/",
"src/third_party/giflib": Var("libpagespeed_svn_root") + "/deps/giflib-4.1.6",
"src/third_party/icu": Var("libpagespeed_svn_root") + "/deps/icu461",
"src/third_party/optipng": Var("libpagespeed_svn_root") + "/deps/optipng-0.7.4",
"src/third_party/zlib": Var("libpagespeed_svn_root") + "/deps/zlib-1.2.5",

# Yasm assember is required for libjpeg_turbo.
"src/third_party/libjpeg_turbo/yasm":
Var("chromium_trunk") + "src/third_party/yasm/@" +
Var("chromium_trunk") + "/src/third_party/yasm@" +
Var("chromium_revision_num"),

"src/third_party/libjpeg_turbo/yasm/source/patched-yasm":
Var("chromium_trunk") + "deps/third_party/yasm/patched-yasm/@" +
Var("chromium_trunk") + "/deps/third_party/yasm/patched-yasm@" +
Var("chromium_revision_num"),

"src/third_party/libjpeg_turbo/src":
Var("chromium_trunk") + "deps/third_party/libjpeg_turbo/@" +
Var("chromium_trunk") + "/deps/third_party/libjpeg_turbo@" +
Var("chromium_revision_num"),

"src/testing":
Var("chromium_trunk") + "src/testing/@" + Var("chromium_revision_num"),
"src/googleurl": From(Var("chromium_deps_root")),

"src/googleurl_noconv":
(Var("libpagespeed_trunk") + "/src/googleurl_noconv" +
Var("libpagespeed_revision")),

"src/testing": From(Var("libpagespeed_deps_root")),
"src/testing/gtest": From(Var("chromium_deps_root")),
"src/testing/gmock": From(Var("chromium_deps_root")),

Expand All @@ -140,43 +140,74 @@ deps = {
Var("aprutil_src") + Var("aprutil_revision"),

"src/third_party/httpd/src/include":
Var("apache_httpd_src") + "include/" + Var("apache_httpd_revision"),
Var("apache_httpd_src") + "/include" + Var("apache_httpd_revision"),

"src/third_party/httpd/src/os":
Var("apache_httpd_src") + "os/" + Var("apache_httpd_revision"),
Var("apache_httpd_src") + "/os" + Var("apache_httpd_revision"),

"src/third_party/httpd24/src/include":
Var("apache_httpd24_src") + "include/" + Var("apache_httpd24_revision"),
Var("apache_httpd24_src") + "/include" + Var("apache_httpd24_revision"),

"src/third_party/httpd24/src/os":
Var("apache_httpd24_src") + "os/" + Var("apache_httpd24_revision"),
Var("apache_httpd24_src") + "/os" + Var("apache_httpd24_revision"),

"src/third_party/chromium/src/base":
Var("chromium_trunk") + "src/base/@" + Var("chromium_revision_num"),
"src/third_party/chromium/src/base": From(Var("libpagespeed_deps_root")),

"src/third_party/chromium/src/build":
Var("chromium_trunk") + "src/build/@" + Var("chromium_revision_num"),
"src/third_party/chromium/src/build": From(Var("libpagespeed_deps_root")),
# TODO(morlovich): This is picked up from new revision to workaround
# SVN weirdness; it should go away when that's sorted or we update
# past that.
"src/third_party/chromium/src/build/util":
File(Var("chromium_trunk") + "/src/build/util/@252481"),

"src/third_party/chromium/src/net/base":
Var("chromium_trunk") + "src/net/base@" + Var("chromium_revision_num"),

"src/third_party/chromium/src/url":
Var("chromium_trunk") + "src/url@" + Var("chromium_revision_num"),
Var("chromium_trunk") + "/src/net/base@" +
Var("chromium_revision_num"),

"src/third_party/gflags/src": Var("gflags_root") + Var("gflags_revision"),
"src/third_party/google-sparsehash/src":
Var("google_sparsehash_root") + Var("google_sparsehash_revision"),

"src/third_party/protobuf":
Var("chromium_trunk") + "src/third_party/protobuf/@" +
Var("chromium_revision_num"),
"src/third_party/libpagespeed/src/build":
(Var("libpagespeed_trunk") + "/src/build" +
Var("libpagespeed_revision")),

"src/third_party/libpagespeed/src/build/internal":
Var("chromium_trunk") + "/src/build/internal@" +
Var("chromium_revision_num"),

"src/third_party/libpagespeed/src/pagespeed/core":
(Var("libpagespeed_trunk") + "/src/pagespeed/core" +
Var("libpagespeed_revision")),

"src/third_party/libpagespeed/src/pagespeed/image_compression":
(Var("libpagespeed_trunk") + "/src/pagespeed/image_compression" +
Var("libpagespeed_revision")),

"src/third_party/libpagespeed/src/pagespeed/js":
(Var("libpagespeed_trunk") + "/src/pagespeed/js" +
Var("libpagespeed_revision")),

"src/third_party/libpagespeed/src/pagespeed/l10n":
(Var("libpagespeed_trunk") + "/src/pagespeed/l10n" +
Var("libpagespeed_revision")),

"src/third_party/libpagespeed/src/pagespeed/proto":
(Var("libpagespeed_trunk") + "/src/pagespeed/proto" +
Var("libpagespeed_revision")),

"src/third_party/libpagespeed/src/third_party":
(Var("libpagespeed_trunk") + "/src/third_party" +
Var("libpagespeed_revision")),

"src/third_party/protobuf": From(Var("libpagespeed_deps_root")),

# Json cpp.
"src/third_party/jsoncpp/src":
Var("jsoncpp_src") + "jsoncpp/src/" + Var("jsoncpp_revision"),
Var("jsoncpp_src") + "/jsoncpp/src" + Var("jsoncpp_revision"),

"src/third_party/jsoncpp/include":
Var("jsoncpp_src") + "jsoncpp/include/" + Var("jsoncpp_revision"),
Var("jsoncpp_src") + "/jsoncpp/include" + Var("jsoncpp_revision"),

# Serf
"src/third_party/serf/src": Var("serf_src") + Var("serf_revision"),
Expand All @@ -185,41 +216,39 @@ deps = {

# We check libwebp out of Chromium repo to get the .gyp file.
"src/third_party/libwebp":
Var("chromium_trunk") + "src/third_party/libwebp/@" +
Var("chromium_revision_num"),
Var("chromium_trunk") + "/src/third_party/libwebp" +
Var("chromium_webp_android_revision"),

"src/tools/clang":
Var("chromium_trunk") + "src/tools/clang/@" + Var("chromium_revision_num"),
# We check 'build/android' out of Chromium repo to get
# 'android/cpufeatures.gypi', which is needed to compile libwebp.
"src/build/android":
Var("chromium_trunk") + "/src/build/android" +
Var("chromium_webp_android_revision"),

"src/tools/clang":From(Var("libpagespeed_deps_root")),
"src/tools/grit": From(Var("libpagespeed_deps_root")),
"src/tools/gyp": From(Var("chromium_deps_root")),

"src/third_party/modp_b64":
Var("chromium_trunk") + "src/third_party/modp_b64/@" +
Var("chromium_revision_num"),
"src/third_party/modp_b64": From(Var("libpagespeed_deps_root")),

"src/third_party/domain_registry_provider/src":
From(Var("libpagespeed_deps_root")),

# RE2.
"src/third_party/re2/src":
Var("chromium_trunk") + "src/third_party/re2/@" +
Var("chromium_revision_num"),
Var("re2_src") + "/src/re2" + Var("re2_revision"),

# Comment to disable HTTPS fetching via serf. See also the
# references in src/third_party/serf/serf.gyp.
#
"src/third_party/openssl": Var("openssl_src") + Var("openssl_revision"),

# Domain Registry Provider gives us the Public Suffix List.
"src/third_party/domain_registry_provider":
Var("domain_registry_provider_src") +
Var("domain_registry_provider_revision")
}


deps_os = {
"win": {
"src/third_party/cygwin": From(Var("chromium_deps_root")),
"src/third_party/python_26":
Var("chromium_trunk") + "tools/third_party/python_26/@" +
Var("chromium_revision_num"),
"src/third_party/python_26": From(Var("chromium_deps_root")),
},
"mac": {
},
Expand Down
63 changes: 0 additions & 63 deletions src/base/base.gyp
View file

This file was deleted.

Loading

0 comments on commit 5b4063b

Please sign in to comment.