Log Message
Merge r172982. <rdar://problem/18141695>
Modified Paths
- branches/safari-600.1-branch/Tools/ChangeLog
- branches/safari-600.1-branch/Tools/Scripts/webkitperl/auto-version_unittest/autoVersionTests.pl
- branches/safari-600.1-branch/Tools/Scripts/webkitperl/auto-version_unittest/versionStampTests.pl
- branches/safari-600.1-branch/WebKitLibraries/ChangeLog
- branches/safari-600.1-branch/WebKitLibraries/win/tools/scripts/auto-version.pl
- branches/safari-600.1-branch/WebKitLibraries/win/tools/scripts/version-stamp.pl
Diff
Modified: branches/safari-600.1-branch/Tools/ChangeLog (172986 => 172987)
--- branches/safari-600.1-branch/Tools/ChangeLog 2014-08-27 00:01:31 UTC (rev 172986)
+++ branches/safari-600.1-branch/Tools/ChangeLog 2014-08-27 00:03:21 UTC (rev 172987)
@@ -1,5 +1,22 @@
2014-08-26 Dana Burkart <dburk...@apple.com>
+ Merge r172982. <rdar://problem/18141695>
+
+ 2014-08-26 Brent Fulgham <bfulg...@apple.com>
+
+ [Win] Version stamp should include package-level version
+ https://bugs.webkit.org/show_bug.cgi?id=136266
+ <rdar://problem/18134138>
+
+ Reviewed by David Kilzer.
+
+ * Scripts/webkitperl/auto-version_unittest/autoVersionTests.pl: Add
+ tests for the full 3+ digit version.
+ * Scripts/webkitperl/auto-version_unittest/versionStampTests.pl:
+ Confirm that the final output DLL uses the 3+ digit version.
+
+2014-08-26 Dana Burkart <dburk...@apple.com>
+
Merge r172977. <rdar://problem/18141703>
2014-08-26 Brent Fulgham <bfulg...@apple.com>
Modified: branches/safari-600.1-branch/Tools/Scripts/webkitperl/auto-version_unittest/autoVersionTests.pl (172986 => 172987)
--- branches/safari-600.1-branch/Tools/Scripts/webkitperl/auto-version_unittest/autoVersionTests.pl 2014-08-27 00:01:31 UTC (rev 172986)
+++ branches/safari-600.1-branch/Tools/Scripts/webkitperl/auto-version_unittest/autoVersionTests.pl 2014-08-27 00:03:21 UTC (rev 172987)
@@ -45,6 +45,7 @@
'__BUILD_NUMBER_MAJOR__' => '300',
'__BUILD_NUMBER_MINOR__' => '4003',
'__BUILD_NUMBER_VARIANT__' => '2001',
+ '__FULL_BUILD_MAJOR_VERSION__' => '5300',
},
},
@@ -61,6 +62,7 @@
'__BUILD_NUMBER_MAJOR__' => '530',
'__BUILD_NUMBER_MINOR__' => '4003',
'__BUILD_NUMBER_VARIANT__' => '2001',
+ '__FULL_BUILD_MAJOR_VERSION__' => '530',
},
},
@@ -77,6 +79,7 @@
'__BUILD_NUMBER_MAJOR__' => '53',
'__BUILD_NUMBER_MINOR__' => '4003',
'__BUILD_NUMBER_VARIANT__' => '2001',
+ '__FULL_BUILD_MAJOR_VERSION__' => '53',
},
},
@@ -93,6 +96,7 @@
'__BUILD_NUMBER_MAJOR__' => '5',
'__BUILD_NUMBER_MINOR__' => '4003',
'__BUILD_NUMBER_VARIANT__' => '2001',
+ '__FULL_BUILD_MAJOR_VERSION__' => '5',
},
},
@@ -109,6 +113,7 @@
'__BUILD_NUMBER_MAJOR__' => '300',
'__BUILD_NUMBER_MINOR__' => '4003',
'__BUILD_NUMBER_VARIANT__' => '2000',
+ '__FULL_BUILD_MAJOR_VERSION__' => '5300',
},
},
@@ -125,6 +130,7 @@
'__BUILD_NUMBER_MAJOR__' => '530',
'__BUILD_NUMBER_MINOR__' => '4003',
'__BUILD_NUMBER_VARIANT__' => '2000',
+ '__FULL_BUILD_MAJOR_VERSION__' => '530',
},
},
@@ -141,6 +147,7 @@
'__BUILD_NUMBER_MAJOR__' => '53',
'__BUILD_NUMBER_MINOR__' => '4003',
'__BUILD_NUMBER_VARIANT__' => '2000',
+ '__FULL_BUILD_MAJOR_VERSION__' => '53',
},
},
@@ -157,6 +164,7 @@
'__BUILD_NUMBER_MAJOR__' => '5',
'__BUILD_NUMBER_MINOR__' => '4003',
'__BUILD_NUMBER_VARIANT__' => '2000',
+ '__FULL_BUILD_MAJOR_VERSION__' => '5',
},
},
@@ -173,6 +181,7 @@
'__BUILD_NUMBER_MAJOR__' => '300',
'__BUILD_NUMBER_MINOR__' => '4003',
'__BUILD_NUMBER_VARIANT__' => '0',
+ '__FULL_BUILD_MAJOR_VERSION__' => '5300',
},
},
@@ -189,6 +198,7 @@
'__BUILD_NUMBER_MAJOR__' => '530',
'__BUILD_NUMBER_MINOR__' => '4003',
'__BUILD_NUMBER_VARIANT__' => '0',
+ '__FULL_BUILD_MAJOR_VERSION__' => '530',
},
},
@@ -205,6 +215,7 @@
'__BUILD_NUMBER_MAJOR__' => '53',
'__BUILD_NUMBER_MINOR__' => '4003',
'__BUILD_NUMBER_VARIANT__' => '0',
+ '__FULL_BUILD_MAJOR_VERSION__' => '53',
},
},
@@ -221,6 +232,7 @@
'__BUILD_NUMBER_MAJOR__' => '5',
'__BUILD_NUMBER_MINOR__' => '4003',
'__BUILD_NUMBER_VARIANT__' => '0',
+ '__FULL_BUILD_MAJOR_VERSION__' => '5',
},
},
@@ -237,6 +249,7 @@
'__BUILD_NUMBER_MAJOR__' => '300',
'__BUILD_NUMBER_MINOR__' => '4000',
'__BUILD_NUMBER_VARIANT__' => '0',
+ '__FULL_BUILD_MAJOR_VERSION__' => '5300',
},
},
@@ -253,6 +266,7 @@
'__BUILD_NUMBER_MAJOR__' => '530',
'__BUILD_NUMBER_MINOR__' => '4000',
'__BUILD_NUMBER_VARIANT__' => '0',
+ '__FULL_BUILD_MAJOR_VERSION__' => '530',
},
},
@@ -269,6 +283,7 @@
'__BUILD_NUMBER_MAJOR__' => '53',
'__BUILD_NUMBER_MINOR__' => '4000',
'__BUILD_NUMBER_VARIANT__' => '0',
+ '__FULL_BUILD_MAJOR_VERSION__' => '53',
},
},
@@ -285,6 +300,7 @@
'__BUILD_NUMBER_MAJOR__' => '5',
'__BUILD_NUMBER_MINOR__' => '4000',
'__BUILD_NUMBER_VARIANT__' => '0',
+ '__FULL_BUILD_MAJOR_VERSION__' => '5',
},
},
@@ -301,6 +317,7 @@
'__BUILD_NUMBER_MAJOR__' => '300',
'__BUILD_NUMBER_MINOR__' => '0',
'__BUILD_NUMBER_VARIANT__' => '0',
+ '__FULL_BUILD_MAJOR_VERSION__' => '5300',
},
},
@@ -317,6 +334,7 @@
'__BUILD_NUMBER_MAJOR__' => '530',
'__BUILD_NUMBER_MINOR__' => '0',
'__BUILD_NUMBER_VARIANT__' => '0',
+ '__FULL_BUILD_MAJOR_VERSION__' => '530',
},
},
@@ -333,6 +351,7 @@
'__BUILD_NUMBER_MAJOR__' => '530',
'__BUILD_NUMBER_MINOR__' => '1001',
'__BUILD_NUMBER_VARIANT__' => '1000',
+ '__FULL_BUILD_MAJOR_VERSION__' => '10530',
},
},
@@ -349,6 +368,7 @@
'__BUILD_NUMBER_MAJOR__' => '530',
'__BUILD_NUMBER_MINOR__' => '30020',
'__BUILD_NUMBER_VARIANT__' => '10000',
+ '__FULL_BUILD_MAJOR_VERSION__' => '10530',
},
},
@@ -365,6 +385,7 @@
'__BUILD_NUMBER_MAJOR__' => '530',
'__BUILD_NUMBER_MINOR__' => '64200',
'__BUILD_NUMBER_VARIANT__' => '64000',
+ '__FULL_BUILD_MAJOR_VERSION__' => '10530',
},
},
@@ -381,6 +402,7 @@
'__BUILD_NUMBER_MAJOR__' => '530',
'__BUILD_NUMBER_MINOR__' => '64999',
'__BUILD_NUMBER_VARIANT__' => '64000',
+ '__FULL_BUILD_MAJOR_VERSION__' => '10530',
},
},
@@ -397,6 +419,7 @@
'__BUILD_NUMBER_MAJOR__' => '530',
'__BUILD_NUMBER_MINOR__' => '64099',
'__BUILD_NUMBER_VARIANT__' => '10000',
+ '__FULL_BUILD_MAJOR_VERSION__' => '7530',
},
},
@@ -414,6 +437,7 @@
'__BUILD_NUMBER_MAJOR__' => '53',
'__BUILD_NUMBER_MINOR__' => '0',
'__BUILD_NUMBER_VARIANT__' => '0',
+ '__FULL_BUILD_MAJOR_VERSION__' => '53',
},
},
@@ -431,6 +455,7 @@
'__BUILD_NUMBER_MAJOR__' => '5',
'__BUILD_NUMBER_MINOR__' => '0',
'__BUILD_NUMBER_VARIANT__' => '0',
+ '__FULL_BUILD_MAJOR_VERSION__' => '5',
},
},
@@ -448,6 +473,7 @@
'__BUILD_NUMBER_MAJOR__' => '747',
'__BUILD_NUMBER_MINOR__' => '64999',
'__BUILD_NUMBER_VARIANT__' => '64999',
+ '__FULL_BUILD_MAJOR_VERSION__' => '214747',
},
},
@@ -465,6 +491,7 @@
'__BUILD_NUMBER_MAJOR__' => '747',
'__BUILD_NUMBER_MINOR__' => '64099',
'__BUILD_NUMBER_VARIANT__' => '64099',
+ '__FULL_BUILD_MAJOR_VERSION__' => '214747',
},
},
@@ -482,6 +509,7 @@
'__BUILD_NUMBER_MAJOR__' => '747',
'__BUILD_NUMBER_MINOR__' => '64099',
'__BUILD_NUMBER_VARIANT__' => '64099',
+ '__FULL_BUILD_MAJOR_VERSION__' => '214747',
},
},
@@ -499,6 +527,7 @@
'__BUILD_NUMBER_MAJOR__' => '747',
'__BUILD_NUMBER_MINOR__' => '64099',
'__BUILD_NUMBER_VARIANT__' => '64099',
+ '__FULL_BUILD_MAJOR_VERSION__' => '214747',
},
},
@@ -518,6 +547,7 @@
'__BUILD_NUMBER_MAJOR__' => '600',
'__BUILD_NUMBER_MINOR__' => '1000',
'__BUILD_NUMBER_VARIANT__' => '0',
+ '__FULL_BUILD_MAJOR_VERSION__' => '7600',
},
},
@@ -535,6 +565,7 @@
'__BUILD_NUMBER_MAJOR__' => '27',
'__BUILD_NUMBER_MINOR__' => '0',
'__BUILD_NUMBER_VARIANT__' => '0',
+ '__FULL_BUILD_MAJOR_VERSION__' => '27',
},
},
@@ -552,6 +583,7 @@
'__BUILD_NUMBER_MAJOR__' => '27',
'__BUILD_NUMBER_MINOR__' => '0',
'__BUILD_NUMBER_VARIANT__' => '0',
+ '__FULL_BUILD_MAJOR_VERSION__' => '27',
},
},
@@ -569,6 +601,7 @@
'__BUILD_NUMBER_MAJOR__' => '27',
'__BUILD_NUMBER_MINOR__' => '0',
'__BUILD_NUMBER_VARIANT__' => '0',
+ '__FULL_BUILD_MAJOR_VERSION__' => '27',
},
},
@@ -586,6 +619,7 @@
'__BUILD_NUMBER_MAJOR__' => '300',
'__BUILD_NUMBER_MINOR__' => '4003',
'__BUILD_NUMBER_VARIANT__' => '2001',
+ '__FULL_BUILD_MAJOR_VERSION__' => '5300',
},
},
@@ -603,6 +637,7 @@
'__BUILD_NUMBER_MAJOR__' => '300',
'__BUILD_NUMBER_MINOR__' => '4003',
'__BUILD_NUMBER_VARIANT__' => '2001',
+ '__FULL_BUILD_MAJOR_VERSION__' => '5300',
},
},
@@ -620,6 +655,7 @@
'__BUILD_NUMBER_MAJOR__' => '300',
'__BUILD_NUMBER_MINOR__' => '4003',
'__BUILD_NUMBER_VARIANT__' => '2001',
+ '__FULL_BUILD_MAJOR_VERSION__' => '5300',
},
},
@@ -637,6 +673,7 @@
'__BUILD_NUMBER_MAJOR__' => '300',
'__BUILD_NUMBER_MINOR__' => '4003',
'__BUILD_NUMBER_VARIANT__' => '2001',
+ '__FULL_BUILD_MAJOR_VERSION__' => '5300',
},
},
);
@@ -648,7 +685,7 @@
exit 0;
}
-my $testCasesCount = scalar(@testCases) * 10; # 10 expected results
+my $testCasesCount = scalar(@testCases) * 11; # 11 expected results
plan(tests => $testCasesCount);
foreach my $testCase (@testCases) {
Modified: branches/safari-600.1-branch/Tools/Scripts/webkitperl/auto-version_unittest/versionStampTests.pl (172986 => 172987)
--- branches/safari-600.1-branch/Tools/Scripts/webkitperl/auto-version_unittest/versionStampTests.pl 2014-08-27 00:01:31 UTC (rev 172986)
+++ branches/safari-600.1-branch/Tools/Scripts/webkitperl/auto-version_unittest/versionStampTests.pl 2014-08-27 00:03:21 UTC (rev 172987)
@@ -35,15 +35,15 @@
{
'RC_ProjectSourceVersion' => '5300.4.3.2.1',
'RC_PROJECTBUILDVERSION' => undef,
- expectedVersionResult => '300.4003.2001',
- expectedBuildVersionResult => 1,
+ 'expectedVersionResult' => '5300.4003.2001',
+ 'expectedBuildVersionResult' => 1,
},
{
'RC_ProjectSourceVersion' => '5300.4.3.2.1',
'RC_PROJECTBUILDVERSION' => 156,
- expectedVersionResult => '300.4003.2001',
- expectedBuildVersionResult => 156,
+ 'expectedVersionResult' => '5300.4003.2001',
+ 'expectedBuildVersionResult' => 156,
},
);
Modified: branches/safari-600.1-branch/WebKitLibraries/ChangeLog (172986 => 172987)
--- branches/safari-600.1-branch/WebKitLibraries/ChangeLog 2014-08-27 00:01:31 UTC (rev 172986)
+++ branches/safari-600.1-branch/WebKitLibraries/ChangeLog 2014-08-27 00:03:21 UTC (rev 172987)
@@ -1,3 +1,21 @@
+2014-08-26 Dana Burkart <dburk...@apple.com>
+
+ Merge r172982. <rdar://problem/18141695>
+
+ 2014-08-26 Brent Fulgham <bfulg...@apple.com>
+
+ [Win] Version stamp should include package-level version
+ https://bugs.webkit.org/show_bug.cgi?id=136266
+ <rdar://problem/18134138>
+
+ Reviewed by David Kilzer.
+
+ * win/tools/scripts/auto-version.pl: Retain the full major build
+ version in addition to the three-digit value we use internally.
+ * win/tools/scripts/version-stamp.pl: Find and use the full 3+ digit
+ major build version when stamping the final output file.
+
+
2014-08-25 Lucas Forschler <lforsch...@apple.com>
Merge r172929
Modified: branches/safari-600.1-branch/WebKitLibraries/win/tools/scripts/auto-version.pl (172986 => 172987)
--- branches/safari-600.1-branch/WebKitLibraries/win/tools/scripts/auto-version.pl 2014-08-27 00:01:31 UTC (rev 172986)
+++ branches/safari-600.1-branch/WebKitLibraries/win/tools/scripts/auto-version.pl 2014-08-27 00:03:21 UTC (rev 172987)
@@ -66,7 +66,7 @@
my $PROPOSED_VERSION = $ENVIRONMENT_VERSION || $FALLBACK_VERSION;
chomp($PROPOSED_VERSION);
-my ($BUILD_MAJOR_VERSION, $BUILD_MINOR_VERSION, $BUILD_TINY_VERSION, $BUILD_VARIANT_VERSION, $ADJUSTED_PROPOSED_VERSION) = splitVersion($PROPOSED_VERSION);
+my ($BUILD_MAJOR_VERSION, $BUILD_MINOR_VERSION, $BUILD_TINY_VERSION, $BUILD_VARIANT_VERSION, $ADJUSTED_PROPOSED_VERSION, $FULL_BUILD_MAJOR_VERSION) = splitVersion($PROPOSED_VERSION);
my $TINY_VERSION = $BUILD_TINY_VERSION;
my $VERSION_TEXT = $ADJUSTED_PROPOSED_VERSION;
@@ -103,6 +103,7 @@
#define __BUILD_NUMBER_MINOR__ $BUILD_MINOR_VERSION
#define __BUILD_NUMBER_VARIANT__ $BUILD_TINY_VERSION
#define __SVN_REVISION__ $SVN_REVISION
+#define __FULL_BUILD_MAJOR_VERSION__ $FULL_BUILD_MAJOR_VERSION
EOF
if (defined $COPYRIGHT_END_YEAR) {
@@ -159,11 +160,12 @@
# extra leading digits, then adjust the major version portion of the
# version string to match.
my $originalLength = length($BUILD_MAJOR_VERSION);
+ my $FULL_BUILD_MAJOR_VERSION = $BUILD_MAJOR_VERSION;
$BUILD_MAJOR_VERSION =~ s/^.*(\d\d\d)$/$1/;
my $charactersToRemove = $originalLength - length($BUILD_MAJOR_VERSION);
$PROPOSED_VERSION = substr($PROPOSED_VERSION, $charactersToRemove);
- return ($BUILD_MAJOR_VERSION, packTwoValues($BUILD_MINOR_VERSION, $BUILD_TINY_VERSION), packTwoValues($BUILD_MICRO_VERSION, $BUILD_NANO_VERSION), $RETURN_NANO_VERSION, $PROPOSED_VERSION);
+ return ($BUILD_MAJOR_VERSION, packTwoValues($BUILD_MINOR_VERSION, $BUILD_TINY_VERSION), packTwoValues($BUILD_MICRO_VERSION, $BUILD_NANO_VERSION), $RETURN_NANO_VERSION, $PROPOSED_VERSION, $FULL_BUILD_MAJOR_VERSION);
}
Modified: branches/safari-600.1-branch/WebKitLibraries/win/tools/scripts/version-stamp.pl (172986 => 172987)
--- branches/safari-600.1-branch/WebKitLibraries/win/tools/scripts/version-stamp.pl 2014-08-27 00:01:31 UTC (rev 172986)
+++ branches/safari-600.1-branch/WebKitLibraries/win/tools/scripts/version-stamp.pl 2014-08-27 00:03:21 UTC (rev 172987)
@@ -63,6 +63,7 @@
'__VERSION_MINOR__' => undef,
'__VERSION_TINY__' => undef,
'__VERSION_BUILD__' => undef,
+ '__FULL_BUILD_MAJOR_VERSION__' => undef,
);
my $VERSION_FILE = File::Spec->catfile(File::Spec->canonpath($intdir), 'include', 'autoversion.h');
@@ -90,7 +91,7 @@
print "Adjusting RC_PROJECTSOURCEVERSION and RC_ProjectSourceVersion to be safe for VersionStamper.\n";
-my $SAFE_PROJECT_VERSION = "$components{'__VERSION_MAJOR__'}.$components{'__VERSION_MINOR__'}.$components{'__VERSION_TINY__'}";
+my $SAFE_PROJECT_VERSION = "$components{'__FULL_BUILD_MAJOR_VERSION__'}.$components{'__VERSION_MINOR__'}.$components{'__VERSION_TINY__'}";
my $SAFE_BUILD_VERSION = $ENV{RC_ProjectBuildVersion} || $ENV{RC_PROJECTBUILDVERSION} || $components{'__VERSION_BUILD__'};
print "Using RC_PROJECTSOURCEVERSION=$SAFE_PROJECT_VERSION and RC_PROJECTBUILDVERSION=$SAFE_BUILD_VERSION\n";
@@ -99,9 +100,9 @@
$ENV{RC_PROJECTSOURCEVERSION} = $SAFE_PROJECT_VERSION;
$ENV{RC_ProjectSourceVersion} = $SAFE_PROJECT_VERSION;
-my $rc = system($VERSION_STAMPER, '--verbose', $TARGET_PATH, '--fileMajor', $components{'__VERSION_MAJOR__'},
+my $rc = system($VERSION_STAMPER, '--verbose', $TARGET_PATH, '--fileMajor', $components{'__FULL_BUILD_MAJOR_VERSION__'},
'--fileMinor', $components{'__VERSION_MINOR__'}, '--fileRevision', $components{'__VERSION_TINY__'},
- '--fileBuild', $SAFE_BUILD_VERSION, '--productMajor', $components{'__VERSION_MAJOR__'},
+ '--fileBuild', $SAFE_BUILD_VERSION, '--productMajor', $components{'__FULL_BUILD_MAJOR_VERSION__'},
'--productMinor', $components{'__VERSION_MINOR__'}, '--productRevision', $components{'__VERSION_TINY__'},
'--productBuild', $components{'__VERSION_BUILD__'});
_______________________________________________ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
