Changeset 51932 in webkit

Timestamp:

Dec 9, 2009 4:58:41 PM (14 years ago)

Author:

eric@webkit.org

Message:

2009-12-09 Marwan Al Jubeh <​marwan.aljubeh@gmail.com>

Reviewed by Adam Roben.

Fixes: ​https://bugs.webkit.org/show_bug.cgi?id=31228
Set the WebKitOutputDir, WebKitLibrariesDir and Cygwin environment variables automatically
in Windows as part of running update_webkit.

• building/build.html:
  • removed the reference to forgetting to set environment variables as a common source of errors on Windows. This is because this patch would make it unnecessary for the user to set these variables manually.

2009-12-09 Marwan Al Jubeh <​marwan.aljubeh@gmail.com>

Reviewed by Adam Roben.

Fixes: ​https://bugs.webkit.org/show_bug.cgi?id=31228
Set the WebKitOutputDir, WebKitLibrariesDir and Cygwin environment variables automatically
in Windows as part of running update_webkit.

• Scripts/update-webkit:
  • Run setupAppleWinEnv() on Apple's Windows port.
• Scripts/webkitdirs.pm:
  • Added functions that return the source directory, libraries directory and default build directory on Windows.
  • Added isWindowsNT() which tests if the current Windows version is from the Windows NT family.
  • Implemented setupAppleWinEnv() which sets the environment variables WebKitOutputDir, WebKitLibrariesDir and Cygwin to their desired values.

Location:

trunk

Files:

• WebKitSite/ChangeLog (modified) (1 diff)
• WebKitSite/building/build.html (modified) (2 diffs)
• WebKitTools/ChangeLog (modified) (1 diff)
• WebKitTools/Scripts/update-webkit (modified) (1 diff)
• WebKitTools/Scripts/webkitdirs.pm (modified) (3 diffs)

trunk/WebKitSite/ChangeLog

@@ +1 @@
+2009-12-09  Marwan Al Jubeh  <marwan.aljubeh@gmail.com>
+
+        Reviewed by Adam Roben.
+
+        Fixes: https://bugs.webkit.org/show_bug.cgi?id=31228
+        Set the WebKitOutputDir, WebKitLibrariesDir and Cygwin environment variables automatically
+        in Windows as part of running update_webkit.
+
+        * building/build.html:
+         - removed the reference to forgetting to set environment variables as a common source of errors
+           on Windows. This is because this patch would make it unnecessary for the user to set these
+           variables manually.
+
 2009-12-09  Chris Jerdonek  <chris.jerdonek@gmail.com>
 

trunk/WebKitSite/building/build.html

@@ -28 +28 @@
 <p>By default, <tt>build-webkit</tt> places build products in <tt>WebKit/WebKitBuild</tt>.  You can specify a different build
 location on Mac in your Xcode preferences.  On Windows, the <tt>WEBKITOUTPUTDIR</tt> environment variable can be used to
-set a different build products location.  If you have set up a custom build location, then <tt>build-webkit</tt> will
+set a different build products location. If you have set up a custom build location, then <tt>build-webkit</tt> will
 place the build products there.</p>
 
@@ -36 +36 @@
 double check that the paths you set during <a href="http://msdn.microsoft.com/en-us/library/ms235626(VS.80).aspx">step 2 of the Platform SDK Installation</a>
 are still there and add them again if necessary.</p>
-<p>Another common error is forgetting to set the <tt>WEBKITOUTPUTDIR</tt> environment variable.  If you omit this step, you will get build errors when the WebKit build process begins generating code.  If you are not sure how to do this, Microsoft provides a good set of <a href="http://support.microsoft.com/kb/310519">instructions</a>.</p>
 <p>Don't forget that if you have any questions or problems building WebKit, feel free to <a href="/contact.html">get in touch!</a></p>
 </div>

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2009-12-09  Marwan Al Jubeh  <marwan.aljubeh@gmail.com>
+
+        Reviewed by Adam Roben.
+
+        Fixes: https://bugs.webkit.org/show_bug.cgi?id=31228
+        Set the WebKitOutputDir, WebKitLibrariesDir and Cygwin environment variables automatically
+        in Windows as part of running update_webkit.
+
+        * Scripts/update-webkit:
+         - Run setupAppleWinEnv() on Apple's Windows port.
+        * Scripts/webkitdirs.pm:
+         - Added functions that return the source directory, libraries directory and default build directory on Windows.
+         - Added isWindowsNT() which tests if the current Windows version is from the Windows NT family.
+         - Implemented setupAppleWinEnv() which sets the environment variables WebKitOutputDir, WebKitLibrariesDir
+           and Cygwin to their desired values.
+
 2009-12-09  Adam Barth  <abarth@webkit.org>
 

