Title: [213432] trunk/Source/ThirdParty/libwebrtc
Revision
213432
Author
m...@apple.com
Date
2017-03-04 23:41:25 -0800 (Sat, 04 Mar 2017)

Log Message

[Cocoa] libwebrtc.dylib’s current version is fixed at 1.0.0
https://bugs.webkit.org/show_bug.cgi?id=169170

Reviewed by Alex Christensen.

* Configurations/Version.xcconfig: Copied from Source/_javascript_Core/Configurations/Version.xcconfig.
  This defines DYLIB_CURRENT_VERSION.
* Configurations/libwebrtc.xcconfig: Include Version.xcconfig.

Modified Paths

Added Paths

Diff

Modified: trunk/Source/ThirdParty/libwebrtc/ChangeLog (213431 => 213432)


--- trunk/Source/ThirdParty/libwebrtc/ChangeLog	2017-03-05 01:06:10 UTC (rev 213431)
+++ trunk/Source/ThirdParty/libwebrtc/ChangeLog	2017-03-05 07:41:25 UTC (rev 213432)
@@ -1,3 +1,14 @@
+2017-03-04  Dan Bernstein  <m...@apple.com>
+
+        [Cocoa] libwebrtc.dylib’s current version is fixed at 1.0.0
+        https://bugs.webkit.org/show_bug.cgi?id=169170
+
+        Reviewed by Alex Christensen.
+
+        * Configurations/Version.xcconfig: Copied from Source/_javascript_Core/Configurations/Version.xcconfig.
+          This defines DYLIB_CURRENT_VERSION.
+        * Configurations/libwebrtc.xcconfig: Include Version.xcconfig.
+
 2017-03-04  Alex Christensen  <achristen...@webkit.org>
 
         Cleanup after r213418

Added: trunk/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig (0 => 213432)


--- trunk/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	                        (rev 0)
+++ trunk/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2017-03-05 07:41:25 UTC (rev 213432)
@@ -0,0 +1,60 @@
+// Copyright (C) 2009 Apple Inc. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// 1. Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// 2. 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.
+//
+// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``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 APPLE INC. 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. 
+
+MAJOR_VERSION = 604;
+MINOR_VERSION = 1;
+TINY_VERSION = 9;
+MICRO_VERSION = 0;
+NANO_VERSION = 0;
+FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);
+
+// The bundle version and short version string are set based on the current build configuration, see below.
+BUNDLE_VERSION = $(BUNDLE_VERSION_$(CONFIGURATION));
+SHORT_VERSION_STRING = $(SHORT_VERSION_STRING_$(CONFIGURATION))
+
+// The system version prefix is based on the current system version.
+SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;
+SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
+SYSTEM_VERSION_PREFIX_macosx_101000 = 10;
+SYSTEM_VERSION_PREFIX_macosx_101100 = 11;
+SYSTEM_VERSION_PREFIX_macosx_101200 = 12;
+SYSTEM_VERSION_PREFIX_macosx_101300 = 13;
+
+// The production build always uses the full version with a system version prefix.
+BUNDLE_VERSION_Production = $(SYSTEM_VERSION_PREFIX)$(FULL_VERSION);
+BUNDLE_VERSION_ = $(BUNDLE_VERSION_Production);
+
+// The production build always uses the major version with a system version prefix
+SHORT_VERSION_STRING_Production = $(SYSTEM_VERSION_PREFIX)$(MAJOR_VERSION);
+SHORT_VERSION_STRING_ = $(SHORT_VERSION_STRING_Production);
+
+// Local builds are the full version with a plus suffix.
+BUNDLE_VERSION_Release = $(FULL_VERSION)+;
+BUNDLE_VERSION_Debug = $(BUNDLE_VERSION_Release);
+
+// Local builds use the major version with a plus suffix
+SHORT_VERSION_STRING_Release = $(MAJOR_VERSION)+;
+SHORT_VERSION_STRING_Debug = $(SHORT_VERSION_STRING_Release);
+
+DYLIB_COMPATIBILITY_VERSION = 1;
+DYLIB_CURRENT_VERSION = $(FULL_VERSION);

Modified: trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig (213431 => 213432)


--- trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig	2017-03-05 01:06:10 UTC (rev 213431)
+++ trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig	2017-03-05 07:41:25 UTC (rev 213432)
@@ -1,3 +1,5 @@
+#include "Version.xcconfig"
+
 PRODUCT_NAME = libwebrtc;
 
 INSTALL_PATH = $(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Frameworks;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to