Changeset 159806 in webkit

Timestamp:

Nov 26, 2013 10:05:27 PM (10 years ago)

Author:

marcelo.lira@openbossa.org

Message:

Nix upstreaming - Adding build files and supporting scripts
​https://bugs.webkit.org/show_bug.cgi?id=118367

Reviewed by Ryosuke Niwa.

.:

• CMakeLists.txt:
• Source/CMakeLists.txt:
• Source/cmake/FindEGL.cmake:
• Source/cmake/FindOpenGLES2.cmake: Added.
• Source/cmake/OptionsCommon.cmake:
• Source/cmake/OptionsNix.cmake: Added.

Source/Platform:

• CMakeLists.txt: Added.
• PlatformNix.cmake: Added.

Source/WebCore:

No new tests needed.

• CMakeLists.txt:
• PlatformNix.cmake: Added.

Source/WTF:

• wtf/FeatureDefines.h:
• wtf/Platform.h:
• wtf/PlatformNix.cmake: Added.

Tools:

• Scripts/build-webkit:
• Scripts/run-nix-tests: Added.
• Scripts/run-webkit-tests:
• Scripts/update-webkit-libs-jhbuild:
• Scripts/update-webkitnix-libs: Added.
• Scripts/webkitdirs.pm:

(determineArchitecture):
(argumentsForConfiguration):
(jscProductDir):
(builtDylibPathForName):
(determineIsNix):
(isNix):
(isAppleWebKit):
(launcherPath):
(launcherName):
(checkRequiredSystemConfig):
(copyInspectorFrontendFiles):
(jhbuildWrapperPrefixIfNeeded):
(buildCMakeProjectOrExit):
(cmakeBasedPortName):

• Scripts/webkitpy/common/config/ports.py:

(DeprecatedPort.port):
(EflWK2Port.build_webkit_command):
(NixPort):
(NixPort.build_webkit_command):

• Scripts/webkitpy/port/factory.py:

(platform_options):
(PortFactory):

• Scripts/webkitpy/port/nix.py: Added.

(NixPort):
(NixPort._wk2_port_name):
(NixPort.determine_full_port_name):
(NixPort.init):
(NixPort._port_flag_for_scripts):
(NixPort.setup_test_run):
(NixPort.setup_environ_for_server):
(NixPort.default_timeout_ms):
(NixPort.clean_up_test_run):
(NixPort._generate_all_test_configurations):
(NixPort._path_to_driver):
(NixPort._path_to_image_diff):
(NixPort._image_diff_command):
(NixPort._search_paths):
(NixPort.show_results_html_file):
(NixPort._port_specific_expectations_files):
(NixPort.default_baseline_search_path):

• Scripts/webkitpy/port/nix_unittest.py: Added.

(NixPortTest):
(NixPortTest._assert_search_path):
(NixPortTest._assert_expectations_files):
(NixPortTest.test_baseline_search_path):
(NixPortTest.test_expectations_files):
(NixPortTest.test_default_timeout_ms):

• jhbuild/jhbuild-wrapper:

(determine_platform):

• nix/common.py: Added.

(script_path):
(top_level_path):

• nix/jhbuild.modules: Added.
• nix/jhbuildrc: Added.

Location:

trunk

Files:

