| OLD | NEW |
| 1 vars = { | 1 vars = { |
| 2 "chromium_trunk": | 2 "chromium_trunk": "http://src.chromium.org/svn/trunk", |
| 3 "http://src.chromium.org/svn/trunk", | |
| 4 "nixysa_rev": "54", | 3 "nixysa_rev": "54", |
| 5 "chromium_rev": "22547", | 4 "chromium_rev": "26261", |
| 6 "o3d_code_rev": "147", | 5 "o3d_code_rev": "145", |
| 7 "skia_rev": "279", | 6 "skia_rev": "341", |
| 8 "gyp_rev": "606", | 7 "gyp_rev": "651", |
| 9 "gtest_rev": "267", | 8 "gtest_rev": "267", |
| 10 "gflags_rev": "30", | 9 "gflags_rev": "30", |
| 11 "breakpad_rev": "346", | 10 "breakpad_rev": "391", |
| 12 "v8_rev": "2624", | 11 "v8_rev": "2866", |
| 12 "icu_rev": "25717", |
| 13 "nacl_rev": "569", |
| 13 } | 14 } |
| 14 | 15 |
| 15 deps = { | 16 deps = { |
| 16 "o3d/o3d_assets": | 17 "o3d/o3d_assets": |
| 17 "http://o3d.googlecode.com/svn/trunk/googleclient/o3d_assets@" + Var("o3d_co
de_rev"), | 18 "http://o3d.googlecode.com/svn/trunk/googleclient/o3d_assets@" + Var("o3d_co
de_rev"), |
| 18 | 19 |
| 19 "o3d/third_party/antlr3": | 20 "third_party/antlr3": |
| 20 "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/antlr3@" + Var
("o3d_code_rev"), | 21 "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/antlr3@" + Var
("o3d_code_rev"), |
| 21 | 22 |
| 22 "o3d/third_party/cg": | 23 "third_party/cg": |
| 23 "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/cg@" + Var("o3
d_code_rev"), | 24 "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/cg@" + Var("o3
d_code_rev"), |
| 24 | 25 |
| 25 "o3d/third_party/chrome": | 26 "third_party/fcollada": |
| 26 "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/chrome@" + Var
("o3d_code_rev"), | |
| 27 | |
| 28 "o3d/third_party/fcollada": | |
| 29 "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/fcollada@" + V
ar("o3d_code_rev"), | 27 "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/fcollada@" + V
ar("o3d_code_rev"), |
| 30 | 28 |
| 31 "o3d/third_party/glew": | 29 "third_party/glew": |
| 32 "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/glew@" + Var("
o3d_code_rev"), | 30 "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/glew@" + Var("
o3d_code_rev"), |
| 33 | 31 |
| 34 "o3d/third_party/icu38": | 32 "third_party/jsdoctoolkit": |
| 35 "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/icu38@" + Var(
"o3d_code_rev"), | |
| 36 | |
| 37 "o3d/third_party/jpeg": | |
| 38 "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/jpeg@" + Var("
o3d_code_rev"), | |
| 39 | |
| 40 "o3d/third_party/jsdoctoolkit": | |
| 41 "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/jsdoctoolkit@"
+ Var("o3d_code_rev"), | 33 "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/jsdoctoolkit@"
+ Var("o3d_code_rev"), |
| 42 | 34 |
| 43 "o3d/third_party/libevent": | 35 "third_party/libevent": |
| 44 "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/libevent@" + V
ar("o3d_code_rev"), | 36 "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/libevent@" + V
ar("o3d_code_rev"), |
| 45 | 37 |
| 46 "o3d/third_party/pdiff": | 38 "third_party/pdiff": |
| 47 "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/pdiff@" + Var(
"o3d_code_rev"), | 39 "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/pdiff@" + Var(
"o3d_code_rev"), |
| 48 | 40 |
| 49 "o3d/third_party/png": | 41 "third_party/scons": |
| 50 "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/png@" + Var("o
3d_code_rev"), | |
| 51 | |
| 52 "o3d/third_party/scons": | |
| 53 "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/scons@" + Var(
"o3d_code_rev"), | 42 "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/scons@" + Var(
"o3d_code_rev"), |
| 54 | 43 |
| 55 "o3d/third_party/selenium_rc": | 44 "third_party/vectormath": |
| 45 "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/vectormath@" +
Var("o3d_code_rev"), |
| 46 |
| 47 "third_party/zip_utils": |
| 48 "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/zip_utils@" +
Var("o3d_code_rev"), |
| 49 |
| 50 "third_party/selenium_rc": |
| 56 "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/selenium_rc@"
+ Var("o3d_code_rev"), | 51 "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/selenium_rc@"
+ Var("o3d_code_rev"), |
| 57 | 52 |
| 58 "o3d/third_party/skia": | 53 # Stuff from the Chromium tree. |
| 59 "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/skia/files@" +
Var("o3d_code_rev"), | |
| 60 | 54 |
| 61 "o3d/third_party/vectormath": | 55 "third_party/harfbuzz": |
| 62 "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/vectormath@" +
Var("o3d_code_rev"), | 56 Var("chromium_trunk") + "/src/third_party/harfbuzz@" + Var("chromium_rev"), |
| 63 | 57 |
| 64 "o3d/third_party/wix_2_0_4221": | 58 "third_party/icu": |
| 65 "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/wix_2_0_4221@"
+ Var("o3d_code_rev"), | 59 Var("chromium_trunk") + "/deps/third_party/icu42@" + Var("icu_rev"), |
| 66 | 60 |
| 67 "o3d/third_party/zip_utils": | 61 "third_party/libevent": |
| 68 "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/zip_utils@" +
Var("o3d_code_rev"), | 62 Var("chromium_trunk") + "/src/third_party/libevent@" + Var("chromium_rev"), |
| 69 | 63 |
| 70 "o3d/third_party/zlib": | 64 "third_party/libjpeg": |
| 71 "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/zlib@" + Var("
o3d_code_rev"), | 65 Var("chromium_trunk") + "/src/third_party/libjpeg@" + Var("chromium_rev"), |
| 72 | 66 |
| 73 "o3d/third_party/v8": | 67 "third_party/libpng": |
| 68 Var("chromium_trunk") + "/src/third_party/libpng@" + Var("chromium_rev"), |
| 69 |
| 70 "chrome/third_party/wtl": |
| 71 Var("chromium_trunk") + "/src/chrome/third_party/wtl@" + Var("chromium_rev")
, |
| 72 |
| 73 "third_party/zlib": |
| 74 Var("chromium_trunk") + "/src/third_party/zlib@" + Var("chromium_rev"), |
| 75 |
| 76 "third_party/skia": |
| 77 "http://skia.googlecode.com/svn/trunk@" + Var("skia_rev"), |
| 78 |
| 79 "v8": |
| 74 "http://v8.googlecode.com/svn/trunk@" + Var("v8_rev"), | 80 "http://v8.googlecode.com/svn/trunk@" + Var("v8_rev"), |
| 75 | 81 |
| 76 # NACL has to be in this weird directory because it looks for | 82 "testing": |
| 77 # googleclient two levels above it. | 83 Var("chromium_trunk") + "/src/testing@" + Var("chromium_rev"), |
| 78 "o3d/third_party/native_client/googleclient/native_client": | |
| 79 "http://nativeclient.googlecode.com/svn/trunk/nacl/googleclient/native_clien
t@188", | |
| 80 | 84 |
| 81 "o3d/third_party/breakpad": | 85 "skia": |
| 86 Var("chromium_trunk") + "/src/skia@" + Var("chromium_rev"), |
| 87 |
| 88 "breakpad": |
| 89 Var("chromium_trunk") + "/src/breakpad@" + Var("chromium_rev"), |
| 90 |
| 91 "base": |
| 92 Var("chromium_trunk") + "/src/base@" + Var("chromium_rev"), |
| 93 |
| 94 "native_client": |
| 95 "http://nativeclient.googlecode.com/svn/trunk/src/native_client@" + Var("nac
l_rev"), |
| 96 |
| 97 "breakpad/src": |
| 82 "http://google-breakpad.googlecode.com/svn/trunk/src@" + Var("breakpad_rev")
, | 98 "http://google-breakpad.googlecode.com/svn/trunk/src@" + Var("breakpad_rev")
, |
| 83 | 99 |
| 84 "o3d/third_party/nixysa": | 100 "third_party/nixysa": |
| 85 "http://nixysa.googlecode.com/svn/trunk/nixysa@" + Var("nixysa_rev"), | 101 "http://nixysa.googlecode.com/svn/trunk/nixysa@" + Var("nixysa_rev"), |
| 86 | 102 |
| 87 "o3d/third_party/npapi": | 103 "third_party/npapi": |
| 88 "http://nixysa.googlecode.com/svn/trunk/third_party/npapi@" + Var("nixysa_re
v"), | 104 "http://nixysa.googlecode.com/svn/trunk/third_party/npapi@" + Var("nixysa_re
v"), |
| 89 | 105 |
| 90 "o3d/third_party/ply": | 106 "third_party/ply": |
| 91 "http://nixysa.googlecode.com/svn/trunk/third_party/ply-3.1@" + Var("nixysa_
rev"), | 107 "http://nixysa.googlecode.com/svn/trunk/third_party/ply-3.1@" + Var("nixysa_
rev"), |
| 92 | 108 |
| 93 "o3d/third_party/gflags/": | 109 "third_party/gflags": |
| 94 "http://google-gflags.googlecode.com/svn/trunk@" + Var("gflags_rev"), | 110 "http://google-gflags.googlecode.com/svn/trunk@" + Var("gflags_rev"), |
| 95 | 111 |
| 96 "o3d/third_party/gtest/files": | 112 "testing/gtest": |
| 97 "http://googletest.googlecode.com/svn/trunk@" + Var("gtest_rev"), | 113 "http://googletest.googlecode.com/svn/trunk@" + Var("gtest_rev"), |
| 98 | 114 |
| 99 "o3d/third_party/gmock/files": | 115 "testing/gmock": |
| 100 Var("chromium_trunk") + "/src/testing/gmock@" + Var("chromium_rev"), | 116 Var("chromium_trunk") + "/src/testing/gmock@" + Var("chromium_rev"), |
| 101 | 117 |
| 118 # Stuff needed for GYP to run |
| 119 "build": |
| 120 Var("chromium_trunk") + "/src/build@" + Var("chromium_rev"), |
| 121 |
| 102 "tools/gyp": | 122 "tools/gyp": |
| 103 "http://gyp.googlecode.com/svn/trunk@" + Var("gyp_rev"), | 123 "http://gyp.googlecode.com/svn/trunk@" + Var("gyp_rev"), |
| 104 } | 124 } |
| 105 | 125 |
| 106 deps_os = { | 126 deps_os = { |
| 107 "win": { | 127 "win": { |
| 108 "o3d/third_party/python_24": | 128 "third_party/wix_2_0_4221": |
| 129 "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/wix_2_0_4221
@" + Var("o3d_code_rev"), |
| 130 |
| 131 "third_party/cygwin": |
| 132 "/trunk/deps/third_party/cygwin@11984", |
| 133 |
| 134 "third_party/python_24": |
| 109 Var("chromium_trunk") + "/deps/third_party/python_24@19441", | 135 Var("chromium_trunk") + "/deps/third_party/python_24@19441", |
| 110 }, | 136 }, |
| 137 "unix": { |
| 138 # Linux, really. |
| 139 "site_scons": |
| 140 Var("chromium_trunk") + "/src/site_scons@" + Var("chromium_rev"), |
| 141 }, |
| 111 } | 142 } |
| 143 |
| 144 hooks = [ |
| 145 { |
| 146 # A change to a .gyp, .gypi, or to GYP itself should run the generator. |
| 147 "pattern": "\\.gypi?$|[/\\\\]src[/\\\\]tools[/\\\\]gyp[/\\\\]|[/\\\\]src[/\\
\\]o3d[/\\\\]build[/\\\\]gyp_o3d$|MANIFEST$", |
| 148 "action": ["python", "o3d/build/gyp_o3d", "o3d/build/all.gyp"], |
| 149 }, |
| 150 ] |
| OLD | NEW |