Changes to convert_js.py to support gyp restrictions

libadblockplus.gyp

Index: libadblockplus.gyp
===================================================================
--- a/libadblockplus.gyp
+++ b/libadblockplus.gyp
@@ -1,12 +1,21 @@
 {
   'variables': {
-    'have_curl': '<!(python check_curl.py)'
+    'python%': 'python',

[Wladimir Palant, 2013/04/19 13:31:19]

You might want to explain briefly why you need Python to be parametrized
(probably a comment in the build file).

[Eric, 2013/04/19 13:55:50]

Comment added in my working version. It'll be present the next time I offer this
change.

   },
+  'conditions': [
+    [
+        # Put OS values known not to support curl in the expression below
+        'OS=="win"',      
+        { 'variables': { 'have_curl': 0 }},
+        { 'variables' :{ 'have_curl': '<!(<(python) check_curl.py' }}
+    ]
+  ],
   'includes': ['third_party/v8/build/common.gypi',
                'shell/shell.gyp'],
   'targets': [{
     'target_name': 'libadblockplus',
     'type': '<(library)',
+    'msvs_cygwin_shell': 0,

[Wladimir Palant, 2013/04/19 13:31:19]

Wouldn't we want that setting for all targets?

[Eric, 2013/04/19 13:55:50]

We would, in fact, but the msvs generator does not support that specification.
It only looks for this option here; there's no global setting for it.

Similarly for msvs_quote_cmd below. That one is only looked for on the action
itself.

Yeah. I know.

     'include_dirs': [
       'include',
       'third_party/v8/include'
@@ -90,13 +99,14 @@
       'outputs': [
         '<(INTERMEDIATE_DIR)/adblockplus.js.cpp'
       ],
+      'msvs_quote_cmd': 0,
       'action': [
-        'python',
+        '<(python)',
         'convert_js.py',
-        'before=<@(load_before_files)',
-        '<@(library_files)',
-        'after=<@(load_after_files)',
         '<@(_outputs)',
+        '--before', '<@(load_before_files)',
+        '--convert', '<@(library_files)',
+        '--after', '<@(load_after_files)',
       ]
     }]
   },