• CMakeLists.txt (modified) (2 diffs)
• ChangeLog (modified) (1 diff)
• Source/CMakeLists.txt (modified) (2 diffs)
• Source/Platform/CMakeLists.txt (added)
• Source/Platform/ChangeLog (modified) (1 diff)
• Source/Platform/PlatformNix.cmake (added)
• Source/WTF/ChangeLog (modified) (1 diff)
• Source/WTF/wtf/FeatureDefines.h (modified) (1 diff)
• Source/WTF/wtf/Platform.h (modified) (1 diff)
• Source/WTF/wtf/PlatformNix.cmake (added)
• Source/WebCore/CMakeLists.txt (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/PlatformNix.cmake (added)
• Source/cmake/FindEGL.cmake (modified) (1 diff)
• Source/cmake/FindOpenGLES2.cmake (added)
• Source/cmake/OptionsCommon.cmake (modified) (1 diff)
• Source/cmake/OptionsNix.cmake (added)
• Tools/ChangeLog (modified) (1 diff)
• Tools/Scripts/build-webkit (modified) (7 diffs)
• Tools/Scripts/run-nix-tests (added)
• Tools/Scripts/run-webkit-tests (modified) (2 diffs)
• Tools/Scripts/update-webkit-libs-jhbuild (modified) (4 diffs)
• Tools/Scripts/update-webkitnix-libs (added)
• Tools/Scripts/webkitdirs.pm (modified) (17 diffs)
• Tools/Scripts/webkitpy/common/config/ports.py (modified) (3 diffs)
• Tools/Scripts/webkitpy/port/factory.py (modified) (3 diffs)
• Tools/Scripts/webkitpy/port/nix.py (added)
• Tools/Scripts/webkitpy/port/nix_unittest.py (added)
• Tools/jhbuild/jhbuild-wrapper (modified) (2 diffs)
• Tools/nix (added)
• Tools/nix/common.py (added)
• Tools/nix/jhbuild.modules (added)
• Tools/nix/jhbuildrc (added)

trunk/CMakeLists.txt

@@ -11 +11 @@
 set(WEBKIT2_DIR "${CMAKE_SOURCE_DIR}/Source/WebKit2")
 set(THIRDPARTY_DIR "${CMAKE_SOURCE_DIR}/Source/ThirdParty")
+set(PLATFORM_DIR "${CMAKE_SOURCE_DIR}/Source/Platform")
 
 set(TOOLS_DIR "${CMAKE_SOURCE_DIR}/Tools")
@@ -40 +41 @@
 # Determine which port will be built
 # -----------------------------------------------------------------------------
-set(ALL_PORTS Efl WinCE BlackBerry GTK)
+set(ALL_PORTS Efl WinCE BlackBerry GTK Nix)
 set(PORT "NOPORT" CACHE STRING "choose which WebKit port to build (one of ${ALL_PORTS})")
 

trunk/ChangeLog

@@ +1 @@
+2013-11-26  Marcelo Lira  <marcelo.lira@openbossa.org>
+
+        Nix upstreaming - Adding build files and supporting scripts
+        https://bugs.webkit.org/show_bug.cgi?id=118367
+
+        Reviewed by Ryosuke Niwa.
+
+        * CMakeLists.txt:
+        * Source/CMakeLists.txt:
+        * Source/cmake/FindEGL.cmake:
+        * Source/cmake/FindOpenGLES2.cmake: Added.
+        * Source/cmake/OptionsCommon.cmake:
+        * Source/cmake/OptionsNix.cmake: Added.
+
 2013-11-25  Ryuan Choi  <ryuan.choi@samsung.com>
 

trunk/Source/CMakeLists.txt

@@ -5 +5 @@
 
 add_subdirectory(JavaScriptCore)
+
+if ("${PORT}" STREQUAL "Nix")
+    add_subdirectory(Platform)
+endif ()
 
 if (ENABLE_API_TESTS)
@@ -27 +31 @@
 # Set compiler flags for all targets
 # -----------------------------------------------------------------------------
+if ("${PORT}" STREQUAL "Nix")
+    if (NOT DISABLE_STRICT_BUILD)
+        set(ADDITIONAL_FLAGS ENABLE_WERROR)
+    endif ()
+    WEBKIT_SET_EXTRA_COMPILER_FLAGS(Platform ${ADDITIONAL_FLAGS})
+endif ()
+
 if (${PORT} STREQUAL "Efl")
     set(ADDITIONAL_FLAGS ENABLE_WERROR)

trunk/Source/Platform/ChangeLog

@@ +1 @@
+2013-11-26  Marcelo Lira  <marcelo.lira@openbossa.org>
+
+        Nix upstreaming - Adding build files and supporting scripts
+        https://bugs.webkit.org/show_bug.cgi?id=118367
+
+        Reviewed by Ryosuke Niwa.
+
+        * CMakeLists.txt: Added.
+        * PlatformNix.cmake: Added.
+
 2013-11-07  Denis Nomiyama  <d.nomiyama@samsung.com>
 

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2013-11-26  Marcelo Lira  <marcelo.lira@openbossa.org>
+
+        Nix upstreaming - Adding build files and supporting scripts
+        https://bugs.webkit.org/show_bug.cgi?id=118367
+
+        Reviewed by Ryosuke Niwa.
+
+        * wtf/FeatureDefines.h:
+        * wtf/Platform.h:
+        * wtf/PlatformNix.cmake: Added.
+
 2013-11-26  Drew Yao  <ayao@apple.com>
 

trunk/Source/WTF/wtf/FeatureDefines.h

@@ -286 +286 @@
 #endif /* PLATFORM(WIN_CAIRO) */
 
+/* --------- NIX port (Unix) --------- */
+#if PLATFORM(NIX)
+#include "nix/FeatureDefinesNix.h"
+#endif /* PLATFORM(NIX) */
+
 /* --------- EFL port (Unix) --------- */
 #if PLATFORM(EFL)

trunk/Source/WTF/wtf/Platform.h

@@ -453 +453 @@
 #elif defined(BUILDING_BLACKBERRY__)
 #define WTF_PLATFORM_BLACKBERRY 1
+#elif defined(BUILDING_NIX__)
+#include "nix/PlatformNix.h"
 #elif OS(DARWIN)
 #define WTF_PLATFORM_MAC 1

trunk/Source/WebCore/CMakeLists.txt

@@ -2858 +2858 @@
         "${WEBCORE_DIR}/platform/graphics/gpu"
     )
