Index: chromecast/chromecast.gyp |
diff --git a/chromecast/chromecast.gyp b/chromecast/chromecast.gyp |
index c9335f0093c20bf3130278d0200fc6b7c3b74f61..ff324ce3f8eed3d22e15e972eba6d4ec52de9ebe 100644 |
--- a/chromecast/chromecast.gyp |
+++ b/chromecast/chromecast.gyp |
@@ -6,6 +6,7 @@ |
'variables': { |
'android_support_v13_target%': |
'../third_party/android_tools/android_tools.gyp:android_support_v13_javalib', |
+ 'cast_build_release': 'internal/build/cast_build_release', |
'chromium_code': 1, |
'chromecast_branding%': 'Chromium', |
'disable_display%': 0, |
@@ -260,8 +261,12 @@ |
'python', |
'<(version_py_path)', |
'-e', 'VERSION_FULL="<(version_full)"', |
- # Revision is taken from buildbot if available; otherwise, a dev string is used. |
- '-e', 'CAST_BUILD_REVISION="<!(echo ${CAST_BUILD_REVISION:="eng.${USER}.<!(date +%Y%m%d.%H%M%S)"})"', |
+ # CAST_BUILD_INCREMENTAL is taken from buildbot if available; |
+ # otherwise, a dev string is used. |
+ '-e', 'CAST_BUILD_INCREMENTAL="<!(echo ${CAST_BUILD_INCREMENTAL:="<!(date +%Y%m%d.%H%M%S)"})"', |
+ # CAST_BUILD_RELEASE is taken from cast_build_release file if exist; |
+ # otherwize, a dev string is used. |
gunsch
2015/01/23 17:33:30
nit: otherwize --> otherwise
byungchul
2015/01/23 17:51:27
Done.
|
+ '-e', 'CAST_BUILD_RELEASE="<!(if [[ -f <(cast_build_release) ]]; then cat <(cast_build_release); else echo eng.${USER}; fi)"', |
gunsch
2015/01/23 17:33:30
Do we know for sure that gyp uses bash shells to r
byungchul
2015/01/23 17:51:27
Done.
|
'-e', 'CAST_IS_DEBUG_BUILD=1 if "<(CONFIGURATION_NAME)" == "Debug" else 0', |
'common/version.h.in', |
'<@(_outputs)', |