From d56946fa6e430a3ca0f6f3057f6f718c94f9bca5 Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@github.com>
Date: Wed, 10 Apr 2013 11:48:20 -0600
Subject: [PATCH 1/5] Export VERSION to rake task in prebuild script

---
 script/constructicon/prebuild | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/script/constructicon/prebuild b/script/constructicon/prebuild
index 734ca7c58..b759683d2 100755
--- a/script/constructicon/prebuild
+++ b/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

From 2cb18f5855d392e47ea8e49de5924373c7db3d56 Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@github.com>
Date: Wed, 10 Apr 2013 11:55:58 -0600
Subject: [PATCH 2/5] Allow gyp version var to be set from CLI, but default it
 to git HEAD.

---
 Rakefile | 3 ++-
 atom.gyp | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Rakefile b/Rakefile
index 4738d367f..a6cc7a56a 100644
--- a/Rakefile
+++ b/Rakefile
@@ -15,7 +15,8 @@ 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']
+  `gyp --depth=. -D CODE_SIGN="#{ENV['CODE_SIGN']}" #{version} atom.gyp`
 end
 
 desc "Update CEF to the latest version specified by the prebuilt-cef submodule"
diff --git a/atom.gyp b/atom.gyp
index b8ce02cc3..625578233 100644
--- a/atom.gyp
+++ b/atom.gyp
@@ -2,6 +2,7 @@
   'variables': {
     'pkg-config': 'pkg-config',
     'chromium_code': 1,
+    'version%': "<!(git rev-parse --short HEAD)",
     'use_aura%': 0,
     'conditions': [
       ['OS=="win"', {
@@ -45,7 +46,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

From 93cddcf8dcd3eb26accc99ba1de1344051e1553f Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@github.com>
Date: Wed, 10 Apr 2013 11:57:46 -0600
Subject: [PATCH 3/5] Make CODE_SIGN gyp var lowercase and :lipstick: it in
 Rakefile

---
 Rakefile | 3 ++-
 atom.gyp | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Rakefile b/Rakefile
index a6cc7a56a..bd8e4c7b7 100644
--- a/Rakefile
+++ b/Rakefile
@@ -16,7 +16,8 @@ task "create-xcode-project" => ["update-cef", "update-node"] do
   `rm -rf atom.xcodeproj`
   `script/generate-sources-gypi`
   version = %{-D version="#{ENV['VERSION']}"} if ENV['VERSION']
-  `gyp --depth=. -D CODE_SIGN="#{ENV['CODE_SIGN']}" #{version} atom.gyp`
+  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"
diff --git a/atom.gyp b/atom.gyp
index 625578233..21675fd86 100644
--- a/atom.gyp
+++ b/atom.gyp
@@ -3,6 +3,7 @@
     'pkg-config': 'pkg-config',
     'chromium_code': 1,
     'version%': "<!(git rev-parse --short HEAD)",
+    'code_sign%': 0,
     'use_aura%': 0,
     'conditions': [
       ['OS=="win"', {
@@ -76,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': [
@@ -269,7 +270,7 @@
         'native/mac/English.lproj/MainMenu.xib',
       ],
       'conditions': [
-        ['CODE_SIGN', {
+        ['code_sign', {
           'defines': [
             'CODE_SIGNING_ENABLED=1',
           ],

From 57d9a7b22ef206d2492300e0cfe9c987550d820a Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Wed, 10 Apr 2013 15:08:26 -0700
Subject: [PATCH 4/5] Downgrade to pathwatcher 0.1

Closes #491
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 23116ab57..e6840ae7f 100644
--- a/package.json
+++ b/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.0",
     "plist": "git://github.com/nathansobo/node-plist.git",
     "space-pen": "git://github.com/nathansobo/space-pen.git"
   },

From 9597d4ea52e95598eef123d2d85cda129c3382f1 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Wed, 10 Apr 2013 15:17:12 -0700
Subject: [PATCH 5/5] Upgrade to pathwatcher 0.1.5

This version is the last known good one pre-0.2
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index e6840ae7f..fda9c4579 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
     "async": "0.2.6",
     "nak": "0.2.12",
     "spellchecker": "0.3.0",
-    "pathwatcher": "0.1.0",
+    "pathwatcher": "0.1.5",
     "plist": "git://github.com/nathansobo/node-plist.git",
     "space-pen": "git://github.com/nathansobo/space-pen.git"
   },