From 6799ef0ac57bb5c206d0e2d4106cd4b41de1fe7a Mon Sep 17 00:00:00 2001
From: "mpcomplete@chromium.org"
 <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Thu, 13 Nov 2008 20:32:25 +0000
Subject: Add builder for Safari resource files.  Had to restructure some input
 files.

I also moved GetInputs into the utils file.
Review URL: http://codereview.chromium.org/10671

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5370 0039d316-1c4b-4281-b951-d872f2087c98
---
 gears/SConscript.installers | 23 ++++-------------------
 1 file changed, 4 insertions(+), 19 deletions(-)

(limited to 'gears/SConscript.installers')

diff --git a/gears/SConscript.installers b/gears/SConscript.installers
index f755420..665c4ec 100644
--- a/gears/SConscript.installers
+++ b/gears/SConscript.installers
@@ -5,6 +5,7 @@
 import os
 import re
 import subprocess
+import utils
 
 Import('env')
 
@@ -23,24 +24,7 @@ env = env.Clone(
     BASE_OUTDIR = env.Entry('$BASE_OUTDIR').path,
 )
 
-ff3_resources = [
-    '$FF3_OUTDIR/genfiles/browser-overlay.js',
-    '$FF3_OUTDIR/genfiles/browser-overlay.xul',
-    '$FF3_OUTDIR/genfiles/permissions_dialog.html',
-    '$FF3_OUTDIR/genfiles/settings_dialog.html',
-    '$FF3_OUTDIR/genfiles/shortcuts_dialog.html',
-]
-
-common_resources = [
-    '$OPEN_DIR/ui/common/blank.gif',
-    '$OPEN_DIR/ui/common/button_bg.gif',
-    '$OPEN_DIR/ui/common/button_corner_black.gif',
-    '$OPEN_DIR/ui/common/button_corner_blue.gif',
-    '$OPEN_DIR/ui/common/button_corner_grey.gif',
-    '$OPEN_DIR/ui/common/icon_32x32.png',
-    '$OPEN_DIR/ui/common/local_data.png',
-    '$OPEN_DIR/ui/common/location_data.png',
-]
+def GetInputs(var): return utils.GetInputs(var, env)
 
 def Shell(cmd):
   """Execute a shell command and return the output."""
@@ -172,7 +156,8 @@ def FirefoxInstaller(env):
       ('/', ['$FF3_OUTDIR/genfiles/install.rdf',
              '$FF3_OUTDIR/genfiles/chrome.manifest']),
       ('lib/', ['$OPEN_DIR/base/firefox/static_files/lib/updater.js']),
-      ('chrome/chromeFiles/content/', ff3_resources + common_resources),
+      ('chrome/chromeFiles/content/',
+          GetInputs('$FF3_RESOURCES $COMMON_RESOURCES')),
       ('chrome/chromeFiles/locale', ['$FF3_OUTDIR/genfiles/i18n']),
       ('components/',
           ['$FF3_OUTDIR/gears.xpt',
-- 
cgit v1.1