Change by Toby Peterson <toby@opendarwin.org>.

        Reviewed by me.

        * Scripts/build-webkit: Changes so you can build with Xcode 2.1. (I also added a license to this file.)
        * Scripts/run-safari: Ditto.

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

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 10575059ecd17538ca942f875e6d58b49135a802..3e79ee25b054797738340852383f54feeb9bd00e 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,11 @@
+2005-06-07  Darin Adler  <darin@apple.com>
+
+        Change by Toby Peterson <toby@opendarwin.org>.
+        Reviewed by me.
+
+        * Scripts/build-webkit: Changes so you can build with Xcode 2.1. (I also added a license to this file.)
+        * Scripts/run-safari: Ditto.
+
 2005-06-06  Maciej Stachowiak  <mjs@apple.com>
 
         * Scripts/build-webkit: run ranlib on libWebKitSystemInterface.a

diff --git a/WebKitTools/Scripts/build-webkit b/WebKitTools/Scripts/build-webkit
index e933d173454be6111b28e064b92e79fa099b7fe5..6fa96ddbea976b6562cb09625bbb121c8074fc52 100755 (executable)
--- a/WebKitTools/Scripts/build-webkit
+++ b/WebKitTools/Scripts/build-webkit
@@ -1,5 +1,31 @@
 #!/usr/bin/perl -w
 
+# Copyright (C) 2005 Apple Computer, Inc.  All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1.  Redistributions of source code must retain the above copyright
+#     notice, this list of conditions and the following disclaimer. 
+# 2.  Redistributions in binary form must reproduce the above copyright
+#     notice, this list of conditions and the following disclaimer in the
+#     documentation and/or other materials provided with the distribution. 
+# 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+#     its contributors may be used to endorse or promote products derived
+#     from this software without specific prior written permission. 
+#
+# THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 # Simplified build script for Web Kit Open Source Project.
 
 use strict;
@@ -38,14 +64,20 @@ for my $dir (@projects, @otherDirs) {
     }
 }
 
+# Copy library and header from WebKitLibraries to a findable place in the product directory.
 chdir "WebKitLibraries" or die;
-print "${productDir}/libWebKitSystemInterface.a";
+print "${productDir}/libWebKitSystemInterface.a\n";
 `ditto libWebKitSystemInterface.a "${productDir}/libWebKitSystemInterface.a"`;
 `ranlib "${productDir}/libWebKitSystemInterface.a"`;
 `mkdir -p "${productDir}/usr/local/include"`;
 `ditto WebKitSystemInterface.h "${productDir}/usr/local/include/WebKitSystemInterface.h"`;
 chdir ".." or die;
 
+# Make symlinks so Xcode 2.1 can find the WebKitLibraries files.
+`mkdir -p "${productDir}/${style}"`;
+`ln -fs "../usr" "${productDir}/${style}"`;
+`ln -fs "../libWebKitSystemInterface.a" "${productDir}/${style}"`;
+
 # Build, and abort if the build fails.
 for my $dir (@projects) {
     chdir $dir or die;

diff --git a/WebKitTools/Scripts/run-safari b/WebKitTools/Scripts/run-safari
index 8ac4d2645bb79588eb6c38995527fb14b78bc54c..f3b4294d6d1ce2539eea95e8a122eae94bba3be7 100755 (executable)
--- a/WebKitTools/Scripts/run-safari
+++ b/WebKitTools/Scripts/run-safari
@@ -1,5 +1,31 @@
 #!/usr/bin/perl -w
 
+# Copyright (C) 2005 Apple Computer, Inc.  All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1.  Redistributions of source code must retain the above copyright
+#     notice, this list of conditions and the following disclaimer. 
+# 2.  Redistributions in binary form must reproduce the above copyright
+#     notice, this list of conditions and the following disclaimer in the
+#     documentation and/or other materials provided with the distribution. 
+# 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+#     its contributors may be used to endorse or promote products derived
+#     from this software without specific prior written permission. 
+#
+# THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 # Simplified build script for Web Kit Open Source Project.
 
 use strict;
@@ -17,6 +43,13 @@ if (!$productDir) {
     die "No product directory set. Please set the 'Place Build Products' preference to 'Customized location' in XCode Building Preferences.\n";
 }
 
+# Try to find Xcode 2.1 build products; prefer Deployment if both are present.
+if (-d "$productDir/Deployment") {
+    $productDir = "$productDir/Deployment";
+} elsif (-d "$productDir/Development") {
+    $productDir = "$productDir/Development";
+}
+
 # Check to see that Safari is there.
 my $safariPath = "/Applications/Safari.app/Contents/MacOS/Safari";
 if (! -x $safariPath) {