Diff
Modified: trunk/Tools/ChangeLog (164359 => 164360)
--- trunk/Tools/ChangeLog 2014-02-19 08:43:28 UTC (rev 164359)
+++ trunk/Tools/ChangeLog 2014-02-19 09:41:17 UTC (rev 164360)
@@ -1,3 +1,22 @@
+2014-02-19 Zan Dobersek <[email protected]>
+
+ Remove the remaining Nix cruft under Tools
+ https://bugs.webkit.org/show_bug.cgi?id=129003
+
+ Reviewed by Csaba Osztrogonác.
+
+ The Nix port was removed from the source tree so the remaining Nix-specific code
+ in the utility scripts is not required anymore.
+
+ * Scripts/run-nix-tests: Removed.
+ * Scripts/update-webkitnix-libs: Removed.
+ * Scripts/webkitpy/style/checker.py:
+ * jhbuild/jhbuild-wrapper:
+ (determine_platform):
+ * nix/common.py: Removed.
+ * nix/jhbuild.modules: Removed.
+ * nix/jhbuildrc: Removed.
+
2014-02-18 Jinwoo Song <[email protected]>
[EFL][MiniBrowser] Remove view_mode parameter in window_create()
Deleted: trunk/Tools/Scripts/run-nix-tests (164359 => 164360)
--- trunk/Tools/Scripts/run-nix-tests 2014-02-19 08:43:28 UTC (rev 164359)
+++ trunk/Tools/Scripts/run-nix-tests 2014-02-19 09:41:17 UTC (rev 164360)
@@ -1,44 +0,0 @@
-#!/usr/bin/perl -w
-# Copyright (C) 2012 Intel Corporation. All rights reserved.
-# Copyright (C) 2012, 2013 Nokia Corporation and/or its subsidiary(-ies).
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * 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.
-# * Neither the name of Intel Corporation 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 THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
-# OWNER OR 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.
-
-use strict;
-use FindBin;
-use lib $FindBin::Bin;
-use webkitdirs;
-
-setConfiguration();
-
-# Manually add this for jhbuildWrapperPrefixIfNeeded().
-push(@ARGV, "--nix");
-
-# Tell CTest to dump gtest output in case of failure.
-$ENV{CTEST_OUTPUT_ON_FAILURE} = "1";
-
-buildCMakeProjectOrExit(0, "Nix", undef, "test", cmakeBasedPortArguments());
Deleted: trunk/Tools/Scripts/update-webkitnix-libs (164359 => 164360)
--- trunk/Tools/Scripts/update-webkitnix-libs 2014-02-19 08:43:28 UTC (rev 164359)
+++ trunk/Tools/Scripts/update-webkitnix-libs 2014-02-19 09:41:17 UTC (rev 164360)
@@ -1,24 +0,0 @@
-#!/usr/bin/perl -w
-# Copyright (C) 2012 Intel Corporation
-# Copyright (C) 2012, 2013 Nokia Corporation and/or its subsidiary(-ies).
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-use FindBin;
-use lib $FindBin::Bin;
-use webkitdirs;
-
-my $scriptsDir = relativeScriptsDir();
-system("perl", "$scriptsDir/update-webkit-libs-jhbuild", "--nix", @ARGV) == 0 or die $!;
Modified: trunk/Tools/Scripts/webkitpy/style/checker.py (164359 => 164360)
--- trunk/Tools/Scripts/webkitpy/style/checker.py 2014-02-19 08:43:28 UTC (rev 164359)
+++ trunk/Tools/Scripts/webkitpy/style/checker.py 2014-02-19 09:41:17 UTC (rev 164360)
@@ -175,11 +175,7 @@
([# Header files in ForwardingHeaders have no header guards or
# exceptional header guards (e.g., WebCore_FWD_Debugger_h).
- "/ForwardingHeaders/",
- # Nix platform API classes uses common names under Nix namespace
- # so the include guards should also include the namespace to avoid
- # name clashes.
- "Source/Platform/nix"],
+ "/ForwardingHeaders/"],
["-build/header_guard"]),
([# assembler has lots of opcodes that use underscores, so
# we don't check for underscores in that directory.
Modified: trunk/Tools/jhbuild/jhbuild-wrapper (164359 => 164360)
--- trunk/Tools/jhbuild/jhbuild-wrapper 2014-02-19 08:43:28 UTC (rev 164359)
+++ trunk/Tools/jhbuild/jhbuild-wrapper 2014-02-19 09:41:17 UTC (rev 164360)
@@ -98,8 +98,6 @@
return "efl";
if '--gtk' in sys.argv:
return "gtk";
- if '--nix' in sys.argv:
- return "nix";
raise ValueError('No platform specified for jhbuild-wrapper.')
