nodejs-shared.patch

   1 diff -ur node-v0.10.3-o/Makefile node-v0.10.3/Makefile
   2 --- node-v0.10.3-o/Makefile     2013-04-03 11:30:57.000000000 -0600
   3 +++ node-v0.10.3/Makefile       2013-04-03 19:30:22.000000000 -0600
   4 @@ -54,11 +54,13 @@
   5  config.gypi: configure
   6         $(PYTHON) ./configure
   7
   8 -install: all
   9 -       $(PYTHON) tools/install.py $@ $(DESTDIR)
  10 +install: all justinstall
  11 +
  12 +justinstall:
  13 +       $(PYTHON) tools/install.py install $(DESTDIR) $(LIBDIR)
  14
  15  uninstall:
  16 -       $(PYTHON) tools/install.py $@ $(DESTDIR)
  17 +       $(PYTHON) tools/install.py $@ $(DESTDIR) $(LIBDIR)
  18
  19  clean:
  20         -rm -rf out/Makefile node node_g out/$(BUILDTYPE)/node blog.html email.md
  21 Only in node-v0.10.3: Makefile.orig
  22 diff -ur node-v0.10.3-o/node.gyp node-v0.10.3/node.gyp
  23 --- node-v0.10.3-o/node.gyp     2013-04-03 11:30:57.000000000 -0600
  24 +++ node-v0.10.3/node.gyp       2013-04-03 19:30:22.000000000 -0600
  25 @@ -67,17 +67,35 @@
  26        'type': 'executable',
  27
  28        'dependencies': [
  29 -        'node_js2c#host',
  30 +        'libnode'
  31        ],
  32
  33 -      'include_dirs': [
  34 -        'src',
  35 -        'tools/msvs/genfiles',
  36 -        'deps/uv/src/ares',
  37 -        '<(SHARED_INTERMEDIATE_DIR)' # for node_natives.h
  38 +      'conditions': [
  39 +        [ 'node_shared_libuv=="false"', {
  40 +          'dependencies': [ 'deps/uv/uv.gyp:libuv' ],
  41 +        }],
  42        ],
  43
  44        'sources': [
  45 +        'src/node_main.cc',
  46 +        # node.gyp is added to the project by default.
  47 +        'common.gypi',
  48 +      ],
  49 +
  50 +      'defines': [
  51 +        'NODE_WANT_INTERNALS=1',
  52 +        'ARCH="<(target_arch)"',
  53 +        'PLATFORM="<(OS)"',
  54 +      ],
  55 +    },
  56 +    {
  57 +      'target_name': 'libnode',
  58 +      'type': 'shared_library',
  59 +      'product_extension': 'so.10.3.0',
  60 +      'soname_version': '10.3.0',
  61 +      'cflags': ['-fPIC'],
  62 +
  63 +      'sources': [
  64          'src/fs_event_wrap.cc',
  65          'src/cares_wrap.cc',
  66          'src/handle_wrap.cc',
  67 @@ -88,7 +106,6 @@
  68          'src/node_file.cc',
  69          'src/node_http_parser.cc',
  70          'src/node_javascript.cc',
  71 -        'src/node_main.cc',
  72          'src/node_os.cc',
  73          'src/node_script.cc',
  74          'src/node_stat_watcher.cc',
  75 @@ -137,6 +154,17 @@
  76          'common.gypi',
  77        ],
  78
  79 +      'include_dirs': [
  80 +        'src',
  81 +        'tools/msvs/genfiles',
  82 +        'deps/uv/src/ares',
  83 +        '<(SHARED_INTERMEDIATE_DIR)' # for node_natives.h
  84 +      ],
  85 +
  86 +      'dependencies': [
  87 +        'node_js2c#host',
  88 +      ],
  89 +
  90        'defines': [
  91          'NODE_WANT_INTERNALS=1',
  92          'ARCH="<(target_arch)"',
  93 diff -ur node-v0.10.3-o/tools/closure_linter/closure_linter/checkerbase.py node-v0.10.3/tools/closure_linter/closure_linter/checkerbase.py
  94 --- node-v0.10.3-o/tools/closure_linter/closure_linter/checkerbase.py   2013-04-03 11:30:57.000000000 -0600
  95 +++ node-v0.10.3/tools/closure_linter/closure_linter/checkerbase.py     2013-04-03 19:30:22.000000000 -0600
  96 @@ -1,4 +1,4 @@
  97 -#!/usr/bin/env python
  98 +#!/usr/bin/python
  99  #
 100  # Copyright 2008 The Closure Linter Authors. All Rights Reserved.
 101  #
 102 diff -ur node-v0.10.3-o/tools/closure_linter/closure_linter/checker.py node-v0.10.3/tools/closure_linter/closure_linter/checker.py
 103 --- node-v0.10.3-o/tools/closure_linter/closure_linter/checker.py       2013-04-03 11:30:57.000000000 -0600
 104 +++ node-v0.10.3/tools/closure_linter/closure_linter/checker.py 2013-04-03 19:30:22.000000000 -0600
 105 @@ -1,4 +1,4 @@
 106 -#!/usr/bin/env python
 107 +#!/usr/bin/python
 108  #
 109  # Copyright 2007 The Closure Linter Authors. All Rights Reserved.
 110  #
 111 diff -ur node-v0.10.3-o/tools/closure_linter/closure_linter/common/erroraccumulator.py node-v0.10.3/tools/closure_linter/closure_linter/common/erroraccumulator.py
 112 --- node-v0.10.3-o/tools/closure_linter/closure_linter/common/erroraccumulator.py       2013-04-03 11:30:57.000000000 -0600
 113 +++ node-v0.10.3/tools/closure_linter/closure_linter/common/erroraccumulator.py 2013-04-03 19:30:22.000000000 -0600
 114 @@ -1,4 +1,4 @@
 115 -#!/usr/bin/env python
 116 +#!/usr/bin/python
 117  #
 118  # Copyright 2008 The Closure Linter Authors. All Rights Reserved.
 119  #
 120 diff -ur node-v0.10.3-o/tools/closure_linter/closure_linter/common/errorhandler.py node-v0.10.3/tools/closure_linter/closure_linter/common/errorhandler.py
 121 --- node-v0.10.3-o/tools/closure_linter/closure_linter/common/errorhandler.py   2013-04-03 11:30:57.000000000 -0600
 122 +++ node-v0.10.3/tools/closure_linter/closure_linter/common/errorhandler.py     2013-04-03 19:30:22.000000000 -0600
 123 @@ -1,4 +1,4 @@
 124 -#!/usr/bin/env python
 125 +#!/usr/bin/python
 126  #
 127  # Copyright 2008 The Closure Linter Authors. All Rights Reserved.
 128  #
 129 diff -ur node-v0.10.3-o/tools/closure_linter/closure_linter/common/errorprinter.py node-v0.10.3/tools/closure_linter/closure_linter/common/errorprinter.py
 130 --- node-v0.10.3-o/tools/closure_linter/closure_linter/common/errorprinter.py   2013-04-03 11:30:57.000000000 -0600
 131 +++ node-v0.10.3/tools/closure_linter/closure_linter/common/errorprinter.py     2013-04-03 19:30:22.000000000 -0600
 132 @@ -1,4 +1,4 @@
 133 -#!/usr/bin/env python
 134 +#!/usr/bin/python
 135  #
 136  # Copyright 2008 The Closure Linter Authors. All Rights Reserved.
 137  #
 138 diff -ur node-v0.10.3-o/tools/closure_linter/closure_linter/common/error.py node-v0.10.3/tools/closure_linter/closure_linter/common/error.py
 139 --- node-v0.10.3-o/tools/closure_linter/closure_linter/common/error.py  2013-04-03 11:30:57.000000000 -0600
 140 +++ node-v0.10.3/tools/closure_linter/closure_linter/common/error.py    2013-04-03 19:30:22.000000000 -0600
 141 @@ -1,4 +1,4 @@
 142 -#!/usr/bin/env python
 143 +#!/usr/bin/python
 144  #
 145  # Copyright 2007 The Closure Linter Authors. All Rights Reserved.
 146  #
 147 diff -ur node-v0.10.3-o/tools/closure_linter/closure_linter/common/filetestcase.py node-v0.10.3/tools/closure_linter/closure_linter/common/filetestcase.py
 148 --- node-v0.10.3-o/tools/closure_linter/closure_linter/common/filetestcase.py   2013-04-03 11:30:57.000000000 -0600
 149 +++ node-v0.10.3/tools/closure_linter/closure_linter/common/filetestcase.py     2013-04-03 19:30:22.000000000 -0600
 150 @@ -1,4 +1,4 @@
 151 -#!/usr/bin/env python
 152 +#!/usr/bin/python
 153  #
 154  # Copyright 2007 The Closure Linter Authors. All Rights Reserved.
 155  #
 156 diff -ur node-v0.10.3-o/tools/closure_linter/closure_linter/common/htmlutil.py node-v0.10.3/tools/closure_linter/closure_linter/common/htmlutil.py
 157 --- node-v0.10.3-o/tools/closure_linter/closure_linter/common/htmlutil.py       2013-04-03 11:30:57.000000000 -0600
 158 +++ node-v0.10.3/tools/closure_linter/closure_linter/common/htmlutil.py 2013-04-03 19:30:22.000000000 -0600
 159 @@ -1,4 +1,4 @@
 160 -#!/usr/bin/env python
 161 +#!/usr/bin/python
 162  #
 163  # Copyright 2007 The Closure Linter Authors. All Rights Reserved.
 164  #
 165 diff -ur node-v0.10.3-o/tools/closure_linter/closure_linter/common/__init__.py node-v0.10.3/tools/closure_linter/closure_linter/common/__init__.py
 166 --- node-v0.10.3-o/tools/closure_linter/closure_linter/common/__init__.py       2013-04-03 11:30:57.000000000 -0600
 167 +++ node-v0.10.3/tools/closure_linter/closure_linter/common/__init__.py 2013-04-03 19:30:22.000000000 -0600
 168 @@ -1 +1 @@
 169 -#!/usr/bin/env python
 170 +#!/usr/bin/python
 171 diff -ur node-v0.10.3-o/tools/closure_linter/closure_linter/common/lintrunner.py node-v0.10.3/tools/closure_linter/closure_linter/common/lintrunner.py
 172 --- node-v0.10.3-o/tools/closure_linter/closure_linter/common/lintrunner.py     2013-04-03 11:30:57.000000000 -0600
 173 +++ node-v0.10.3/tools/closure_linter/closure_linter/common/lintrunner.py       2013-04-03 19:30:22.000000000 -0600
 174 @@ -1,4 +1,4 @@
 175 -#!/usr/bin/env python
 176 +#!/usr/bin/python
 177  #
 178  # Copyright 2008 The Closure Linter Authors. All Rights Reserved.
 179  #
 180 diff -ur node-v0.10.3-o/tools/closure_linter/closure_linter/common/matcher.py node-v0.10.3/tools/closure_linter/closure_linter/common/matcher.py
 181 --- node-v0.10.3-o/tools/closure_linter/closure_linter/common/matcher.py        2013-04-03 11:30:57.000000000 -0600
 182 +++ node-v0.10.3/tools/closure_linter/closure_linter/common/matcher.py  2013-04-03 19:30:22.000000000 -0600
 183 @@ -1,4 +1,4 @@
 184 -#!/usr/bin/env python
 185 +#!/usr/bin/python
 186  #
 187  # Copyright 2007 The Closure Linter Authors. All Rights Reserved.
 188  #
 189 diff -ur node-v0.10.3-o/tools/closure_linter/closure_linter/common/position.py node-v0.10.3/tools/closure_linter/closure_linter/common/position.py
 190 --- node-v0.10.3-o/tools/closure_linter/closure_linter/common/position.py       2013-04-03 11:30:57.000000000 -0600
 191 +++ node-v0.10.3/tools/closure_linter/closure_linter/common/position.py 2013-04-03 19:30:22.000000000 -0600
 192 @@ -1,4 +1,4 @@
 193 -#!/usr/bin/env python
 194 +#!/usr/bin/python
 195  #
 196  # Copyright 2008 The Closure Linter Authors. All Rights Reserved.
 197  #
 198 diff -ur node-v0.10.3-o/tools/closure_linter/closure_linter/common/simplefileflags.py node-v0.10.3/tools/closure_linter/closure_linter/common/simplefileflags.py
 199 --- node-v0.10.3-o/tools/closure_linter/closure_linter/common/simplefileflags.py        2013-04-03 11:30:57.000000000 -0600
 200 +++ node-v0.10.3/tools/closure_linter/closure_linter/common/simplefileflags.py  2013-04-03 19:30:22.000000000 -0600
 201 @@ -1,4 +1,4 @@
 202 -#!/usr/bin/env python
 203 +#!/usr/bin/python
 204  #
 205  # Copyright 2008 The Closure Linter Authors. All Rights Reserved.
 206  #
 207 diff -ur node-v0.10.3-o/tools/closure_linter/closure_linter/common/tokenizer.py node-v0.10.3/tools/closure_linter/closure_linter/common/tokenizer.py
 208 --- node-v0.10.3-o/tools/closure_linter/closure_linter/common/tokenizer.py      2013-04-03 11:30:57.000000000 -0600
 209 +++ node-v0.10.3/tools/closure_linter/closure_linter/common/tokenizer.py        2013-04-03 19:30:22.000000000 -0600
 210 @@ -1,4 +1,4 @@
 211 -#!/usr/bin/env python
 212 +#!/usr/bin/python
 213  #
 214  # Copyright 2007 The Closure Linter Authors. All Rights Reserved.
 215  #
 216 diff -ur node-v0.10.3-o/tools/closure_linter/closure_linter/common/tokens.py node-v0.10.3/tools/closure_linter/closure_linter/common/tokens.py
 217 --- node-v0.10.3-o/tools/closure_linter/closure_linter/common/tokens.py 2013-04-03 11:30:57.000000000 -0600
 218 +++ node-v0.10.3/tools/closure_linter/closure_linter/common/tokens.py   2013-04-03 19:30:22.000000000 -0600
 219 @@ -1,4 +1,4 @@
 220 -#!/usr/bin/env python
 221 +#!/usr/bin/python
 222  #
 223  # Copyright 2008 The Closure Linter Authors. All Rights Reserved.
 224  #
 225 diff -ur node-v0.10.3-o/tools/closure_linter/closure_linter/ecmalintrules.py node-v0.10.3/tools/closure_linter/closure_linter/ecmalintrules.py
 226 --- node-v0.10.3-o/tools/closure_linter/closure_linter/ecmalintrules.py 2013-04-03 11:30:57.000000000 -0600
 227 +++ node-v0.10.3/tools/closure_linter/closure_linter/ecmalintrules.py   2013-04-03 19:30:22.000000000 -0600
 228 @@ -1,4 +1,4 @@
 229 -#!/usr/bin/env python
 230 +#!/usr/bin/python
 231  #
 232  # Copyright 2008 The Closure Linter Authors. All Rights Reserved.
 233  #
 234 diff -ur node-v0.10.3-o/tools/closure_linter/closure_linter/ecmametadatapass.py node-v0.10.3/tools/closure_linter/closure_linter/ecmametadatapass.py
 235 --- node-v0.10.3-o/tools/closure_linter/closure_linter/ecmametadatapass.py      2013-04-03 11:30:57.000000000 -0600
 236 +++ node-v0.10.3/tools/closure_linter/closure_linter/ecmametadatapass.py        2013-04-03 19:30:22.000000000 -0600
 237 @@ -1,4 +1,4 @@
 238 -#!/usr/bin/env python
 239 +#!/usr/bin/python
 240  #
 241  # Copyright 2010 The Closure Linter Authors. All Rights Reserved.
 242  #
 243 diff -ur node-v0.10.3-o/tools/closure_linter/closure_linter/error_fixer.py node-v0.10.3/tools/closure_linter/closure_linter/error_fixer.py
 244 --- node-v0.10.3-o/tools/closure_linter/closure_linter/error_fixer.py   2013-04-03 11:30:57.000000000 -0600
 245 +++ node-v0.10.3/tools/closure_linter/closure_linter/error_fixer.py     2013-04-03 19:30:22.000000000 -0600
 246 @@ -1,4 +1,4 @@
 247 -#!/usr/bin/env python
 248 +#!/usr/bin/python
 249  #
 250  # Copyright 2007 The Closure Linter Authors. All Rights Reserved.
 251  #
 252 diff -ur node-v0.10.3-o/tools/closure_linter/closure_linter/errorrules.py node-v0.10.3/tools/closure_linter/closure_linter/errorrules.py
 253 --- node-v0.10.3-o/tools/closure_linter/closure_linter/errorrules.py    2013-04-03 11:30:57.000000000 -0600
 254 +++ node-v0.10.3/tools/closure_linter/closure_linter/errorrules.py      2013-04-03 19:30:22.000000000 -0600
 255 @@ -1,4 +1,4 @@
 256 -#!/usr/bin/env python
 257 +#!/usr/bin/python
 258  #
 259  # Copyright 2010 The Closure Linter Authors. All Rights Reserved.
 260  #
 261 diff -ur node-v0.10.3-o/tools/closure_linter/closure_linter/errors.py node-v0.10.3/tools/closure_linter/closure_linter/errors.py
 262 --- node-v0.10.3-o/tools/closure_linter/closure_linter/errors.py        2013-04-03 11:30:57.000000000 -0600
 263 +++ node-v0.10.3/tools/closure_linter/closure_linter/errors.py  2013-04-03 19:30:22.000000000 -0600
 264 @@ -1,4 +1,4 @@
 265 -#!/usr/bin/env python
 266 +#!/usr/bin/python
 267  #
 268  # Copyright 2007 The Closure Linter Authors. All Rights Reserved.
 269  #
 270 diff -ur node-v0.10.3-o/tools/closure_linter/closure_linter/fixjsstyle.py node-v0.10.3/tools/closure_linter/closure_linter/fixjsstyle.py
 271 --- node-v0.10.3-o/tools/closure_linter/closure_linter/fixjsstyle.py    2013-04-03 11:30:57.000000000 -0600
 272 +++ node-v0.10.3/tools/closure_linter/closure_linter/fixjsstyle.py      2013-04-03 19:30:22.000000000 -0600
 273 @@ -1,4 +1,4 @@
 274 -#!/usr/bin/env python
 275 +#!/usr/bin/python
 276  #
 277  # Copyright 2007 The Closure Linter Authors. All Rights Reserved.
 278  #
 279 diff -ur node-v0.10.3-o/tools/closure_linter/closure_linter/fixjsstyle_test.py node-v0.10.3/tools/closure_linter/closure_linter/fixjsstyle_test.py
 280 --- node-v0.10.3-o/tools/closure_linter/closure_linter/fixjsstyle_test.py       2013-04-03 11:30:57.000000000 -0600
 281 +++ node-v0.10.3/tools/closure_linter/closure_linter/fixjsstyle_test.py 2013-04-03 19:30:22.000000000 -0600
 282 @@ -1,4 +1,4 @@
 283 -#!/usr/bin/env python
 284 +#!/usr/bin/python
 285  #
 286  # Copyright 2008 The Closure Linter Authors. All Rights Reserved.
 287  #
 288 diff -ur node-v0.10.3-o/tools/closure_linter/closure_linter/full_test.py node-v0.10.3/tools/closure_linter/closure_linter/full_test.py
 289 --- node-v0.10.3-o/tools/closure_linter/closure_linter/full_test.py     2013-04-03 11:30:57.000000000 -0600
 290 +++ node-v0.10.3/tools/closure_linter/closure_linter/full_test.py       2013-04-03 19:30:22.000000000 -0600
 291 @@ -1,4 +1,4 @@
 292 -#!/usr/bin/env python
 293 +#!/usr/bin/python
 294  #
 295  # Copyright 2007 The Closure Linter Authors. All Rights Reserved.
 296  #
 297 diff -ur node-v0.10.3-o/tools/closure_linter/closure_linter/gjslint.py node-v0.10.3/tools/closure_linter/closure_linter/gjslint.py
 298 --- node-v0.10.3-o/tools/closure_linter/closure_linter/gjslint.py       2013-04-03 11:30:57.000000000 -0600
 299 +++ node-v0.10.3/tools/closure_linter/closure_linter/gjslint.py 2013-04-03 19:30:22.000000000 -0600
 300 @@ -1,4 +1,4 @@
 301 -#!/usr/bin/env python
 302 +#!/usr/bin/python
 303  #
 304  # Copyright 2007 The Closure Linter Authors. All Rights Reserved.
 305  #
 306 diff -ur node-v0.10.3-o/tools/closure_linter/closure_linter/indentation.py node-v0.10.3/tools/closure_linter/closure_linter/indentation.py
 307 --- node-v0.10.3-o/tools/closure_linter/closure_linter/indentation.py   2013-04-03 11:30:57.000000000 -0600
 308 +++ node-v0.10.3/tools/closure_linter/closure_linter/indentation.py     2013-04-03 19:30:22.000000000 -0600
 309 @@ -1,4 +1,4 @@
 310 -#!/usr/bin/env python
 311 +#!/usr/bin/python
 312  #
 313  # Copyright 2010 The Closure Linter Authors. All Rights Reserved.
 314  #
 315 diff -ur node-v0.10.3-o/tools/closure_linter/closure_linter/__init__.py node-v0.10.3/tools/closure_linter/closure_linter/__init__.py
 316 --- node-v0.10.3-o/tools/closure_linter/closure_linter/__init__.py      2013-04-03 11:30:57.000000000 -0600
 317 +++ node-v0.10.3/tools/closure_linter/closure_linter/__init__.py        2013-04-03 19:30:22.000000000 -0600
 318 @@ -1 +1 @@
 319 -#!/usr/bin/env python
 320 +#!/usr/bin/python
 321 diff -ur node-v0.10.3-o/tools/closure_linter/closure_linter/javascriptlintrules.py node-v0.10.3/tools/closure_linter/closure_linter/javascriptlintrules.py
 322 --- node-v0.10.3-o/tools/closure_linter/closure_linter/javascriptlintrules.py   2013-04-03 11:30:57.000000000 -0600
 323 +++ node-v0.10.3/tools/closure_linter/closure_linter/javascriptlintrules.py     2013-04-03 19:30:22.000000000 -0600
 324 @@ -1,4 +1,4 @@
 325 -#!/usr/bin/env python
 326 +#!/usr/bin/python
 327  #
 328  # Copyright 2008 The Closure Linter Authors. All Rights Reserved.
 329  #
 330 diff -ur node-v0.10.3-o/tools/closure_linter/closure_linter/javascriptstatetracker.py node-v0.10.3/tools/closure_linter/closure_linter/javascriptstatetracker.py
 331 --- node-v0.10.3-o/tools/closure_linter/closure_linter/javascriptstatetracker.py        2013-04-03 11:30:57.000000000 -0600
 332 +++ node-v0.10.3/tools/closure_linter/closure_linter/javascriptstatetracker.py  2013-04-03 19:30:22.000000000 -0600
 333 @@ -1,4 +1,4 @@
 334 -#!/usr/bin/env python
 335 +#!/usr/bin/python
 336  #
 337  # Copyright 2008 The Closure Linter Authors. All Rights Reserved.
 338  #
 339 diff -ur node-v0.10.3-o/tools/closure_linter/closure_linter/javascriptstatetracker_test.py node-v0.10.3/tools/closure_linter/closure_linter/javascriptstatetracker_test.py
 340 --- node-v0.10.3-o/tools/closure_linter/closure_linter/javascriptstatetracker_test.py   2013-04-03 11:30:57.000000000 -0600
 341 +++ node-v0.10.3/tools/closure_linter/closure_linter/javascriptstatetracker_test.py     2013-04-03 19:30:22.000000000 -0600
 342 @@ -1,4 +1,4 @@
 343 -#!/usr/bin/env python
 344 +#!/usr/bin/python
 345  #
 346  # Copyright 2010 The Closure Linter Authors. All Rights Reserved.
 347  #
 348 diff -ur node-v0.10.3-o/tools/closure_linter/closure_linter/javascripttokenizer.py node-v0.10.3/tools/closure_linter/closure_linter/javascripttokenizer.py
 349 --- node-v0.10.3-o/tools/closure_linter/closure_linter/javascripttokenizer.py   2013-04-03 11:30:57.000000000 -0600
 350 +++ node-v0.10.3/tools/closure_linter/closure_linter/javascripttokenizer.py     2013-04-03 19:30:22.000000000 -0600
 351 @@ -1,4 +1,4 @@
 352 -#!/usr/bin/env python
 353 +#!/usr/bin/python
 354  #
 355  # Copyright 2007 The Closure Linter Authors. All Rights Reserved.
 356  #
 357 diff -ur node-v0.10.3-o/tools/closure_linter/closure_linter/javascripttokens.py node-v0.10.3/tools/closure_linter/closure_linter/javascripttokens.py
 358 --- node-v0.10.3-o/tools/closure_linter/closure_linter/javascripttokens.py      2013-04-03 11:30:57.000000000 -0600
 359 +++ node-v0.10.3/tools/closure_linter/closure_linter/javascripttokens.py        2013-04-03 19:30:22.000000000 -0600
 360 @@ -1,4 +1,4 @@
 361 -#!/usr/bin/env python
 362 +#!/usr/bin/python
 363  #
 364  # Copyright 2008 The Closure Linter Authors. All Rights Reserved.
 365  #
 366 diff -ur node-v0.10.3-o/tools/closure_linter/closure_linter/statetracker.py node-v0.10.3/tools/closure_linter/closure_linter/statetracker.py
 367 --- node-v0.10.3-o/tools/closure_linter/closure_linter/statetracker.py  2013-04-03 11:30:57.000000000 -0600
 368 +++ node-v0.10.3/tools/closure_linter/closure_linter/statetracker.py    2013-04-03 19:30:22.000000000 -0600
 369 @@ -1,4 +1,4 @@
 370 -#!/usr/bin/env python
 371 +#!/usr/bin/python
 372  #
 373  # Copyright 2007 The Closure Linter Authors. All Rights Reserved.
 374  #
 375 diff -ur node-v0.10.3-o/tools/closure_linter/closure_linter/tokenutil.py node-v0.10.3/tools/closure_linter/closure_linter/tokenutil.py
 376 --- node-v0.10.3-o/tools/closure_linter/closure_linter/tokenutil.py     2013-04-03 11:30:57.000000000 -0600
 377 +++ node-v0.10.3/tools/closure_linter/closure_linter/tokenutil.py       2013-04-03 19:30:22.000000000 -0600
 378 @@ -1,4 +1,4 @@
 379 -#!/usr/bin/env python
 380 +#!/usr/bin/python
 381  #
 382  # Copyright 2007 The Closure Linter Authors. All Rights Reserved.
 383  #
 384 diff -ur node-v0.10.3-o/tools/closure_linter/gflags.py node-v0.10.3/tools/closure_linter/gflags.py
 385 --- node-v0.10.3-o/tools/closure_linter/gflags.py       2013-04-03 11:30:57.000000000 -0600
 386 +++ node-v0.10.3/tools/closure_linter/gflags.py 2013-04-03 19:30:22.000000000 -0600
 387 @@ -1,4 +1,4 @@
 388 -#!/usr/bin/env python
 389 +#!/usr/bin/python
 390
 391  # Copyright (c) 2007, Google Inc.
 392  # All rights reserved.
 393 diff -ur node-v0.10.3-o/tools/closure_linter/setup.py node-v0.10.3/tools/closure_linter/setup.py
 394 --- node-v0.10.3-o/tools/closure_linter/setup.py        2013-04-03 11:30:57.000000000 -0600
 395 +++ node-v0.10.3/tools/closure_linter/setup.py  2013-04-03 19:30:22.000000000 -0600
 396 @@ -1,4 +1,4 @@
 397 -#!/usr/bin/env python
 398 +#!/usr/bin/python
 399  #
 400  # Copyright 2010 The Closure Linter Authors. All Rights Reserved.
 401  #
 402 diff -ur node-v0.10.3-o/tools/genv8constants.py node-v0.10.3/tools/genv8constants.py
 403 --- node-v0.10.3-o/tools/genv8constants.py      2013-04-03 11:30:57.000000000 -0600
 404 +++ node-v0.10.3/tools/genv8constants.py        2013-04-03 19:30:22.000000000 -0600
 405 @@ -1,4 +1,4 @@
 406 -#!/usr/bin/env python
 407 +#!/usr/bin/python
 408
 409  #
 410  # genv8constants.py output_file libv8_base.a
 411 diff -ur node-v0.10.3-o/tools/gyp/gyp node-v0.10.3/tools/gyp/gyp
 412 --- node-v0.10.3-o/tools/gyp/gyp        2013-04-03 11:30:57.000000000 -0600
 413 +++ node-v0.10.3/tools/gyp/gyp  2013-04-03 19:30:39.000000000 -0600
 414 @@ -1,4 +1,4 @@
 415 -#!/usr/bin/env python
 416 +#!/usr/bin/python
 417
 418  # Copyright (c) 2009 Google Inc. All rights reserved.
 419  # Use of this source code is governed by a BSD-style license that can be
 420 diff -ur node-v0.10.3-o/tools/gyp/gyptest.py node-v0.10.3/tools/gyp/gyptest.py
 421 --- node-v0.10.3-o/tools/gyp/gyptest.py 2013-04-03 11:30:57.000000000 -0600
 422 +++ node-v0.10.3/tools/gyp/gyptest.py   2013-04-03 19:30:39.000000000 -0600
 423 @@ -1,4 +1,4 @@
 424 -#!/usr/bin/env python
 425 +#!/usr/bin/python
 426
 427  # Copyright (c) 2012 Google Inc. All rights reserved.
 428  # Use of this source code is governed by a BSD-style license that can be
 429 diff -ur node-v0.10.3-o/tools/gyp/pylib/gyp/common_test.py node-v0.10.3/tools/gyp/pylib/gyp/common_test.py
 430 --- node-v0.10.3-o/tools/gyp/pylib/gyp/common_test.py   2013-04-03 11:30:57.000000000 -0600
 431 +++ node-v0.10.3/tools/gyp/pylib/gyp/common_test.py     2013-04-03 19:30:39.000000000 -0600
 432 @@ -1,4 +1,4 @@
 433 -#!/usr/bin/env python
 434 +#!/usr/bin/python
 435
 436  # Copyright (c) 2012 Google Inc. All rights reserved.
 437  # Use of this source code is governed by a BSD-style license that can be
 438 diff -ur node-v0.10.3-o/tools/gyp/pylib/gyp/easy_xml_test.py node-v0.10.3/tools/gyp/pylib/gyp/easy_xml_test.py
 439 --- node-v0.10.3-o/tools/gyp/pylib/gyp/easy_xml_test.py 2013-04-03 11:30:57.000000000 -0600
 440 +++ node-v0.10.3/tools/gyp/pylib/gyp/easy_xml_test.py   2013-04-03 19:30:39.000000000 -0600
 441 @@ -1,4 +1,4 @@
 442 -#!/usr/bin/env python
 443 +#!/usr/bin/python
 444
 445  # Copyright (c) 2011 Google Inc. All rights reserved.
 446  # Use of this source code is governed by a BSD-style license that can be
 447 diff -ur node-v0.10.3-o/tools/gyp/pylib/gyp/generator/msvs_test.py node-v0.10.3/tools/gyp/pylib/gyp/generator/msvs_test.py
 448 --- node-v0.10.3-o/tools/gyp/pylib/gyp/generator/msvs_test.py   2013-04-03 11:30:57.000000000 -0600
 449 +++ node-v0.10.3/tools/gyp/pylib/gyp/generator/msvs_test.py     2013-04-03 19:30:39.000000000 -0600
 450 @@ -1,4 +1,4 @@
 451 -#!/usr/bin/env python
 452 +#!/usr/bin/python
 453  # Copyright (c) 2012 Google Inc. All rights reserved.
 454  # Use of this source code is governed by a BSD-style license that can be
 455  # found in the LICENSE file.
 456 diff -ur node-v0.10.3-o/tools/gyp/pylib/gyp/generator/ninja_test.py node-v0.10.3/tools/gyp/pylib/gyp/generator/ninja_test.py
 457 --- node-v0.10.3-o/tools/gyp/pylib/gyp/generator/ninja_test.py  2013-04-03 11:30:57.000000000 -0600
 458 +++ node-v0.10.3/tools/gyp/pylib/gyp/generator/ninja_test.py    2013-04-03 19:30:39.000000000 -0600
 459 @@ -1,4 +1,4 @@
 460 -#!/usr/bin/env python
 461 +#!/usr/bin/python
 462
 463  # Copyright (c) 2012 Google Inc. All rights reserved.
 464  # Use of this source code is governed by a BSD-style license that can be
 465 diff -ur node-v0.10.3-o/tools/gyp/pylib/gyp/__init__.py node-v0.10.3/tools/gyp/pylib/gyp/__init__.py
 466 --- node-v0.10.3-o/tools/gyp/pylib/gyp/__init__.py      2013-04-03 11:30:57.000000000 -0600
 467 +++ node-v0.10.3/tools/gyp/pylib/gyp/__init__.py        2013-04-03 19:30:39.000000000 -0600
 468 @@ -1,4 +1,4 @@
 469 -#!/usr/bin/env python
 470 +#!/usr/bin/python
 471
 472  # Copyright (c) 2012 Google Inc. All rights reserved.
 473  # Use of this source code is governed by a BSD-style license that can be
 474 diff -ur node-v0.10.3-o/tools/gyp/pylib/gyp/mac_tool.py node-v0.10.3/tools/gyp/pylib/gyp/mac_tool.py
 475 --- node-v0.10.3-o/tools/gyp/pylib/gyp/mac_tool.py      2013-04-03 11:30:57.000000000 -0600
 476 +++ node-v0.10.3/tools/gyp/pylib/gyp/mac_tool.py        2013-04-03 19:30:39.000000000 -0600
 477 @@ -1,4 +1,4 @@
 478 -#!/usr/bin/env python
 479 +#!/usr/bin/python
 480  # Copyright (c) 2012 Google Inc. All rights reserved.
 481  # Use of this source code is governed by a BSD-style license that can be
 482  # found in the LICENSE file.
 483 diff -ur node-v0.10.3-o/tools/gyp/pylib/gyp/MSVSSettings_test.py node-v0.10.3/tools/gyp/pylib/gyp/MSVSSettings_test.py
 484 --- node-v0.10.3-o/tools/gyp/pylib/gyp/MSVSSettings_test.py     2013-04-03 11:30:57.000000000 -0600
 485 +++ node-v0.10.3/tools/gyp/pylib/gyp/MSVSSettings_test.py       2013-04-03 19:30:39.000000000 -0600
 486 @@ -1,4 +1,4 @@
 487 -#!/usr/bin/env python
 488 +#!/usr/bin/python
 489
 490  # Copyright (c) 2012 Google Inc. All rights reserved.
 491  # Use of this source code is governed by a BSD-style license that can be
 492 diff -ur node-v0.10.3-o/tools/gyp/pylib/gyp/sun_tool.py node-v0.10.3/tools/gyp/pylib/gyp/sun_tool.py
 493 --- node-v0.10.3-o/tools/gyp/pylib/gyp/sun_tool.py      2013-04-03 11:30:57.000000000 -0600
 494 +++ node-v0.10.3/tools/gyp/pylib/gyp/sun_tool.py        2013-04-03 19:30:39.000000000 -0600
 495 @@ -1,4 +1,4 @@
 496 -#!/usr/bin/env python
 497 +#!/usr/bin/python
 498  # Copyright (c) 2011 Google Inc. All rights reserved.
 499  # Use of this source code is governed by a BSD-style license that can be
 500  # found in the LICENSE file.
 501 diff -ur node-v0.10.3-o/tools/gyp/pylib/gyp/win_tool.py node-v0.10.3/tools/gyp/pylib/gyp/win_tool.py
 502 --- node-v0.10.3-o/tools/gyp/pylib/gyp/win_tool.py      2013-04-03 11:30:57.000000000 -0600
 503 +++ node-v0.10.3/tools/gyp/pylib/gyp/win_tool.py        2013-04-03 19:30:39.000000000 -0600
 504 @@ -1,4 +1,4 @@
 505 -#!/usr/bin/env python
 506 +#!/usr/bin/python
 507
 508  # Copyright (c) 2012 Google Inc. All rights reserved.
 509  # Use of this source code is governed by a BSD-style license that can be
 510 diff -ur node-v0.10.3-o/tools/gyp/setup.py node-v0.10.3/tools/gyp/setup.py
 511 --- node-v0.10.3-o/tools/gyp/setup.py   2013-04-03 11:30:57.000000000 -0600
 512 +++ node-v0.10.3/tools/gyp/setup.py     2013-04-03 19:30:39.000000000 -0600
 513 @@ -1,4 +1,4 @@
 514 -#!/usr/bin/env python
 515 +#!/usr/bin/python
 516
 517  # Copyright (c) 2009 Google Inc. All rights reserved.
 518  # Use of this source code is governed by a BSD-style license that can be
 519 diff -ur node-v0.10.3-o/tools/gyp/tools/graphviz.py node-v0.10.3/tools/gyp/tools/graphviz.py
 520 --- node-v0.10.3-o/tools/gyp/tools/graphviz.py  2013-04-03 11:30:57.000000000 -0600
 521 +++ node-v0.10.3/tools/gyp/tools/graphviz.py    2013-04-03 19:30:39.000000000 -0600
 522 @@ -1,4 +1,4 @@
 523 -#!/usr/bin/env python
 524 +#!/usr/bin/python
 525
 526  # Copyright (c) 2011 Google Inc. All rights reserved.
 527  # Use of this source code is governed by a BSD-style license that can be
 528 diff -ur node-v0.10.3-o/tools/gyp/tools/pretty_gyp.py node-v0.10.3/tools/gyp/tools/pretty_gyp.py
 529 --- node-v0.10.3-o/tools/gyp/tools/pretty_gyp.py        2013-04-03 11:30:57.000000000 -0600
 530 +++ node-v0.10.3/tools/gyp/tools/pretty_gyp.py  2013-04-03 19:30:39.000000000 -0600
 531 @@ -1,4 +1,4 @@
 532 -#!/usr/bin/env python
 533 +#!/usr/bin/python
 534
 535  # Copyright (c) 2012 Google Inc. All rights reserved.
 536  # Use of this source code is governed by a BSD-style license that can be
 537 diff -ur node-v0.10.3-o/tools/gyp/tools/pretty_sln.py node-v0.10.3/tools/gyp/tools/pretty_sln.py
 538 --- node-v0.10.3-o/tools/gyp/tools/pretty_sln.py        2013-04-03 11:30:57.000000000 -0600
 539 +++ node-v0.10.3/tools/gyp/tools/pretty_sln.py  2013-04-03 19:30:39.000000000 -0600
 540 @@ -1,4 +1,4 @@
 541 -#!/usr/bin/env python
 542 +#!/usr/bin/python
 543
 544  # Copyright (c) 2012 Google Inc. All rights reserved.
 545  # Use of this source code is governed by a BSD-style license that can be
 546 diff -ur node-v0.10.3-o/tools/gyp/tools/pretty_vcproj.py node-v0.10.3/tools/gyp/tools/pretty_vcproj.py
 547 --- node-v0.10.3-o/tools/gyp/tools/pretty_vcproj.py     2013-04-03 11:30:57.000000000 -0600
 548 +++ node-v0.10.3/tools/gyp/tools/pretty_vcproj.py       2013-04-03 19:30:39.000000000 -0600
 549 @@ -1,4 +1,4 @@
 550 -#!/usr/bin/env python
 551 +#!/usr/bin/python
 552
 553  # Copyright (c) 2012 Google Inc. All rights reserved.
 554  # Use of this source code is governed by a BSD-style license that can be
 555 diff -ur node-v0.10.3-o/tools/gyp_node node-v0.10.3/tools/gyp_node
 556 --- node-v0.10.3-o/tools/gyp_node       2013-04-03 11:30:57.000000000 -0600
 557 +++ node-v0.10.3/tools/gyp_node 2013-04-03 19:30:39.000000000 -0600
 558 @@ -1,4 +1,4 @@
 559 -#!/usr/bin/env python
 560 +#!/usr/bin/python
 561  import glob
 562  import os
 563  import shlex
 564 diff -ur node-v0.10.3-o/tools/install.py node-v0.10.3/tools/install.py
 565 --- node-v0.10.3-o/tools/install.py     2013-04-03 11:30:57.000000000 -0600
 566 +++ node-v0.10.3/tools/install.py       2013-04-03 19:31:32.000000000 -0600
 567 @@ -1,4 +1,4 @@
 568 -#!/usr/bin/env python
 569 +#!/usr/bin/python
 570
 571  import errno
 572
 573 @@ -119,7 +119,9 @@
 574      assert(0) # unhandled action type
 575
 576  def files(action):
 577 +  global lib_dir
 578    action(['out/Release/node'], 'bin/node')
 579 +  action(['out/Release/lib.target/libnode.so.10.3.0'], lib_dir + '/libnode.so.10.3.0')
 580
 581    # install unconditionally, checking if the platform supports dtrace doesn't
 582    # work when cross-compiling and besides, there's at least one linux flavor
 583 @@ -134,7 +136,7 @@
 584    if 'true' == variables.get('node_install_npm'): npm_files(action)
 585
 586  def run(args):
 587 -  global dst_dir, node_prefix, target_defaults, variables
 588 +  global dst_dir, node_prefix, target_defaults, variables, lib_dir
 589
 590    # chdir to the project's top-level directory
 591    os.chdir(abspath(os.path.dirname(__file__), '..'))
 592 @@ -147,6 +149,9 @@
 593    dst_dir = node_prefix = variables.get('node_prefix') or '/usr/local'
 594    if len(args) > 2: dst_dir = abspath(args[2] + '/' + dst_dir)
 595
 596 +  lib_dir = 'lib'
 597 +  if len(args) > 3: lib_dir = args[3]
 598 +
 599    cmd = args[1] if len(args) > 1 else 'install'
 600    if cmd == 'install': return files(install)
 601    if cmd == 'uninstall': return files(uninstall)
 602 Only in node-v0.10.3/tools: install.py~
 603 Only in node-v0.10.3/tools: install.py.orig
 604 Only in node-v0.10.3/tools: install.py.rej~
 605 diff -ur node-v0.10.3-o/tools/js2c.py node-v0.10.3/tools/js2c.py
 606 --- node-v0.10.3-o/tools/js2c.py        2013-04-03 11:30:57.000000000 -0600
 607 +++ node-v0.10.3/tools/js2c.py  2013-04-03 19:30:39.000000000 -0600
 608 @@ -1,4 +1,4 @@
 609 -#!/usr/bin/env python
 610 +#!/usr/bin/python
 611  #
 612  # Copyright 2006-2008 the V8 project authors. All rights reserved.
 613  # Redistribution and use in source and binary forms, with or without
 614 diff -ur node-v0.10.3-o/tools/test.py node-v0.10.3/tools/test.py
 615 --- node-v0.10.3-o/tools/test.py        2013-04-03 11:30:57.000000000 -0600
 616 +++ node-v0.10.3/tools/test.py  2013-04-03 19:30:39.000000000 -0600
 617 @@ -1,4 +1,4 @@
 618 -#!/usr/bin/env python
 619 +#!/usr/bin/python
 620  #
 621  # Copyright 2008 the V8 project authors. All rights reserved.
 622  # Redistribution and use in source and binary forms, with or without