Attachment 368363 Details for Bug 197249 – PATCH

[patch] PATCH

197249.diff (text/plain), 11.34 KB, created by Basuke Suzuki on 2019-04-26 16:49:28 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Basuke Suzuki

Created: 2019-04-26 16:49:28 PDT

Size: 11.34 KB

patch

obsolete

>ÿþdiff --git a/ChangeLog b/ChangeLog
>index a83e5700d2f..e37b2c15ad7 100644
>--- a/ChangeLog
>+++ b/ChangeLog
>@@ -1,3 +1,16 @@
>+2019-04-26  Basuke Suzuki  <Basuke.Suzuki@sony.com>
>+
>+        [Win] Add flag to enable version information stamping and disable by default.
>+        https://bugs.webkit.org/show_bug.cgi?id=197249
>+        <rdar://problem/50224412>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        This feature is only used in AppleWin port. Add flag for this task and make it OFF by default.
>+        Then enable it by default on AppleWin.
>+
>+        * Source/cmake/OptionsWin.cmake:
>+
> 2019-04-25  Alex Christensen  <achristensen@webkit.org>
> 
>         Start using C++17
>diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt
>index ab69001d005..a12c0748d60 100644
>--- a/Source/JavaScriptCore/CMakeLists.txt
>+++ b/Source/JavaScriptCore/CMakeLists.txt
>@@ -1319,7 +1319,7 @@ endif ()
> add_custom_target(stageSharedScripts DEPENDS ${JavaScriptCore_SCRIPTS})
> add_dependencies(JavaScriptCore stageSharedScripts ${JavaScriptCore_EXTRA_DEPENDENCIES})
> 
>-if (MSVC)
>+if (USE_VERSION_STAMPER)
>     add_custom_command(
>         TARGET JavaScriptCore
>         PRE_BUILD
>diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
>index a8ad475f4d4..29ae5d9b68c 100644
>--- a/Source/JavaScriptCore/ChangeLog
>+++ b/Source/JavaScriptCore/ChangeLog
>@@ -1,3 +1,16 @@
>+2019-04-26  Basuke Suzuki  <Basuke.Suzuki@sony.com>
>+
>+        [Win] Add flag to enable version information stamping and disable by default.
>+        https://bugs.webkit.org/show_bug.cgi?id=197249
>+        <rdar://problem/50224412>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        This feature is only used in AppleWin port. Add flag for this task and make it OFF by default.
>+        Then enable it by default on AppleWin.
>+
>+        * CMakeLists.txt:
>+
> 2019-04-25  Timothy Hatcher  <timothy@apple.com>
> 
>         Disable date and time inputs on iOSMac.
>diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
>index 19817b6019b..87abc3be88d 100644
>--- a/Source/WTF/ChangeLog
>+++ b/Source/WTF/ChangeLog
>@@ -1,3 +1,16 @@
>+2019-04-26  Basuke Suzuki  <Basuke.Suzuki@sony.com>
>+
>+        [Win] Add flag to enable version information stamping and disable by default.
>+        https://bugs.webkit.org/show_bug.cgi?id=197249
>+        <rdar://problem/50224412>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        This feature is only used in AppleWin port. Add flag for this task and make it OFF by default.
>+        Then enable it by default on AppleWin.
>+
>+        * wtf/CMakeLists.txt:
>+
> 2019-04-25  Timothy Hatcher  <timothy@apple.com>
> 
>         Disable date and time inputs on iOSMac.
>diff --git a/Source/WTF/wtf/CMakeLists.txt b/Source/WTF/wtf/CMakeLists.txt
>index 6ccacc8ca05..5a8bb51b94a 100644
>--- a/Source/WTF/wtf/CMakeLists.txt
>+++ b/Source/WTF/wtf/CMakeLists.txt
>@@ -512,7 +512,9 @@ WEBKIT_MAKE_FORWARDING_HEADERS(WTF
> if (MSVC)
>     set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SUBSYSTEM:WINDOWS")
>     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:WINDOWS")
>+endif ()
> 
>+if (USE_VERSION_STAMPER)
>     add_custom_command(
>         TARGET WTF
>         PRE_BUILD
>diff --git a/Source/cmake/OptionsWin.cmake b/Source/cmake/OptionsWin.cmake
>index 0b46991befb..d89cbff7e7e 100644
>--- a/Source/cmake/OptionsWin.cmake
>+++ b/Source/cmake/OptionsWin.cmake
>@@ -14,6 +14,8 @@ endif ()
> 
> WEBKIT_OPTION_BEGIN()
> 
>+WEBKIT_OPTION_DEFINE(USE_VERSION_STAMPER "Toggle stamping version information during build" PRIVATE OFF)
>+
> # FIXME: Most of these options should not be public.
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_3D_TRANSFORMS PUBLIC ON)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCELERATED_2D_CANVAS PUBLIC OFF)
>@@ -98,6 +100,7 @@ else ()
>     WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INTL PUBLIC OFF)
>     WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PUBLIC_SUFFIX_LIST PRIVATE OFF)
>     WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL PUBLIC OFF)
>+    WEBKIT_OPTION_DEFAULT_PORT_VALUE(USE_VERSION_STAMPER PRIVATE ON)
> endif ()
> 
> WEBKIT_OPTION_END()
>diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
>index b011b47aa32..354b539bc70 100644
>--- a/WebKitLibraries/ChangeLog
>+++ b/WebKitLibraries/ChangeLog
>@@ -1,3 +1,15 @@
>+2019-04-26  Basuke Suzuki  <Basuke.Suzuki@sony.com>
>+
>+        [Win] Add flag to enable version information stamping and disable by default.
>+        https://bugs.webkit.org/show_bug.cgi?id=197249
>+        <rdar://problem/50224412>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Modify script not to invoke SVN command if the directory for SVN doesn't exists.
>+
>+        * win/tools/scripts/auto-version.pl:
>+
> 2019-04-12  Wenson Hsieh  <wenson_hsieh@apple.com>
> 
>         [iOS] Software keyboard is shown too frequently on some websites
>diff --git a/WebKitLibraries/win/tools/scripts/auto-version.pl b/WebKitLibraries/win/tools/scripts/auto-version.pl
>index a70cc86174a..507bb33fce5 100755
>--- a/WebKitLibraries/win/tools/scripts/auto-version.pl
>+++ b/WebKitLibraries/win/tools/scripts/auto-version.pl
>@@ -83,9 +83,14 @@ if (!$ENVIRONMENT_VERSION) {
>     # an engineering build and we'll stamp the build with some more information.
> 
>     my $BUILD_DATE = localtime(time);
>-    my $SVN_REVISION = `svn info`;
>-    $SVN_REVISION =~ m/Revision: (\d+)/;
>-    $SVN_REVISION= $1;
>+    my $SVN_REVISION;
>+    if (-d File::Spec->catfile($thisDirectory, '.svn')) {
>+        $SVN_REVISION = `svn info`;
>+        $SVN_REVISION =~ m/Revision: (\d+)/;
>+        $SVN_REVISION= $1;
>+    } else {
>+        $SVN_REVISION = '';
>+    }
> 
>     chomp($BUILD_DATE);
>     chomp($SVN_REVISION);
>

Actions: View | Formatted Diff | Diff

Attachments on bug 197249: 368186 | 368256 | 368278 | 368363 | 368364 | 368466