Revert Files I didn't intend to commit

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@58350 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Makefile.shared b/Makefile.shared
index 9ccb0891dba02baa12114b59dd07a8e2092cd0c5..aa9fa728d6d9c25197bd8d62d39bc06aa6812c3f 100644 (file)
--- a/Makefile.shared
+++ b/Makefile.shared
@@ -10,7 +10,7 @@ debug d development dev develop: force
 
 release r deployment dep deploy: force
        $(SCRIPTS_PATH)/set-webkit-configuration --release
-       ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) &&  exit $${PIPESTATUS[0]} )
+       ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
 
 clean:
        ( xcodebuild $(OTHER_OPTIONS) -alltargets clean $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )

diff --git a/WebKit/WebKit.xcodeproj/project.pbxproj b/WebKit/WebKit.xcodeproj/project.pbxproj
index 5ab7c3447fc605290d770e018f2c2e53bc77e046..e6bbab584ac716ee4dedb9f964831037e41d5dbd 100644 (file)
--- a/WebKit/WebKit.xcodeproj/project.pbxproj
+++ b/WebKit/WebKit.xcodeproj/project.pbxproj
@@ -1712,7 +1712,7 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/sh;
-                       shellScript = "if [[ \"${MACOSX_DEPLOYMENT_TARGET}\" > \"10.5\" && \"${CONFIGURATION}\" != \"Production\" && \"${ACTION}\" == \"build\" ]]; then \n   if [[ ! -e \"${CONFIGURATION_BUILD_DIR}/WebKit.framework/WebKitPluginHost.app\" ]]; then\n       if [[ -e \"${PROJECT_DIR}/../WebKitLibraries/WebKitPluginHost.app\" ]]; then\n           ln -s \"${PROJECT_DIR}/../WebKitLibraries/WebKitPluginHost.app\" \"${CONFIGURATION_BUILD_DIR}/WebKit.framework/WebKitPluginHost.app\"\n       else\n           ln -s /System/Library/Frameworks/WebKit.framework/WebKitPluginHost.app \"${CONFIGURATION_BUILD_DIR}/WebKit.framework/WebKitPluginHost.app\"\n       fi\n   fi\nfi\n";
+                       shellScript = "if [[ \"${MACOSX_DEPLOYMENT_TARGET}\" > \"10.5\" && \"${CONFIGURATION}\" != \"Production\" && \"${ACTION}\" == \"build\" ]]; then\n    if [[ ! -e \"${CONFIGURATION_BUILD_DIR}/WebKit.framework/WebKitPluginHost.app\" ]]; then\n       ln -s /System/Library/Frameworks/WebKit.framework/WebKitPluginHost.app \"${CONFIGURATION_BUILD_DIR}/WebKit.framework/WebKitPluginHost.app\"\n    fi\nfi\n";
                };
                9337D6540EBFE54D00DA3CB5 /* Check For Exit Time Destructors */ = {
                        isa = PBXShellScriptBuildPhase;

diff --git a/WebKitLibraries/WebKitPluginHost.app/Contents/Info.plist b/WebKitLibraries/WebKitPluginHost.app/Contents/Info.plist
index 0d00a3f408d8d01916e83f052e58069087e35fb9..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/WebKitLibraries/WebKitPluginHost.app/Contents/Info.plist
+++ b/WebKitLibraries/WebKitPluginHost.app/Contents/Info.plist
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>CFBundleExecutable</key>
-       <string>WebKitPluginHost</string>
-       <key>CFBundleIdentifier</key>
-       <string>com.apple.WebKit.PluginHost</string>
-       <key>CFBundleInfoDictionaryVersion</key>
-       <string>6.0</string>
-       <key>CFBundleName</key>
-       <string>WebKitPluginHost</string>
-       <key>CFBundlePackageType</key>
-       <string>APPL</string>
-       <key>CFBundleShortVersionString</key>
-       <string>6533</string>
-       <key>CFBundleSignature</key>
-       <string>????</string>
-       <key>CFBundleVersion</key>
-       <string>6533.5</string>
-       <key>LSMinimumSystemVersion</key>
-       <string>10.6.0</string>
-       <key>LSUIElement</key>
-       <true/>
-</dict>
-</plist>

diff --git a/WebKitLibraries/WebKitPluginHost.app/Contents/PkgInfo b/WebKitLibraries/WebKitPluginHost.app/Contents/PkgInfo
index bd04210fb49f6032c3cd79559334dbe735a998ef..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/WebKitLibraries/WebKitPluginHost.app/Contents/PkgInfo
+++ b/WebKitLibraries/WebKitPluginHost.app/Contents/PkgInfo
@@ -1 +0,0 @@
-APPL????
\ No newline at end of file

diff --git a/WebKitTools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj b/WebKitTools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj
index f6c30fdf802819cf3f33839577f6b2260a4bcca1..3adfaf20a9cfb8936512d31af38df44b49c086e6 100644 (file)
--- a/WebKitTools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj
+++ b/WebKitTools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj
@@ -817,7 +817,7 @@
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = BCB281EE0CFA713D007E533E /* Base.xcconfig */;
                        buildSettings = {
-                               WEBKIT_FRAMEWORK_RESOURCES_PATH = /AppleInternal/WebKitTools;
+                               WEBKIT_FRAMEWORK_RESOURCES_PATH = WebKit.framework/Versions/A/Resources;
                        };
                        name = Production;
                };
