Skip to content
Permalink
Browse files
Remove build-webkit dependency on Java SDK for Apple Mac WebKit.
<http://webkit.org/b/101492>

Patch by Andreas Kling <akling@apple.com> on 2012-11-07
Reviewed by Anders Carlsson.

Source/WebKit:

* WebKit.xcodeproj/project.pbxproj: Remove WebJavaPlugIn.h

Source/WebKit/mac:

* Plugins/WebJavaPlugIn.h: Removed.

Tools:

Don't check for a Java SDK before building the Apple Mac port. It's no longer needed for
the build after the Java bridge was removed.

* Scripts/build-webkit:
(cMakeArgsFromFeatures):

Canonical link: https://commits.webkit.org/119596@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@133799 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
Andreas Kling authored and webkit-commit-queue committed Nov 7, 2012
1 parent 4d098ca commit ad07a3ce306f9ecc09e63415c7287f3a9e5330aa
Showing with 31 additions and 21 deletions.
  1. +9 −0 Source/WebKit/ChangeLog
  2. +0 −4 Source/WebKit/WebKit.xcodeproj/project.pbxproj
  3. +9 −0 Source/WebKit/mac/ChangeLog
  4. +13 −0 Tools/ChangeLog
  5. +0 −17 Tools/Scripts/build-webkit
@@ -1,3 +1,12 @@
2012-11-07 Andreas Kling <akling@apple.com>

Remove build-webkit dependency on Java SDK for Apple Mac WebKit.
<http://webkit.org/b/101492>

Reviewed by Anders Carlsson.

* WebKit.xcodeproj/project.pbxproj: Remove WebJavaPlugIn.h

2012-11-06 Laszlo Gombos <l.gombos@samsung.com>

[EFL] Simplify the build system
@@ -234,7 +234,6 @@
9398109C0824BF01008DF038 /* WebFrameInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 930D02BD06275F710076701E /* WebFrameInternal.h */; };
9398109D0824BF01008DF038 /* WebDOMOperationsPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 84AE905F062DE6A80075BBF9 /* WebDOMOperationsPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
9398109E0824BF01008DF038 /* WebEditingDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = BE4FBECB0653DF47005EDE15 /* WebEditingDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; };
939810A00824BF01008DF038 /* WebJavaPlugIn.h in Headers */ = {isa = PBXBuildFile; fileRef = 51863EFC065419EB00E9E8DD /* WebJavaPlugIn.h */; settings = {ATTRIBUTES = (Public, ); }; };
939810A10824BF01008DF038 /* WebHTMLViewInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 93185DB506679F42005D5E7E /* WebHTMLViewInternal.h */; };
939810A20824BF01008DF038 /* WebNSObjectExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = 93D1FE13067EB10B009CE68A /* WebNSObjectExtras.h */; };
939810A40824BF01008DF038 /* WebPDFView.h in Headers */ = {isa = PBXBuildFile; fileRef = 51E94C3406C0321200A9B09E /* WebPDFView.h */; };
@@ -510,7 +509,6 @@
516F296F03A6C45A00CA2D3A /* WebHistoryItemInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebHistoryItemInternal.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
5185F62510712B80007AA393 /* WebNavigationData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebNavigationData.h; sourceTree = "<group>"; };
5185F62710712B97007AA393 /* WebNavigationData.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebNavigationData.mm; sourceTree = "<group>"; };
51863EFC065419EB00E9E8DD /* WebJavaPlugIn.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebJavaPlugIn.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
51A8B52E04282B5900CA2D3A /* WebFrameView.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebFrameView.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
51A8B52F04282B5900CA2D3A /* WebFrameView.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebFrameView.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
51A8B53204282BD200CA2D3A /* WebFrameViewInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebFrameViewInternal.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
@@ -1121,7 +1119,6 @@
848DFF430365F71500CA2ACA /* WebKit Plug-ins */ = {
isa = PBXGroup;
children = (
51863EFC065419EB00E9E8DD /* WebJavaPlugIn.h */,
848DFF840365FE6A00CA2ACA /* WebPlugin.h */,
848DFF850365FE6A00CA2ACA /* WebPluginContainer.h */,
65E1150307EFFEBF009B8BF7 /* WebPluginContainerCheck.h */,
@@ -1517,7 +1514,6 @@
06693DDC0BFBA85200216072 /* WebInspectorClient.h in Headers */,
B804176F1217A83100466BAE /* WebInspectorFrontend.h in Headers */,
7A8FF0D11075024A00A80A08 /* WebInspectorPrivate.h in Headers */,
939810A00824BF01008DF038 /* WebJavaPlugIn.h in Headers */,
939810420824BF01008DF038 /* WebJavaScriptTextInputPanel.h in Headers */,
37D1DCA81065928C0068F7EF /* WebJSPDFDoc.h in Headers */,
939810850824BF01008DF038 /* WebKeyGenerator.h in Headers */,
@@ -1,3 +1,12 @@
2012-11-07 Andreas Kling <akling@apple.com>

Remove build-webkit dependency on Java SDK for Apple Mac WebKit.
<http://webkit.org/b/101492>

Reviewed by Anders Carlsson.

* Plugins/WebJavaPlugIn.h: Removed.

2012-11-06 Adam Barth <abarth@webkit.org>

Unreviewed attempt to fix the chromium-mac build.
@@ -1,3 +1,16 @@
2012-11-07 Andreas Kling <akling@apple.com>

Remove build-webkit dependency on Java SDK for Apple Mac WebKit.
<http://webkit.org/b/101492>

Reviewed by Anders Carlsson.

Don't check for a Java SDK before building the Apple Mac port. It's no longer needed for
the build after the Java bridge was removed.

* Scripts/build-webkit:
(cMakeArgsFromFeatures):

2012-11-07 Christophe Dumez <christophe.dumez@intel.com>

[EFL][WK2] Allow client to override setWindowFrame() / getWindowFrame()
@@ -43,7 +43,6 @@ use webkitperl::FeatureList qw(getFeatureOptionList);
use POSIX;

sub cMakeArgsFromFeatures();
sub checkForJavaSDK();
sub formatBuildTime($);
sub writeCongrats();

@@ -220,7 +219,6 @@ if (isGtk()) {
push @options, "--prefix=" . $prefixPath if defined($prefixPath);
push @options, "--makeargs=" . $makeArgs if $makeArgs;
} elsif (isAppleMacWebKit()) {
checkForJavaSDK();
push @options, XcodeOptions();

sub option($$$)
@@ -430,21 +428,6 @@ sub cMakeArgsFromFeatures()
return @args;
}

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 Downloads > 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) = @_;

0 comments on commit ad07a3c

Please sign in to comment.