mirror of
https://github.com/atom/atom.git
synced 2026-01-23 05:48:10 -05:00
Allow gyp version var to be set from CLI, but default it to git HEAD.
This commit is contained in:
3
Rakefile
3
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"
|
||||
|
||||
3
atom.gyp
3
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
|
||||
|
||||
Reference in New Issue
Block a user