From f486d19d62f1bc33246748b14b14a9dfa617b57f Mon Sep 17 00:00:00 2001
From: Iain Merrick <husky@google.com>
Date: Thu, 19 Aug 2010 17:55:56 +0100
Subject: Merge WebKit at r65615 : Initial merge by git.

Change-Id: Ifbf384f4531e3b58475a662e38195c2d9152ae79
---
 WebCore/combine-javascript-resources | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'WebCore/combine-javascript-resources')

diff --git a/WebCore/combine-javascript-resources b/WebCore/combine-javascript-resources
index 96dfc88..428b6b7 100755
--- a/WebCore/combine-javascript-resources
+++ b/WebCore/combine-javascript-resources
@@ -31,12 +31,14 @@ use Getopt::Long;
 use File::Basename;
 use File::Path;
 
+my $generatedScriptsDirectory;
 my $outputDirectory;
 my $scriptName;
 my $htmlFile;
 
 GetOptions('output-dir=s' => \$outputDirectory,
            'output-script-name=s' => \$scriptName,
+           'generated-scripts-dir=s' => \$generatedScriptsDirectory,
            'input-html=s' => \$htmlFile);
 
 unless (defined $htmlFile and defined $scriptName and defined $outputDirectory) {
@@ -62,7 +64,7 @@ open SCRIPT_OUT, ">", "$outputDirectory/$scriptName" or die "Can't open $outputD
 
 while ($headContents =~ m/<script.*src="([^"]*)"[^>]*>/gi) {
     local $/;
-    open SCRIPT_IN, "$htmlDirectory/$1" or die "Can't open $htmlDirectory/$1: $!";
+    open SCRIPT_IN, "$generatedScriptsDirectory/$1" or open SCRIPT_IN, "$htmlDirectory/$1" or die "Can't open $htmlDirectory/$1: $!";
     print SCRIPT_OUT "/* $1 */\n\n";
     print SCRIPT_OUT <SCRIPT_IN>;
     close SCRIPT_IN;
-- 
cgit v1.1