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] 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