[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[eric at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit b61f5c9ca25fb4e229967bc620e39d71c95a1d32
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 27 21:13:03 2010 +0000

    2010-12-27  Eric Seidel  <eric at webkit.org>
    
            Reviewed by Adam Barth.
    
            build-webkit should detect missing Java SDK and explain how to install it
            https://bugs.webkit.org/show_bug.cgi?id=51651
    
            * Scripts/build-webkit:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74694 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index f3c898c..0048a6e 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,12 @@
+2010-12-27  Eric Seidel  <eric at webkit.org>
+
+        Reviewed by Adam Barth.
+
+        build-webkit should detect missing Java SDK and explain how to install it
+        https://bugs.webkit.org/show_bug.cgi?id=51651
+
+        * Scripts/build-webkit:
+
 2010-12-26  Martin Robinson  <mrobinson at igalia.com>
 
         Reviewed by Daniel Bates.
diff --git a/Tools/Scripts/build-webkit b/Tools/Scripts/build-webkit
index a8f6aa8..f2ad272 100755
--- a/Tools/Scripts/build-webkit
+++ b/Tools/Scripts/build-webkit
@@ -43,6 +43,7 @@ use POSIX;
 
 sub formatBuildTime($);
 sub writeCongrats();
+sub checkForJavaSDK();
 
 my $originalWorkingDirectory = getcwd();
 chdirWebKit();
@@ -382,6 +383,7 @@ if (isGtk()) {
     push @options, "--prefix=" . $prefixPath if defined($prefixPath);
     push @options, "--makeargs=" . $makeArgs if defined($makeArgs);
 } elsif (isAppleMacWebKit()) {
+    checkForJavaSDK();
     push @options, XcodeOptions();
 
     sub option($$$)
@@ -558,6 +560,21 @@ writeCongrats();
 
 exit 0;
 
+sub checkForJavaSDK()
+{
+    my $jniHeader = "/System/Library/Frameworks/JavaVM.framework/Headers/jni.h";
+    if (-e $jniHeader) {
+        return;
+    }
+    print "\nCan't find required $jniHeader, build will fail.\n\n";
+    print "After installing \"Java for Mac OS X 10.6 Update 3\", the Java Developer Package is required to build WebKit.\n";
+    print "Please install the package from http://connect.apple.com (found under Dowloads > Java).\n\n";
+    print "For more information, see:\n";
+    print "https://lists.webkit.org/pipermail/webkit-dev/2010-October/014867.html\n";
+    print "https://webkit.org/building/tools.html\n\n";
+    exit 1;
+}
+
 sub formatBuildTime($)
 {
     my ($buildTime) = @_;

-- 
WebKit Debian packaging