Merge pull request #98 from atom/win_64bit

Allow specifying the arch of libchromiumcontent to download

brightray/brightray.gypi

@@ -164,6 +164,22 @@
               '_ATL_NO_OPENGL',
               '_SECURE_ATL',
             ],
+            'conditions': [
+              ['target_arch=="x64"', {
+                'msvs_configuration_platform': 'x64',
+                'msvs_settings': {
+                  'VCLinkerTool': {
+                    'MinimumRequiredVersion': '5.02',  # Server 2003.
+                    'TargetMachine': '17', # x86 - 64
+                    # Doesn't exist x64 SDK. Should use oleaut32 in any case.
+                    'IgnoreDefaultLibraryNames': [ 'olepro32.lib' ],
+                  },
+                  'VCLibrarianTool': {
+                    'TargetMachine': '17', # x64
+                  },
+                },
+              }],
+            ],
           }],  # OS=="win"
         ],
       },  # Common_Base
@@ -242,31 +258,15 @@
           },  # R (Release)
         }],  # libchromiumcontent_component
         ['OS=="win"', {
-          'x64_Base': {
-            'abstract': 1,
-            'msvs_configuration_platform': 'x64',
-            'msvs_settings': {
-              'VCLinkerTool': {
-                # Make sure to understand http://crbug.com/361720 if you want to
-                # increase this.
-                'MinimumRequiredVersion': '5.02',  # Server 2003.
-                'TargetMachine': '17', # x86 - 64
-                # Doesn't exist x64 SDK. Should use oleaut32 in any case.
-                'IgnoreDefaultLibraryNames': [ 'olepro32.lib' ],
-              },
-              'VCLibrarianTool': {
-                'TargetMachine': '17', # x64
-              },
-            },
-          },  # x64_Base
           'conditions': [
+            # gyp always assumes "_x64" targets on Windows.
             ['libchromiumcontent_component', {
               'D_x64': {
-                'inherit_from': ['Common_Base', 'x64_Base', 'Debug_Base'],
+                'inherit_from': ['Common_Base', 'Debug_Base'],
               },  # D_x64
             }, {
               'R_x64': {
-                'inherit_from': ['Common_Base', 'x64_Base', 'Release_Base'],
+                'inherit_from': ['Common_Base', 'Release_Base'],
               },  # R_x64
             }],  # libchromiumcontent_component
           ],

brightray/script/bootstrap

@@ -14,16 +14,19 @@ DOWNLOAD_DIR = os.path.join(VENDOR_DIR, 'download')
 
 def main():
   args = parse_args()
-  return (update_submodules() or
+
-          download_libchromiumcontent(args.dev, args.commit, args.url))
+  update_submodules()
+  download_libchromiumcontent(args.dev, args.commit, args.target_arch, args.url)
 
 
 def parse_args():
   parser = argparse.ArgumentParser(description='Bootstrap this project')
-  parser.add_argument('-c', '--commit', nargs='?', default='HEAD',
+  parser.add_argument('-c', '--commit', required=True,
                       help='The commit of libchromiumcontent to download.')
   parser.add_argument('-d', '--dev', action='store_true',
                       help='Do not download static_library build')
+  parser.add_argument('--target_arch', required=True,
+                      help='The arch of libchromiumcontent to download.')
   parser.add_argument('url', help='The base URL from which to download '
                       'libchromiumcontent (i.e., the URL you passed to '
                       'libchromiumcontent\'s script/upload script')
@@ -36,17 +39,16 @@ def update_submodules():
                            '--recursive']))
 
 
-def download_libchromiumcontent(is_dev, commit, url):
+def download_libchromiumcontent(is_dev, commit, target_arch, url):
   mkdir_p(DOWNLOAD_DIR)
   download = os.path.join(VENDOR_DIR, 'libchromiumcontent', 'script',
                           'download')
-  target = os.path.join(DOWNLOAD_DIR, 'libchromiumcontent')
+  target_dir = os.path.join(DOWNLOAD_DIR, 'libchromiumcontent')
+  args = ['-f', '-c', commit, '--target_arch', target_arch, url, target_dir]
   if is_dev:
-    subprocess.check_call([sys.executable, download, '-f', '-c', commit, url,
+    subprocess.check_call([sys.executable, download] + args)
-                           target])
   else:
-    subprocess.check_call([sys.executable, download, '-s', '-f', '-c', commit,
+    subprocess.check_call([sys.executable, download, '-s'] + args)
-                            url, target])
 
 
 def mkdir_p(path):

brightray/vendor/libchromiumcontent

@@ -1 +1 @@
-Subproject commit a325ed7b30bf0680881783edd92ca235b5468e11
+Subproject commit 6d2427e4f1170aa56e9dc1c4fd8922dea7e233c0