-    if (OPENGL_FOUND)
+    # Nix may use either OpenGL or OpenGLES2 headers, so we handle this at PlatformNix.cmake.
+    if (OPENGL_FOUND AND NOT PORT STREQUAL "Nix")
         list(APPEND WebCore_INCLUDE_DIRECTORIES
             ${OPENGL_INCLUDE_DIR}
@@ -2865 +2866 @@
             ${OPENGL_gl_LIBRARY}
         )
-    elseif (OPENGLES2_FOUND)
+    elseif (OPENGLES2_FOUND AND NOT PORT STREQUAL "Nix")
         list(APPEND WebCore_INCLUDE_DIRECTORIES
             ${OPENGLES2_INCLUDE_DIR}

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-11-26  Marcelo Lira  <marcelo.lira@openbossa.org>
+
+        Nix upstreaming - Adding build files and supporting scripts
+        https://bugs.webkit.org/show_bug.cgi?id=118367
+
+        Reviewed by Ryosuke Niwa.
+
+        No new tests needed.
+
+        * CMakeLists.txt:
+        * PlatformNix.cmake: Added.
+
 2013-11-26  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/cmake/FindEGL.cmake

@@ -36 +36 @@
 include(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(EGL DEFAULT_MSG EGL_INCLUDE_DIR EGL_LIBRARY)
+
+if (PORT STREQUAL "Nix")
+   mark_as_advanced(EGL_INCLUDE_DIR EGL_LIBRARY)
+endif ()

trunk/Source/cmake/OptionsCommon.cmake

@@ -1 @@
-add_definitions(-DBUILDING_WITH_CMAKE=1)
-add_definitions(-DHAVE_CONFIG_H=1)
+# Nix doesn't use cmakeconfig.h
+if (NOT PORT STREQUAL "Nix")
+    add_definitions(-DBUILDING_WITH_CMAKE=1)
+    add_definitions(-DHAVE_CONFIG_H=1)
+endif ()
 
 if (WTF_OS_UNIX)

trunk/Tools/ChangeLog

@@ +1 @@
+2013-11-26  Marcelo Lira  <marcelo.lira@openbossa.org>
+
+        Nix upstreaming - Adding build files and supporting scripts
+        https://bugs.webkit.org/show_bug.cgi?id=118367
+
+        Reviewed by Ryosuke Niwa.
+
+        * Scripts/build-webkit:
+        * Scripts/run-nix-tests: Added.
+        * Scripts/run-webkit-tests:
+        * Scripts/update-webkit-libs-jhbuild:
+        * Scripts/update-webkitnix-libs: Added.
+        * Scripts/webkitdirs.pm:
+        (determineArchitecture):
+        (argumentsForConfiguration):
+        (jscProductDir):
+        (builtDylibPathForName):
+        (determineIsNix):
+        (isNix):
+        (isAppleWebKit):
+        (launcherPath):
+        (launcherName):
+        (checkRequiredSystemConfig):
+        (copyInspectorFrontendFiles):
+        (jhbuildWrapperPrefixIfNeeded):
+        (buildCMakeProjectOrExit):
+        (cmakeBasedPortName):
+        * Scripts/webkitpy/common/config/ports.py:
+        (DeprecatedPort.port):
+        (EflWK2Port.build_webkit_command):
+        (NixPort):
+        (NixPort.build_webkit_command):
+        * Scripts/webkitpy/port/factory.py:
+        (platform_options):
+        (PortFactory):
+        * Scripts/webkitpy/port/nix.py: Added.
+        (NixPort):
+        (NixPort._wk2_port_name):
+        (NixPort.determine_full_port_name):
+        (NixPort.__init__):
+        (NixPort._port_flag_for_scripts):
+        (NixPort.setup_test_run):
+        (NixPort.setup_environ_for_server):
+        (NixPort.default_timeout_ms):
+        (NixPort.clean_up_test_run):
+        (NixPort._generate_all_test_configurations):
+        (NixPort._path_to_driver):
+        (NixPort._path_to_image_diff):
+        (NixPort._image_diff_command):
+        (NixPort._search_paths):
+        (NixPort.show_results_html_file):
+        (NixPort._port_specific_expectations_files):
+        (NixPort.default_baseline_search_path):
+        * Scripts/webkitpy/port/nix_unittest.py: Added.
+        (NixPortTest):
+        (NixPortTest._assert_search_path):
+        (NixPortTest._assert_expectations_files):
+        (NixPortTest.test_baseline_search_path):
+        (NixPortTest.test_expectations_files):
+        (NixPortTest.test_default_timeout_ms):
+        * jhbuild/jhbuild-wrapper:
+        (determine_platform):
+        * nix/common.py: Added.
+        (script_path):
+        (top_level_path):
+        * nix/jhbuild.modules: Added.
+        * nix/jhbuildrc: Added.
+
 2013-11-26  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Tools/Scripts/build-webkit

@@ -5 +5 @@
 # Copyright (C) 2010 moiji-mobile.com All rights reserved.
 # Copyright (C) 2011 Research In Motion Limited. All rights reserved.
+# Copyright (C) 2013 Nokia Corporation and/or its subsidiary(-ies).
 #
 # Redistribution and use in source and binary forms, with or without
@@ -37 +38 @@
 use File::Spec;
 use FindBin;
-use Getopt::Long qw(:config pass_through);
+use Getopt::Long qw(:config pass_through no_auto_abbrev);
 use lib $FindBin::Bin;
 use webkitdirs;
@@ -63 +64 @@
 my $coverageSupport = 0;
 my $startTime = time();
+my $curl = 0;
+my $opengles2 = 0;
 
 my @features = getFeatureOptionList();
+
+# Update defaults for the Nix port
+if (isNix()) {
+    # Instead of use FeatureList.pm to list enabled features, tell the compiler to
+    # parse Source/WTF/wtf/Platform.h and get the default values of all feature flags
+    # from the result.
+    my $portDefine = "BUILDING_".uc(cmakeBasedPortName())."__";
+    my $definitions = `gcc -E -P -dM -D$portDefine -I Source/WTF Source/WTF/wtf/Platform.h | grep '^#define ENABLE_\\w\\+ \[01\]\$\\|^#define WTF_USE_\\w\\+ \[01\]\$' | cut -d' ' -f2-3`;
+
+    my %featureDefaults;
+    foreach (split(/\n/, $definitions)) {
+        my @macroDefinition = split(/ /);
+        $featureDefaults{$macroDefinition[0]} = $macroDefinition[1];
+    }
+
+    @features = ();
+    foreach (sort keys %featureDefaults) {
+        next if (!/^ENABLE/);
+        my $optionName = lc $_;
+        $optionName =~ s/^enable_//;
+        $optionName =~ s/_/-/g;
+        my $descName = $optionName;
+        $descName =~ s/-/ /g;
+
+        push @features, {
+            option => $optionName,
+            desc => "Toggle $descName support",
+            define => $_,
+            default => $featureDefaults{$_}
+        };
+    }
+}
 
 # Additional environment parameters
@@ -95 +130 @@
   --blackberry                      Build the BlackBerry port on Mac/Linux
   --efl                             Build the EFL port
+  --nix                             Build the Nix port
   --gtk                             Build the GTK+ port
   --wincairo                        Build using Cairo (rather than CoreGraphics) on Windows
@@ -110 +146 @@
   --no-webkit1                      Omit WebKit1 code from the build (EFL/GTK only)
   --no-webkit2                      Omit WebKit2 code from the build
+
+  --curl                            Use libCurl as network backend (Nix only)
+  --opengles2                       Use EGL and OpenGLES2 instead of GLX (Nix only)
 
 EOF
@@ -126 +165 @@
     'no-webkit2' => \$noWebKit2,
     'coverage' => \$coverageSupport,
+    'curl' => \$curl,
+    'opengles2' => \$opengles2,
 );
 
@@ -230 +271 @@
     exit exitStatus($result) if exitStatus($result);
     @projects = ("Source/WebInspectorUI");
+}
+
+if (isNix()) {
+    if ($noWebKit2) {
+        print STDERR "Nix is a WebKit2 port, you can't disable WebKit2 on it!\n";
+        exit 1;
+    }
+
+    # By default we build using all of the available CPUs.
+    $makeArgs .= ($makeArgs ? " " : "") . "-j" . numberOfCPUs() if $makeArgs !~ /-j\s*\d+/;
+    $cmakeArgs = "-DWTF_USE_CURL=ON " . $cmakeArgs if $curl;
+    $cmakeArgs = "-DWTF_USE_OPENGL_ES_2=ON " . $cmakeArgs if $opengles2;
+
+    # We remove CMakeCache to avoid the bots to reuse cached flags when
+    # we enable new features. This forces a reconfiguration.
+    removeCMakeCache();
+
+    buildCMakeProjectOrExit($clean, "Nix", $prefixPath, $makeArgs, (cmakeBasedPortArguments(), cMakeArgsFromFeatures()), $cmakeArgs);
 }
 

