| OLD | NEW | 
 | (Empty) | 
|    1 vars = { |  | 
|    2   "chromium_trunk": "http://src.chromium.org/svn/trunk", |  | 
|    3   "nixysa_rev": "56", |  | 
|    4   "chromium_rev": "28829", |  | 
|    5   "o3d_code_rev": "157", |  | 
|    6   "skia_rev": "376", |  | 
|    7   "gyp_rev": "725", |  | 
|    8   "gtest_rev": "329", |  | 
|    9   "gflags_rev": "30", |  | 
|   10   "breakpad_rev": "391", |  | 
|   11   "v8_rev": "2901", |  | 
|   12   "nacl_rev": "842", |  | 
|   13 } |  | 
|   14  |  | 
|   15 deps = { |  | 
|   16   "o3d/o3d_assets": |  | 
|   17     "http://o3d.googlecode.com/svn/trunk/googleclient/o3d_assets@" + Var("o3d_co
     de_rev"), |  | 
|   18  |  | 
|   19   "third_party/antlr3": |  | 
|   20     "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/antlr3@" + Var
     ("o3d_code_rev"), |  | 
|   21  |  | 
|   22   "third_party/cg": |  | 
|   23     "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/cg@" + Var("o3
     d_code_rev"), |  | 
|   24  |  | 
|   25   "third_party/fcollada": |  | 
|   26     "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/fcollada@" + V
     ar("o3d_code_rev"), |  | 
|   27  |  | 
|   28   "third_party/glew": |  | 
|   29     "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/glew@" + Var("
     o3d_code_rev"), |  | 
|   30  |  | 
|   31   "third_party/jsdoctoolkit": |  | 
|   32     "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/jsdoctoolkit@"
      + Var("o3d_code_rev"), |  | 
|   33  |  | 
|   34   "third_party/libevent": |  | 
|   35     "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/libevent@" + V
     ar("o3d_code_rev"), |  | 
|   36  |  | 
|   37   "third_party/makeself": |  | 
|   38     "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/makeself@" + V
     ar("o3d_code_rev"), |  | 
|   39  |  | 
|   40   "third_party/pdiff": |  | 
|   41     "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/pdiff@" + Var(
     "o3d_code_rev"), |  | 
|   42  |  | 
|   43   "third_party/scons": |  | 
|   44     "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/scons@" + Var(
     "o3d_code_rev"), |  | 
|   45  |  | 
|   46   "third_party/zip_utils": |  | 
|   47     "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/zip_utils@" + 
     Var("o3d_code_rev"), |  | 
|   48  |  | 
|   49   "third_party/selenium_rc": |  | 
|   50     "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/selenium_rc@" 
     + Var("o3d_code_rev"), |  | 
|   51  |  | 
|   52 # Stuff that is O3D specific (from a Chrome point of view). |  | 
|   53  |  | 
|   54   "o3d/third_party/vectormath": |  | 
|   55     "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/vectormath@" +
      Var("o3d_code_rev"), |  | 
|   56  |  | 
|   57   "o3d/third_party/nixysa": |  | 
|   58     "http://nixysa.googlecode.com/svn/trunk/nixysa@" + Var("nixysa_rev"), |  | 
|   59  |  | 
|   60   "o3d/third_party/npapi": |  | 
|   61     "http://nixysa.googlecode.com/svn/trunk/third_party/npapi@" + Var("nixysa_re
     v"), |  | 
|   62  |  | 
|   63   "o3d/third_party/ply": |  | 
|   64     "http://nixysa.googlecode.com/svn/trunk/third_party/ply-3.1@" + Var("nixysa_
     rev"), |  | 
|   65  |  | 
|   66   "o3d/third_party/gflags": |  | 
|   67     "http://google-gflags.googlecode.com/svn/trunk@" + Var("gflags_rev"), |  | 
|   68  |  | 
|   69 # Stuff from the Chromium tree. |  | 
|   70  |  | 
|   71   "third_party/harfbuzz": |  | 
|   72     Var("chromium_trunk") + "/src/third_party/harfbuzz@" + Var("chromium_rev"), |  | 
|   73  |  | 
|   74   "third_party/icu": |  | 
|   75     Var("chromium_trunk") + "/deps/third_party/icu42@" + Var("chromium_rev"), |  | 
|   76  |  | 
|   77   "third_party/libevent": |  | 
|   78     Var("chromium_trunk") + "/src/third_party/libevent@" + Var("chromium_rev"), |  | 
|   79  |  | 
|   80   "third_party/libjpeg": |  | 
|   81     Var("chromium_trunk") + "/src/third_party/libjpeg@" + Var("chromium_rev"), |  | 
|   82  |  | 
|   83   "third_party/libpng": |  | 
|   84     Var("chromium_trunk") + "/src/third_party/libpng@" + Var("chromium_rev"), |  | 
|   85  |  | 
|   86   "chrome/third_party/wtl": |  | 
|   87     Var("chromium_trunk") + "/src/chrome/third_party/wtl@" + Var("chromium_rev")
     , |  | 
|   88  |  | 
|   89   "third_party/zlib": |  | 
|   90     Var("chromium_trunk") + "/src/third_party/zlib@" + Var("chromium_rev"), |  | 
|   91  |  | 
|   92   "third_party/skia": |  | 
|   93     "http://skia.googlecode.com/svn/trunk@" + Var("skia_rev"), |  | 
|   94  |  | 
|   95   "v8": |  | 
|   96     "http://v8.googlecode.com/svn/trunk@" + Var("v8_rev"), |  | 
|   97  |  | 
|   98   "testing": |  | 
|   99     Var("chromium_trunk") + "/src/testing@" + Var("chromium_rev"), |  | 
|  100  |  | 
|  101   "skia": |  | 
|  102     Var("chromium_trunk") + "/src/skia@" + Var("chromium_rev"), |  | 
|  103  |  | 
|  104   "breakpad": |  | 
|  105     Var("chromium_trunk") + "/src/breakpad@" + Var("chromium_rev"), |  | 
|  106  |  | 
|  107   "base": |  | 
|  108     Var("chromium_trunk") + "/src/base@" + Var("chromium_rev"), |  | 
|  109  |  | 
|  110   "native_client": |  | 
|  111     "http://nativeclient.googlecode.com/svn/trunk/src/native_client@" + Var("nac
     l_rev"), |  | 
|  112  |  | 
|  113   "breakpad/src": |  | 
|  114     "http://google-breakpad.googlecode.com/svn/trunk/src@" + Var("breakpad_rev")
     , |  | 
|  115  |  | 
|  116   "testing/gtest": |  | 
|  117     "http://googletest.googlecode.com/svn/trunk@" + Var("gtest_rev"), |  | 
|  118  |  | 
|  119   "testing/gmock": |  | 
|  120     Var("chromium_trunk") + "/src/testing/gmock@" + Var("chromium_rev"), |  | 
|  121  |  | 
|  122   # Stuff needed for GYP to run |  | 
|  123   "build": |  | 
|  124     Var("chromium_trunk") + "/src/build@" + Var("chromium_rev"), |  | 
|  125  |  | 
|  126   "tools/gyp": |  | 
|  127     "http://gyp.googlecode.com/svn/trunk@" + Var("gyp_rev"), |  | 
|  128 } |  | 
|  129  |  | 
|  130 deps_os = { |  | 
|  131   "win": { |  | 
|  132     "third_party/wix_2_0_4221": |  | 
|  133       "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/wix_2_0_4221
     @" + Var("o3d_code_rev"), |  | 
|  134  |  | 
|  135     "third_party/cygwin": |  | 
|  136       "/trunk/deps/third_party/cygwin@11984", |  | 
|  137  |  | 
|  138     "third_party/python_24": |  | 
|  139       Var("chromium_trunk") + "/deps/third_party/python_24@19441", |  | 
|  140   }, |  | 
|  141   "unix": { |  | 
|  142     # Linux, really. |  | 
|  143     "site_scons": |  | 
|  144       Var("chromium_trunk") + "/src/site_scons@" + Var("chromium_rev"), |  | 
|  145     # TODO(bradnelson): make these optional!!! |  | 
|  146     # These are currently required by gyp on linux (even though o3d isn't using |  | 
|  147     # data_pack or grit). |  | 
|  148     "tools/grit": |  | 
|  149       Var("chromium_trunk") + "/src/tools/grit@" + Var("chromium_rev"), |  | 
|  150     "tools/data_pack": |  | 
|  151       Var("chromium_trunk") + "/src/tools/data_pack@" + Var("chromium_rev"), |  | 
|  152     "tools/xdisplaycheck": |  | 
|  153       Var("chromium_trunk") + "/src/tools/xdisplaycheck@" + Var("chromium_rev"), |  | 
|  154  |  | 
|  155   }, |  | 
|  156 } |  | 
|  157  |  | 
|  158 hooks = [ |  | 
|  159   { |  | 
|  160     # A change to a .gyp, .gypi, or to GYP itself should run the generator. |  | 
|  161     "pattern": "\\.gypi?$|[/\\\\]src[/\\\\]tools[/\\\\]gyp[/\\\\]|[/\\\\]src[/\\
     \\]o3d[/\\\\]build[/\\\\]gyp_o3d$|MANIFEST$", |  | 
|  162     "action": ["python", "o3d/build/gyp_o3d", "o3d/build/o3d.gyp", "o3d/tests/la
     b/ChangeResolution/change_resolution.gyp"], |  | 
|  163   }, |  | 
|  164 ] |  | 
| OLD | NEW |