diff options
| author | Iain Merrick <husky@google.com> | 2010-08-19 17:55:56 +0100 |
|---|---|---|
| committer | Iain Merrick <husky@google.com> | 2010-08-23 11:05:40 +0100 |
| commit | f486d19d62f1bc33246748b14b14a9dfa617b57f (patch) | |
| tree | 195485454c93125455a30e553a73981c3816144d /WebCore/combine-javascript-resources | |
| parent | 6ba0b43722d16bc295606bec39f396f596e4fef1 (diff) | |
| download | external_webkit-f486d19d62f1bc33246748b14b14a9dfa617b57f.zip external_webkit-f486d19d62f1bc33246748b14b14a9dfa617b57f.tar.gz external_webkit-f486d19d62f1bc33246748b14b14a9dfa617b57f.tar.bz2 | |
Merge WebKit at r65615 : Initial merge by git.
Change-Id: Ifbf384f4531e3b58475a662e38195c2d9152ae79
Diffstat (limited to 'WebCore/combine-javascript-resources')
| -rwxr-xr-x | WebCore/combine-javascript-resources | 4 |
1 files changed, 3 insertions, 1 deletions
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; |