trunk/Tools/Scripts/run-webkit-tests

@@ -2 +2 @@
 # Copyright (C) 2010 Google Inc. All rights reserved.
 # Copyright (C) 2013 Apple Inc. All rights reserved.
+# Copyright (C) 2013 Nokia Corporation and/or its subsidiary(-ies).
 #
 # Redistribution and use in source and binary forms, with or without
@@ -81 +82 @@
 } elsif (isEfl()) {
     push(@ARGV, "--efl");
+} elsif (isNix()) {
+    push(@ARGV, "--nix");
 } elsif (isWinCairo()) {
     push(@ARGV, "--wincairo");

trunk/Tools/Scripts/update-webkit-libs-jhbuild

@@ -2 +2 @@
 # Copyright (C) 2011 Igalia S.L.
 # Copyright (C) 2012 Intel Corporation
+# Copyright (C) 2013 Nokia Corporation and/or its subsidiary(-ies).
 #
 # This library is free software; you can redistribute it and/or
@@ -24 +25 @@
 my $platformEfl = 0;
 my $platformGtk = 0;
+my $platformNix = 0;
 
 my $getOptionsResult = GetOptions(
     'efl' => \$platformEfl,
-    'gtk' => \$platformGtk
+    'gtk' => \$platformGtk,
+    'nix' => \$platformNix
     );
 
 my $platform = "";
 if (!$getOptionsResult) {
-    die "No platform specified for " . basename($0) .". Use --gtk or --efl.\n";
+    die "No platform specified for " . basename($0) .". Use --gtk, --efl or --nix.\n";
 } else {
     if ($platformEfl) {
@@ -39 +42 @@
     if ($platformGtk) {
         $platform = "gtk";
+    }
+    if ($platformNix) {
+        $platform = "nix";
     }
 }
@@ -121 +127 @@
 chdir(relativeScriptsDir() . "/../jhbuild") or die $!;
 
-my %prettyPlatform = ( "efl" => "EFL", "gtk" => "GTK+" );
+my %prettyPlatform = ( "efl" => "EFL", "gtk" => "GTK+", "nix" => "Nix" );
 
 if (-e getJhbuildPath() && jhbuildConfigurationChanged()) {

trunk/Tools/Scripts/webkitdirs.pm

@@ -2 +2 @@
 # Copyright (C) 2009 Google Inc. All rights reserved.
 # Copyright (C) 2011 Research In Motion Limited. All rights reserved.
+# Copyright (C) 2013 Nokia Corporation and/or its subsidiary(-ies).
 #
 # Redistribution and use in source and binary forms, with or without
@@ -95 +96 @@
 my $isWin64;
 my $isEfl;
+my $isNix;
 my $isBlackBerry;
 my $isInspectorFrontend;
@@ -315 +317 @@
             }
         }
-    } elsif (isEfl()) {
+    } elsif (isEfl() || isNix()) {
         my $host_processor = "";
         $host_processor = `cmake --system-information | grep CMAKE_SYSTEM_PROCESSOR`;
@@ -325 +327 @@
     }
 
