diff options
Diffstat (limited to 'WebKitTools/Scripts')
| -rwxr-xr-x | WebKitTools/Scripts/build-webkit | 29 | ||||
| -rwxr-xr-x | WebKitTools/Scripts/do-webcore-rename | 24 | ||||
| -rwxr-xr-x | WebKitTools/Scripts/gdb-safari | 3 | ||||
| -rw-r--r--[-rwxr-xr-x] | WebKitTools/Scripts/generate-coverage-data | 0 | ||||
| -rwxr-xr-x | WebKitTools/Scripts/run-javascriptcore-tests | 3 | ||||
| -rw-r--r-- | WebKitTools/Scripts/webkitdirs.pm | 6 |
6 files changed, 13 insertions, 52 deletions
diff --git a/WebKitTools/Scripts/build-webkit b/WebKitTools/Scripts/build-webkit index f4c99e6..4cd8817 100755 --- a/WebKitTools/Scripts/build-webkit +++ b/WebKitTools/Scripts/build-webkit @@ -39,7 +39,6 @@ use POSIX; my $originalWorkingDirectory = getcwd(); -my $crossDocumentMessagingSupport = 1; my $databaseSupport = 1; my $iconDatabaseSupport = 1; my $svgSupport = 1; @@ -56,17 +55,11 @@ my $coverageSupport = 0; my $videoSupport = isOSX() || isCygwin(); # Enable by default on OSX and Windows my $showHelp = 0; my $clean = 0; -my $buildUniversal = 0; -my $buildSixtyFourBit = 0; my $programName = basename($0); my $usage = <<EOF; Usage: $programName [options] [options to pass to build system] --help Show this help message - --clean Perform a clean build - --universal Build 2-way universal (PPC and Intel 32-bit) - --64-bit Build 64-bit, combine with --universal to build 4-way universal - --[no-]cross-document-messaging Toggle cross-document messaging support (default: $crossDocumentMessagingSupport) --[no-]database Toggle Database Support (default: $databaseSupport) --[no-]icon-database Toggle Icon database support (default: $iconDatabaseSupport) --[no-]svg Toggle SVG support (default: $svgSupport) @@ -84,8 +77,7 @@ Usage: $programName [options] [options to pass to build system] --[no-]coverage Toggle code coverage support (default: $coverageSupport) EOF -GetOptions('cross-document-messaging!' => \$crossDocumentMessagingSupport, - 'database!' => \$databaseSupport, +GetOptions('database!' => \$databaseSupport, 'icon-database!' => \$iconDatabaseSupport, 'svg!' => \$svgSupport, 'svg-experimental!' => \$svgExperimentalSupport, @@ -100,8 +92,6 @@ GetOptions('cross-document-messaging!' => \$crossDocumentMessagingSupport, 'video!' => \$videoSupport, 'coverage!' => \$coverageSupport, 'help' => \$showHelp, - 'universal' => \$buildUniversal, - '64-bit' => \$buildSixtyFourBit, 'clean' => \$clean); if ($showHelp) { @@ -150,7 +140,6 @@ if (isWx()) { my $productDir = productDir(); my @overrideFeatureDefinesOption = (); -push @overrideFeatureDefinesOption, "ENABLE_CROSS_DOCUMENT_MESSAGING" if $crossDocumentMessagingSupport; push @overrideFeatureDefinesOption, "ENABLE_DATABASE" if $databaseSupport; push @overrideFeatureDefinesOption, "ENABLE_ICONDATABASE" if $iconDatabaseSupport; push @overrideFeatureDefinesOption, "ENABLE_SVG" if $svgSupport; @@ -190,24 +179,8 @@ if ($clean && isOSX()) { push(@options, "clean"); } -if ($buildSixtyFourBit && isOSX()) { - my $cpuVendor = `sysctl -n machdep.cpu.vendor`; - chomp $cpuVendor; - - if ($buildUniversal) { - push(@options, "ARCHS=ppc ppc64 i386 x86_64"); - } elsif ($cpuVendor eq "GenuineIntel") { - push(@options, "ARCHS=i386 x86_64"); - } else { - push(@options, "ARCHS=ppc ppc64"); - } -} elsif ($buildUniversal && isOSX()) { - push(@options, "ARCHS=ppc i386"); -} - # enable autotool options accordingly if ($ENV{WEBKITAUTOTOOLS}) { - push @options, autotoolsFlag($crossDocumentMessagingSupport, "cross-document-messaging"); push @options, autotoolsFlag($databaseSupport, "database"); push @options, autotoolsFlag($iconDatabaseSupport, "icon-database"); push @options, autotoolsFlag($svgSupport, "svg"); diff --git a/WebKitTools/Scripts/do-webcore-rename b/WebKitTools/Scripts/do-webcore-rename index 36f894a..24b14a3 100755 --- a/WebKitTools/Scripts/do-webcore-rename +++ b/WebKitTools/Scripts/do-webcore-rename @@ -1,6 +1,6 @@ #!/usr/bin/perl -w -# Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved. +# Copyright (C) 2006, 2007 Apple Inc. All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -43,7 +43,6 @@ my %words; my @paths; find(\&wanted, "JavaScriptCore"); -find(\&wanted, "JavaScriptGlue"); find(\&wanted, "WebCore"); find(\&wanted, "WebKit"); @@ -68,10 +67,9 @@ sub wanted } my %renames = ( - "XSLTProcessorPrototypeTable" => "JSXSLTProcessorPrototypeTable", + "ArrayInstance" => "JSArray", "ActivationImp" => "Activation", "ActivationImpData" => "ActivationData", - "ArrayInstance" => "JSArray", "ArrayObjectImp" => "ArrayConstructor", "ArrayProtoFuncConcat" => "ArrayFunctionConcat", "ArrayProtoFuncEvery" => "ArrayFunctionEvery", @@ -145,25 +143,22 @@ my %renames = ( "ErrorObjectImp" => "ErrorConstructor", "ErrorProtoFuncToString" => "ErrorFunction", "FRAMES_ON_STACK" => "numFramesOnStack", - "FTPDirectoryTokenizer" => "FTPDirectoryDocumentBuilder", - "FunctionImp" => "JSFunction", + "FunctionImp" => "Function", "FunctionObjectImp" => "FunctionConstructor", "FunctionProtoFunc" => "FunctionFunction", - "GetterSetterImp" => "JSGetterSetter", + "GetterSetterImp" => "GetterSetter", "GlobalFuncImp" => "GlobalFunction", "GlobalImp" => "TestGlobalObject", "HTMLGenericFormElement" => "HTMLFormControlElement", "HTMLGenericFormElement_h" => "HTMLFormControlElement_h", - "HTMLTokenizer" => "HTMLDocumentBuilder", "ImageConstructorImp" => "JSImageConstructor", - "ImageTokenizer" => "ImageDocumentBuilder", "InternalFunctionImp" => "InternalFunction", "JSXMLHttpRequestConstructorImp" => "JSXMLHttpRequestConstructor", "KURL" => "URL", "KURLCFNet" => "URLCF", "KURLMac" => "URLMac", "KURL_H_" => "URL_h", - "List" => "JSArgumentList", + "List" => "ArgumentList", "MathObjectImp" => "MathObject", "MathProtoFuncACos" => "MathFunctionACos", "MathProtoFuncASin" => "MathFunctionASin", @@ -192,7 +187,6 @@ my %renames = ( "ObjcFallbackObjectImp" => "ObjCFallbackObject", "ObjectObjectImp" => "ObjectConstructor", "ObjectProtoFunc" => "ObjectFunction", - "PluginTokenizer" => "PluginDocumetBuilder", "RECURSIVE_MATCH_STARTNG_NEW_GROUP" => "RECURSIVE_MATCH_NEW_GROUP", "RegExpImp" => "RegExpObject", "RegExpObjectImp" => "RegExpConstructor", @@ -238,11 +232,7 @@ my %renames = ( "StringProtoFuncToUpperCase" => "StringFunctionToUpperCase", "StringProtoFuncValueOf" => "StringFunctionValueOf", "TestFunctionImp" => "TestFunction", - "TextTokenizer" => "TextDocumentBuilder", "ThreadSafeShared" => "ThreadSafeRefCounted", - "Tokenizer" => "DocumentBuilder", - "Tokenizer_h" => "DocumentBuilder_h", - "XMLTokenizer" => "XMLDocumentBuilder", "XSLTProcessorConstructorImp" => "JSXSLTProcessorConstructor", "XSLTProcessorPrototype" => "JSXSLTProcessorPrototype", "animationController" => "animation", @@ -251,7 +241,6 @@ my %renames = ( "class_charcount" => "classCharCount", "class_lastchar" => "classLastChar", "codeptr" => "codePtr", - "createTokenizer" => "createBuilder", "domString" => "string", "equalIgnoringCase" => "equalFoldingCase", "errorcodeptr" => "errorCodePtr", @@ -261,7 +250,6 @@ my %renames = ( "first_char" => "firstChar", "firstbyte" => "firstByte", "groupsetfirstbyte" => "didGroupSetFirstByte", - "isHTMLTokenizer" => "isHTMLDocumentBuilder", "is_quantifier" => "isQuantifier", "isclass" => "isClass", "kjs_binding" => "JSDOMBinding", @@ -271,7 +259,6 @@ my %renames = ( "kjs_proxy" => "ScriptController", "kjs_proxy_h" => "ScriptController_h", "last_branch" => "lastBranch", - "m_tokenizer" => "m_builder", "mclength" => "mcLength", "negate_class" => "negateClass", "offsetcount" => "offsetCount", @@ -293,7 +280,6 @@ my %renames = ( "skipbytes" => "skipBytes", "subfirstbyte" => "subFirstByte", "subreqbyte" => "subReqByte", - "tokenizerProcessedData" => "documentBuilderProcessedData", "top_backref" => "topBackref", "top_bracket" => "topBracket", "using_temporary_offsets" => "usingTemporaryOffsets", diff --git a/WebKitTools/Scripts/gdb-safari b/WebKitTools/Scripts/gdb-safari index b94dc12..026856c 100755 --- a/WebKitTools/Scripts/gdb-safari +++ b/WebKitTools/Scripts/gdb-safari @@ -47,11 +47,8 @@ die "Can't find gdb executable. Is gdb installed?\n" unless -x $gdbPath; checkFrameworks(); # Put a command to set DYLD_FRAMEWORK_PATH in a temp file. -# Also set WEBKIT_UNSET_DYLD_FRAMEWORK_PATH to YES in this environment, so that -# executables launched by Safari don't inherit using the new frameworks. my ($fh, $path) = mkstemp("/tmp/gdb-safari-XXXX"); print $fh "set env DYLD_FRAMEWORK_PATH $productDir\n"; -print $fh "set env WEBKIT_UNSET_DYLD_FRAMEWORK_PATH YES\n"; # Start up Safari. print "Start Safari under gdb with DYLD_FRAMEWORK_PATH set to point to built WebKit in $productDir.\n"; diff --git a/WebKitTools/Scripts/generate-coverage-data b/WebKitTools/Scripts/generate-coverage-data index 7ed36aa..7ed36aa 100755..100644 --- a/WebKitTools/Scripts/generate-coverage-data +++ b/WebKitTools/Scripts/generate-coverage-data diff --git a/WebKitTools/Scripts/run-javascriptcore-tests b/WebKitTools/Scripts/run-javascriptcore-tests index 16522ca..b47d630 100755 --- a/WebKitTools/Scripts/run-javascriptcore-tests +++ b/WebKitTools/Scripts/run-javascriptcore-tests @@ -77,7 +77,8 @@ setConfigurationProductDir(Cwd::abs_path($root)) if (defined($root)); if(!defined($root)){ chdirWebKit(); - push(@xcodeArgs, "--" . $configuration); + my @args; + push(@args, "--" . $configuration); # FIXME: These should be stored per-config and ignored here push(@xcodeArgs, "--qt") if isQt(); diff --git a/WebKitTools/Scripts/webkitdirs.pm b/WebKitTools/Scripts/webkitdirs.pm index 478da8a..ecebf94 100644 --- a/WebKitTools/Scripts/webkitdirs.pm +++ b/WebKitTools/Scripts/webkitdirs.pm @@ -315,7 +315,11 @@ sub installedSafariPath if (isOSX()) { $safariBundle = "/Applications/Safari.app"; } elsif (isCygwin()) { - $safariBundle = `"$configurationProductDir/FindSafari.exe"`; + my $findSafariName = "FindSafari"; + $findSafariName .= "_debug" if $configuration ne "Release"; + $findSafariName .= ".exe"; + + $safariBundle = `"$configurationProductDir/$findSafariName"`; $safariBundle =~ s/[\r\n]+$//; $safariBundle = `cygpath -u '$safariBundle'`; $safariBundle =~ s/[\r\n]+$//; |