trunk/WebKitTools/Scripts/update-webkit

@@ -89 +89 @@
 }
 
+setupAppleWinEnv() if isAppleWinWebKit();
+
 exit 0;
 

trunk/WebKitTools/Scripts/webkitdirs.pm

@@ -68 +68 @@
 my $vcBuildPath;
 my $windowsTmpPath;
+my $windowsSourceDir;
 
 sub determineSourceDir
@@ -987 +988 @@
 }
 
+sub isWindowsNT()
+{
+    return $ENV{'OS'} eq 'Windows_NT';
+}
+
 sub relativeScriptsDir()
 {
@@ -1052 +1058 @@
     }
     # Win32 and other platforms may want to check for minimum config
+}
+
+sub determineWindowsSourceDir()
+{
+    return if $windowsSourceDir;
+    my $sourceDir = sourceDir();
+    chomp($windowsSourceDir = `cygpath -w $sourceDir`);
+}
+
+sub windowsSourceDir()
+{
+    determineWindowsSourceDir();
+    return $windowsSourceDir;
+}
+
+sub windowsLibrariesDir()
+{
+    return windowsSourceDir() . "\\WebKitLibraries\\win";
+}
+
+sub windowsOutputDir()
+{
+    return windowsSourceDir() . "\\WebKitBuild";
+}
+
+sub setupAppleWinEnv()
+{
+    return unless isAppleWinWebKit();
+
+    if (isWindowsNT()) {
+        my $restartNeeded = 0;
+        my %variablesToSet = ();
+
+        # Setting the environment variable 'CYGWIN' to 'tty' makes cygwin enable extra support (i.e., termios)
+        # for UNIX-like ttys in the Windows console
+        $variablesToSet{CYGWIN} = "tty" unless $ENV{CYGWIN};
+        
+        # Those environment variables must be set to be able to build inside Visual Studio.
+        $variablesToSet{WEBKITLIBRARIESDIR} = windowsLibrariesDir() unless $ENV{WEBKITLIBRARIESDIR};
+        $variablesToSet{WEBKITOUTPUTDIR} = windowsOutputDir() unless $ENV{WEBKITOUTPUTDIR};
+
+        foreach my $variable (keys %variablesToSet) {
+            print "Setting the Environment Variable '" . $variable . "' to '" . $variablesToSet{$variable} . "'\n\n";
+            system qw(regtool -s set), '\\HKEY_CURRENT_USER\\Environment\\' . $variable, $variablesToSet{$variable};
+            $restartNeeded ||= $variable eq "WEBKITLIBRARIESDIR" || $variable eq "WEBKITOUTPUTDIR";
+        }
+
+        if ($restartNeeded) {
+            print "Please restart your computer before attempting to build inside Visual Studio.\n\n";
+        }
+    } else {
+        if (!$ENV{'WEBKITLIBRARIESDIR'}) {
+            print "Warning: You must set the 'WebKitLibrariesDir' environment variable\n";
+            print "         to be able build WebKit from within Visual Studio.\n";
+            print "         Make sure that 'WebKitLibrariesDir' points to the\n";
+            print "         'WebKitLibraries/win' directory, not the 'WebKitLibraries/' directory.\n\n";
+        }
+        if (!$ENV{'WEBKITOUTPUTDIR'}) {
+            print "Warning: You must set the 'WebKitOutputDir' environment variable\n";
+            print "         to be able build WebKit from within Visual Studio.\n\n";
+        }
+    }
 }