-    if (!$architecture && (isGtk() || isAppleMacWebKit() || isEfl())) {
+    if (!$architecture && (isGtk() || isAppleMacWebKit() || isEfl() || isNix())) {
         # Fall back to output of `arch', if it is present.
         $architecture = `arch`;
@@ -331 +333 @@
     }
 
-    if (!$architecture && (isGtk() || isAppleMacWebKit() || isEfl())) {
+    if (!$architecture && (isGtk() || isAppleMacWebKit() || isEfl() || isNix())) {
         # Fall back to output of `uname -m', if it is present.
         $architecture = `uname -m`;
@@ -380 +382 @@
     push(@args, '--gtk') if isGtk();
     push(@args, '--efl') if isEfl();
+    push(@args, '--nix') if isNix();
     push(@args, '--wincairo') if isWinCairo();
     push(@args, '--wince') if isWinCE();
@@ -530 +533 @@
 {
     my $productDir = productDir();
-    $productDir .= "/bin" if isEfl();
+    $productDir .= "/bin" if (isEfl() || isNix());
     $productDir .= "/Programs" if isGtk();
 
@@ -786 +789 @@
         }
         return "$configurationProductDir/lib/libewebkit.so";
+    }
+    if (isNix()) {
+        return "$configurationProductDir/lib/libWebKitNix.so";
     }
     if (isWinCE()) {
@@ -1040 +1046 @@
 }
 
+sub determineIsNix()
+{
+    return if defined($isNix);
+    $isNix = checkForArgumentAndRemoveFromARGV("--nix");
+}
+
+sub isNix()
+{
+    determineIsNix();
+    return $isNix;
+}
 sub isGtk()
 {
@@ -1190 +1207 @@
 sub isAppleWebKit()
 {
-    return !(isGtk() or isEfl() or isWinCE() or isBlackBerry());
+    return !(isGtk() or isEfl() or isWinCE() or isBlackBerry() or isNix());
 }
 
@@ -1381 +1398 @@
 {
     my $relativeScriptsPath = relativeScriptsDir();
-    if (isGtk() || isEfl() || isWinCE()) {
+    if (isGtk() || isEfl() || isWinCE() || isNix()) {
         return "$relativeScriptsPath/run-launcher";
     } elsif (isAppleWebKit()) {
@@ -1398 +1415 @@
     } elsif (isWinCE()) {
         return "WinCELauncher";
+    } elsif (isNix()) {
+        return "MiniBrowser";
     }
 }
@@ -1420 +1439 @@
             print "*************************************************************\n";
         }
-    } elsif (isGtk() or isEfl() or isWindows()) {
+    } elsif (isGtk() or isEfl() or isWindows() or isNix()) {
         my @cmds = qw(bison gperf flex);
         my @missing = ();
@@ -1639 +1658 @@
     } elsif (isAppleWinWebKit() || isWinCairo()) {
         $inspectorResourcesDirPath = $productDir . "/WebKit.resources/inspector";
-    } elsif (isGtk()) {
+    } elsif (isGtk() || isNix()) {
         my $prefix = $ENV{"WebKitInstallationPrefix"};
         $inspectorResourcesDirPath = (defined($prefix) ? $prefix : "/usr/share") . "/webkit-1.0/webinspector";
@@ -1952 +1971 @@
         } elsif (isGtk()) {
             push(@prefix, "--gtk");
+        } elsif (isNix()) {
+            push(@prefix, "--nix");
         }
         push(@prefix, "run");
@@ -2046 +2067 @@
     }
 
+    if (isNix() && checkForArgumentAndRemoveFromARGV("--update-nix")) {
+        system("perl", "$sourceDir/Tools/Scripts/update-webkitnix-libs") == 0 or die $!;
+    }
 
     $returnCode = exitStatus(generateBuildSystemFromCMakeProject($port, $prefixPath, @cmakeArgs));
@@ -2069 +2093 @@
     return "Efl" if isEfl();
     return "WinCE" if isWinCE();
+    return "Nix" if isNix();
     return "";
 }

