Merge branch 'master' into api/docs

Rakefile

@@ -15,7 +15,9 @@ desc "Create xcode project from gyp file"
 task "create-xcode-project" => ["update-cef", "update-node"] do
   `rm -rf atom.xcodeproj`
   `script/generate-sources-gypi`
-  `gyp --depth=. -D CODE_SIGN="#{ENV['CODE_SIGN']}" atom.gyp`
+  version = %{-D version="#{ENV['VERSION']}"} if ENV['VERSION']
+  code_sign = %{-D code_sign="#{ENV['CODE_SIGN']}"} if ENV['CODE_SIGN']
+  `gyp --depth=. #{code_sign} #{version} atom.gyp`
 end
 
 desc "Update CEF to the latest version specified by the prebuilt-cef submodule"

atom.gyp

@@ -2,6 +2,8 @@
   'variables': {
     'pkg-config': 'pkg-config',
     'chromium_code': 1,
+    'version%': "<!(git rev-parse --short HEAD)",
+    'code_sign%': 0,
     'use_aura%': 0,
     'conditions': [
       ['OS=="win"', {
@@ -45,7 +47,7 @@
       },
     },
     'xcode_settings': {
-      'VERSION': "<!(git rev-parse --short HEAD)",
+      'VERSION': "<(version)",
       'CLANG_CXX_LANGUAGE_STANDARD' : 'c++0x',
       'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0',
       'COMBINE_HIDPI_IMAGES': 'YES', # Removes 'Validate Project Settings' warning
@@ -75,8 +77,8 @@
         'LD_RUNPATH_SEARCH_PATHS': '@executable_path/../Frameworks',
       },
       'conditions': [
-        ['CODE_SIGN' , {
-          'xcode_settings': {'CODE_SIGN_IDENTITY': "<(CODE_SIGN)"},
+        ['code_sign' , {
+          'xcode_settings': {'CODE_SIGN_IDENTITY': "<(code_sign)"},
         }],
         ['OS=="win" and win_use_allocator_shim==1', {
           'dependencies': [
@@ -268,7 +270,7 @@
         'native/mac/English.lproj/MainMenu.xib',
       ],
       'conditions': [
-        ['CODE_SIGN', {
+        ['code_sign', {
           'defines': [
             'CODE_SIGNING_ENABLED=1',
           ],

package.json

@@ -15,7 +15,7 @@
     "async": "0.2.6",
     "nak": "0.2.12",
     "spellchecker": "0.3.0",
-    "pathwatcher": "0.2.0",
+    "pathwatcher": "0.1.5",
     "plist": "git://github.com/nathansobo/node-plist.git",
     "space-pen": "git://github.com/nathansobo/space-pen.git"
   },

script/constructicon/prebuild

@@ -1,9 +1,7 @@
 #!/bin/sh
 
 set -ex
-
 cd "$(dirname "$0")/../.."
-
 export PATH="/usr/local/Cellar/node/0.8.21/bin:/usr/local/bin:${PATH}"
-
+export VERSION=$VERSION
 rake setup-codesigning create-xcode-project