@@ -833,7 +833,7 @@
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = BCB281F00CFA713D007E533E /* DumpRenderTree.xcconfig */;
                        buildSettings = {
-                               INSTALL_PATH = "$(WEBKIT_FRAMEWORK_RESOURCES_PATH)";
+                               INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Frameworks/$(WEBKIT_FRAMEWORK_RESOURCES_PATH)";
                                SKIP_INSTALL = NO;
                        };
                        name = Production;
@@ -842,7 +842,7 @@
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = BCB283D80CFA7AFD007E533E /* ImageDiff.xcconfig */;
                        buildSettings = {
-                               INSTALL_PATH = "$(WEBKIT_FRAMEWORK_RESOURCES_PATH)";
+                               INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Frameworks/$(WEBKIT_FRAMEWORK_RESOURCES_PATH)";
                                SKIP_INSTALL = NO;
                        };
                        name = Production;
@@ -851,7 +851,7 @@
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = BCB283DE0CFA7C20007E533E /* TestNetscapePlugIn.xcconfig */;
                        buildSettings = {
-                               INSTALL_PATH = "$(WEBKIT_FRAMEWORK_RESOURCES_PATH)";
+                               INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Frameworks/$(WEBKIT_FRAMEWORK_RESOURCES_PATH)";
                                SKIP_INSTALL = NO;
                        };
                        name = Production;

diff --git a/WebKitTools/Scripts/parse-malloc-history b/WebKitTools/Scripts/parse-malloc-history
index d5db7772c048061aad0996ca6740bf008dab32bc..177de1c903cf6d2511d8f44fb7c7c81f47ca1de2 100755 (executable)
--- a/WebKitTools/Scripts/parse-malloc-history
+++ b/WebKitTools/Scripts/parse-malloc-history
@@ -113,8 +113,6 @@ sub main()
             }
         }
         
-        $line =~ s/(\|\s*0x[0-9a-f]+\s*\|)/\|/g;
-        
         # Then give up
         next if (!$callCount || !$byteCount);
         

diff --git a/WebKitTools/Scripts/run-javascriptcore-tests b/WebKitTools/Scripts/run-javascriptcore-tests
index 9e0f45e78da09d695220ba6c00175d76c20d6f61..fb4c388c787cd610ed0a0f3999477a4db23b7f43 100755 (executable)
--- a/WebKitTools/Scripts/run-javascriptcore-tests
+++ b/WebKitTools/Scripts/run-javascriptcore-tests
@@ -108,6 +108,7 @@ sub testapiPath($)
 {
     my ($productDir) = @_;
     my $jscName = "testapi";
+    $jscName .= "_debug"  if (isCygwin() && ($configuration eq "Debug"));
     return "$productDir/$jscName";
 }
 

diff --git a/WebKitTools/Scripts/webkitdirs.pm b/WebKitTools/Scripts/webkitdirs.pm
index d93ee0a8277bc436c5ca103ab116b67227c46d87..6f3ca96fb85a998c665a1954d8f3366a45704e32 100644 (file)
--- a/WebKitTools/Scripts/webkitdirs.pm
+++ b/WebKitTools/Scripts/webkitdirs.pm
@@ -231,6 +231,7 @@ sub jscPath($)
 {
     my ($productDir) = @_;
     my $jscName = "jsc";
+    $jscName .= "_debug"  if (isCygwin() && ($configuration eq "Debug"));
     return "$productDir/$jscName";
 }