trunk/Tools/Scripts/webkitpy/common/config/ports.py

@@ -1 +1 @@
 # Copyright (C) 2009, Google Inc. All rights reserved.
+# Copyright (C) 2013 Nokia Corporation and/or its subsidiary(-ies).
 #
 # Redistribution and use in source and binary forms, with or without
@@ -71 +72 @@
             "efl": EflPort,
             "efl-wk2": EflWK2Port,
+            "nix": NixPort,
         }
         default_port = {
@@ -231 +233 @@
         command.append(super(EflWK2Port, self).makeArgs())
         return command
+
+
+class NixPort(DeprecatedPort):
+    port_flag_name = "nix"
+
+    def build_webkit_command(self, build_style=None):
+        command = super(NixPort, self).build_webkit_command(build_style=build_style)
+        command.append("--nix")
+        command.append("--update-nix")
+        command.append(super(NixPort, self).makeArgs())
+        return command

trunk/Tools/Scripts/webkitpy/port/factory.py

@@ -1 +1 @@
 # Copyright (C) 2010 Google Inc. All rights reserved.
 # Copyright (C) 2013 Apple Inc. All rights reserved.
+# Copyright (C) 2013 Nokia Corporation and/or its subsidiary(-ies).
 #
 # Redistribution and use in source and binary forms, with or without
@@ -47 +48 @@
             const=('efl*' if use_globs else 'efl'),
             help=('Alias for --platform=efl*' if use_globs else 'Alias for --platform=efl')),
+        optparse.make_option('--nix', action='store_const', dest='platform',
+            const=('nix'), help=('Alias for --platform=nix')),
         optparse.make_option('--gtk', action='store_const', dest='platform',
             const=('gtk*' if use_globs else 'gtk'),
@@ -76 +79 @@
     PORT_CLASSES = (
         'efl.EflPort',
+        'nix.NixPort',
         'gtk.GtkPort',
         'mac.MacPort',

trunk/Tools/jhbuild/jhbuild-wrapper

@@ -3 +3 @@
 # Copyright (C) 2012 Gustavo Noronha Silva <gns@gnome.org>
 # 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
@@ -98 +99 @@
     if '--gtk' in sys.argv:
         return "gtk";
+    if '--nix' in sys.argv:
+        return "nix";
     raise ValueError('No platform specified for jhbuild-wrapper.')