Merge pull request crosswalk-project#685 from rakuco/version-from-VER…

…SION [Build] Generate `xwalk_version' from the VERSION file.
kurli · Sep 17, 2013 · 27c7184 · 27c7184
2 parents 2f19f79 + 14519a6
commit 27c7184
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/VERSION b/VERSION
@@ -2,4 +2,3 @@ MAJOR=1
 MINOR=29
 BUILD=4
 PATCH=0
-
diff --git a/xwalk.gyp b/xwalk.gyp
@@ -1,7 +1,7 @@
 {
   'variables': {
     'xwalk_product_name': 'XWalk',
-    'xwalk_version': '1.29.4.0',
+    'xwalk_version': '<!(python ../chrome/tools/build/version.py -f VERSION -t "@MAJOR@.@MINOR@.@BUILD@.@PATCH@")',
     'conditions': [
       ['OS=="linux"', {
        'use_custom_freetype%': 1,

diff --git a/xwalk_android_app.gypi b/xwalk_android_app.gypi
@@ -16,6 +16,7 @@
             'output_file': '<(intermediate_dir)/version_java/XWalkRuntimeClientVersion.java',
           },
           'inputs': [
+            'VERSION',
             '<(template_file)',
             'build/android/generate_runtime_client_version.py',
           ],