Merge pull request #565 from atom/deepak1556-appveyor_setup

Appveyor setup

appveyor.yml

@@ -0,0 +1,28 @@
+# appveyor file
+# http://www.appveyor.com/docs/appveyor-yml
+version: "{build}"
+
+init:
+  - git config --global core.autocrlf input
+
+environment:
+  matrix:
+    - nodejs_version: 0.10
+
+platform:
+  - x86
+
+install:
+  - ps: Install-Product node $env:nodejs_version
+  - cmd: SET PATH=C:\Program Files (x86)\MSBuild\12.0\bin\;%PATH%
+  - cmd: SET PATH=C:\python27;%PATH%
+  - cmd: python script/bootstrap.py
+  - cmd: python script/build.py -c Debug
+
+test_script:
+  - node --version
+  - npm --version
+  - cmd: python script/cpplint.py
+  - cmd: python script/coffeelint.py
+
+build: off

atom.gyp

@@ -800,5 +800,31 @@
         },  # target generate_node_lib
       ],
     }],  # OS==win
+    # Using Visual Studio Express.
+    ['msvs_express==1', {
+      'target_defaults': {
+        'defines!': [
+          '_SECURE_ATL',
+        ],
+        'msvs_settings': {
+          'VCLibrarianTool': {
+            'AdditionalLibraryDirectories': [
+              '<(atom_source_root)/external_binaries/atl/lib',
+            ],
+          },
+          'VCLinkerTool': {
+            'AdditionalLibraryDirectories': [
+              '<(atom_source_root)/external_binaries/atl/lib',
+            ],
+            'AdditionalDependencies': [
+              'atls.lib',
+            ],
+          },
+        },
+        'msvs_system_include_dirs': [
+          '<(atom_source_root)/external_binaries/atl/include',
+        ],
+      },
+    }],  # msvs_express==1
   ],
 }

common.gypi

@@ -7,7 +7,6 @@
       }],
       ['OS=="win" and (MSVS_VERSION=="2013e" or MSVS_VERSION=="2012e" or MSVS_VERSION=="2010e")', {
         'msvs_express': 1,
-        'windows_driver_kit_path%': 'C:/WinDDK/7600.16385.1',
       },{
         'msvs_express': 0,
       }],
@@ -202,33 +201,6 @@
         },
       },
     }],  # clang==1
-    # Using Visual Studio Express.
-    ['msvs_express==1', {
-      'target_defaults': {
-        'defines!': [
-          '_SECURE_ATL',
-        ],
-        'msvs_settings': {
-          'VCLibrarianTool': {
-            'AdditionalLibraryDirectories': [
-              '<(windows_driver_kit_path)/lib/ATL/i386',
-            ],
-          },
-          'VCLinkerTool': {
-            'AdditionalLibraryDirectories': [
-              '<(windows_driver_kit_path)/lib/ATL/i386',
-            ],
-            'AdditionalDependencies': [
-              'atlthunk.lib',
-            ],
-          },
-        },
-        'msvs_system_include_dirs': [
-          '<(windows_driver_kit_path)/inc/atl71',
-          '<(windows_driver_kit_path)/inc/mfc42',
-        ],
-      },
-    }],  # msvs_express==1
     # The breakdpad on Windows assumes Debug_x64 and Release_x64 configurations.
     ['OS=="win"', {
       'target_defaults': {

package.json

@@ -10,7 +10,7 @@
   ],
 
   "devDependencies": {
-    "atom-package-manager": "0.84.x",
+    "atom-package-manager": "0.89.0",
     "coffee-script": "~1.7.1",
     "coffeelint": "~1.3.0"
   },

script/coffeelint.py

@@ -1,35 +1,28 @@
 #!/usr/bin/env python
 
-import errno
 import glob
 import os
-import subprocess
 import sys
 
+from lib.util import execute
 
-SOURCE_ROOT = os.path.dirname(os.path.dirname(__file__))
+
+SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
 
 
 def main():
   os.chdir(SOURCE_ROOT)
 
-  coffeelint = os.path.join(SOURCE_ROOT, 'node_modules', 'coffeelint', 'bin',
-                            'coffeelint')
+  coffeelint = os.path.join(SOURCE_ROOT, 'node_modules', '.bin', 'coffeelint')
+  if sys.platform in ['win32', 'cygwin']:
+    coffeelint += '.cmd'
   settings = ['--quiet', '-f', os.path.join('script', 'coffeelint.json')]
   files = glob.glob('atom/browser/api/lib/*.coffee') + \
           glob.glob('atom/renderer/api/lib/*.coffee') + \
           glob.glob('atom/common/api/lib/*.coffee') + \
           glob.glob('atom/browser/atom/*.coffee')
 
-  try:
-    subprocess.check_call(['node', coffeelint] + settings + files)
-  except OSError as e:
-    if e.errno == errno.ENOENT and sys.platform in ['win32', 'cygwin']:
-      subprocess.check_call(['node', coffeelint] + settings + files,
-                            executable='C:/Program Files/nodejs/node.exe')
-    else:
-      raise
-
+  execute([coffeelint] + settings + files)
 
 if __name__ == '__main__':
   sys.exit(main())

script/cpplint.py

@@ -23,7 +23,7 @@ IGNORE_FILES = [
   os.path.join('atom', 'common', 'swap_or_assign.h'),
 ]
 
-SOURCE_ROOT = os.path.dirname(os.path.dirname(__file__))
+SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
 
 
 def main():

script/pylint.py

@@ -5,7 +5,7 @@ import os
 import subprocess
 import sys
 
-SOURCE_ROOT = os.path.dirname(os.path.dirname(__file__))
+SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
 
 
 def main():

script/update-external-binaries.py

@@ -7,7 +7,7 @@ import os
 from lib.util import safe_mkdir, rm_rf, extract_zip, tempdir, download
 
 
-VERSION = 'v0.1.0'
+VERSION = 'v0.2.0'
 SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
 FRAMEWORKS_URL = 'https://github.com/atom/atom-shell-frameworks/releases' \
                  '/download/' + VERSION
@@ -28,6 +28,7 @@ def main():
     download_and_unzip('ReactiveCocoa')
     download_and_unzip('Squirrel')
   elif sys.platform in ['cygwin', 'win32']:
+    download_and_unzip('atl')
     download_and_unzip('directxsdk')
     download_and_unzip('vs2012_crt')