Add 'optional' field and sync definitions in all FILES.cfg.

TEST=python tools/build/scripts/common/archive_utils_unittest.py --realfiles --src-base=.

Review URL: https://chromiumcodereview.appspot.com/9309050

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120241 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 32 insertions, 3 deletions

diff --git a/chrome/tools/build/chromeos/FILES.cfg b/chrome/tools/build/chromeos/FILES.cfg
index 9dad2ce..8159c02 100644
--- a/chrome/tools/build/chromeos/FILES.cfg
+++ b/chrome/tools/build/chromeos/FILES.cfg
@@ -1,7 +1,7 @@
 # -*- python -*-
 # ex: set syntax=python:
 
-# Copyright (c) 2011 The Chromium Authors. All rights reserved.
+# Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
@@ -13,6 +13,15 @@
 #           (values are based on the strings returned by python's
 #           platform.architecture() function).
 # buildtype: List of build types for which this file should be processed.
+# archive: The name of the archive file to store filename in. If not specified,
+#          filename is added to the default archive (e.g. platform.zip). If
+#          archive == filename, filename is archived directly, not zipped.
+# direct_archive: Force a file to be archived as-is, bypassing zip creation.
+#                 NOTE: This flag will not apply if more than one file has the
+#                 same 'archive' name, which will create a zip of all the
+#                 files instead.
+# optional: List of buildtypes for which the file might not exist, and it's not
+#           considered an error.
 
 FILES = [
   {
diff --git a/chrome/tools/build/linux/FILES.cfg b/chrome/tools/build/linux/FILES.cfg
index cecda8e..49df1a8 100644
--- a/chrome/tools/build/linux/FILES.cfg
+++ b/chrome/tools/build/linux/FILES.cfg
@@ -1,7 +1,7 @@
 # -*- python -*-
 # ex: set syntax=python:
 
-# Copyright (c) 2011 The Chromium Authors. All rights reserved.
+# Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
@@ -13,6 +13,15 @@
 #           (values are based on the strings returned by python's
 #           platform.architecture() function).
 # buildtype: List of build types for which this file should be processed.
+# archive: The name of the archive file to store filename in. If not specified,
+#          filename is added to the default archive (e.g. platform.zip). If
+#          archive == filename, filename is archived directly, not zipped.
+# direct_archive: Force a file to be archived as-is, bypassing zip creation.
+#                 NOTE: This flag will not apply if more than one file has the
+#                 same 'archive' name, which will create a zip of all the
+#                 files instead.
+# optional: List of buildtypes for which the file might not exist, and it's not
+#           considered an error.
 
 FILES = [
   {
diff --git a/chrome/tools/build/mac/FILES.cfg b/chrome/tools/build/mac/FILES.cfg
index 1e1bed7..543cc2a 100644
--- a/chrome/tools/build/mac/FILES.cfg
+++ b/chrome/tools/build/mac/FILES.cfg
@@ -1,7 +1,7 @@
 # -*- python -*-
 # ex: set syntax=python:
 
-# Copyright (c) 2010 The Chromium Authors. All rights reserved.
+# Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
@@ -18,6 +18,15 @@
 #           buildbot scripts. Tagging them all as both 32bit and 64bit is the
 #           safest bet.
 # buildtype: List of build types for which this file should be processed.
+# archive: The name of the archive file to store filename in. If not specified,
+#          filename is added to the default archive (e.g. platform.zip). If
+#          archive == filename, filename is archived directly, not zipped.
+# direct_archive: Force a file to be archived as-is, bypassing zip creation.
+#                 NOTE: This flag will not apply if more than one file has the
+#                 same 'archive' name, which will create a zip of all the
+#                 files instead.
+# optional: List of buildtypes for which the file might not exist, and it's not
+#           considered an error.
 
 FILES = [
   {
diff --git a/chrome/tools/build/win/FILES.cfg b/chrome/tools/build/win/FILES.cfg
index a229aa6..16e1fe6 100644
--- a/chrome/tools/build/win/FILES.cfg
+++ b/chrome/tools/build/win/FILES.cfg
@@ -20,6 +20,8 @@
 #                 NOTE: This flag will not apply if more than one file has the
 #                 same 'archive' name, which will create a zip of all the
 #                 files instead.
+# optional: List of buildtypes for which the file might not exist, and it's not
+#           considered an error.
 
 FILES = [
   {