Bug 1022970: Switch from UNIFIED_SOURCES back to SOURCES in security/pkix, security/certverifier, and security/manager/ssl/src, r=keeler
authorBrian Smith <brian@briansmith.org>
Mon, 16 Jun 2014 22:57:55 -0700
changeset 210331 e74c19c18f01a5340e00ecfbc44c774c9a71d11d
parent 210330 bd1a3bb1b916fb44bb17339c6305fea4f02a6d35
child 210332 90b8387626634b30c2603e75d3783931e6ffd7ae
push id3857
push userraliiev@mozilla.com
push dateTue, 02 Sep 2014 16:39:23 +0000
treeherdermozilla-beta@5638b907b505 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskeeler
bugs1022970
milestone33.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1022970: Switch from UNIFIED_SOURCES back to SOURCES in security/pkix, security/certverifier, and security/manager/ssl/src, r=keeler
security/certverifier/OCSPCache.h
security/certverifier/moz.build
security/manager/ssl/src/moz.build
security/pkix/moz.build
security/pkix/test/lib/moz.build
--- a/security/certverifier/OCSPCache.h
+++ b/security/certverifier/OCSPCache.h
@@ -26,16 +26,17 @@
 #define mozilla_psm_OCSPCache_h
 
 #include "certt.h"
 #include "hasht.h"
 #include "pkix/pkixtypes.h"
 #include "mozilla/Mutex.h"
 #include "mozilla/Vector.h"
 #include "prerror.h"
+#include "seccomon.h"
 
 namespace mozilla { namespace psm {
 
 // make SHA384Buffer be of type "array of uint8_t of length SHA384_LENGTH"
 typedef uint8_t SHA384Buffer[SHA384_LENGTH];
 
 // OCSPCache can store and retrieve OCSP response verification results. Each
 // result is keyed on the certificate that purportedly corresponds to it (where
--- a/security/certverifier/moz.build
+++ b/security/certverifier/moz.build
@@ -1,23 +1,23 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'CertVerifier.cpp',
     'NSSCertDBTrustDomain.cpp',
     'OCSPCache.cpp',
     'OCSPRequestor.cpp',
 ]
 
 if not CONFIG['NSS_NO_EV_CERTS']:
-    UNIFIED_SOURCES += [
+    SOURCES += [
         'ExtendedValidation.cpp',
     ]
 
 LOCAL_INCLUDES += [
     '../manager/boot/src',
     '../manager/ssl/src',
     '../pkix/include',
 ]
@@ -25,16 +25,18 @@ LOCAL_INCLUDES += [
 DIRS += [
     '../pkix',
 ]
 
 CXXFLAGS += ['-Wall']
 if CONFIG['_MSC_VER']:
   # -Wall with Visual C++ enables too many problematic warnings
   CXXFLAGS += [
+    '-wd4480', # nonstandard extension used: specifying underlying type for
+               # enum 'enum'
     '-wd4510', # default constructor could not be generated
     '-wd4512', # assignment operator could not be generated
     '-wd4514', # 'function': unreferenced inline function has been removed
     '-wd4610', # struct 'symbol' can never be instantiated - user defined
                # constructor required
     '-wd4619', # pragma warning: there is no warning 'warning'
     '-wd4625', # copy constructor could not be generated because a base
                # class copy constructor is inaccessible or deleted
--- a/security/manager/ssl/src/moz.build
+++ b/security/manager/ssl/src/moz.build
@@ -12,17 +12,17 @@ EXPORTS += [
     'NSSErrorsService.h',
     'ScopedNSSTypes.h',
 ]
 
 EXPORTS.mozilla += [
     'PublicSSL.h',
 ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'CryptoTask.cpp',
     'nsCertificatePrincipal.cpp',
     'nsCertOverrideService.cpp',
     'nsCertPicker.cpp',
     'nsCertVerificationThread.cpp',
     'nsClientAuthRemember.cpp',
     'nsCMS.cpp',
     'nsCMSSecureMessage.cpp',
@@ -72,26 +72,26 @@ SOURCES += [
     'nsCryptoHash.cpp',
     'nsNSSCertificateDB.cpp',
     'nsNSSComponent.cpp',
     'nsNSSVersion.cpp',
     'PSMContentListener.cpp',
 ]
 
 if not CONFIG['MOZ_DISABLE_CRYPTOLEGACY']:
-    UNIFIED_SOURCES += [
+    SOURCES += [
         'nsSmartCardMonitor.cpp',
     ]
 
 if CONFIG['MOZ_XUL']:
-    UNIFIED_SOURCES += [
+    SOURCES += [
         'nsCertTree.cpp',
     ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'md4.c',
 ]
 
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
--- a/security/pkix/moz.build
+++ b/security/pkix/moz.build
@@ -1,15 +1,15 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'lib/pkixbind.cpp',
     'lib/pkixbuild.cpp',
     'lib/pkixcheck.cpp',
     'lib/pkixder.cpp',
     'lib/pkixkey.cpp',
     'lib/pkixocsp.cpp',
 ]
 
--- a/security/pkix/test/lib/moz.build
+++ b/security/pkix/test/lib/moz.build
@@ -15,17 +15,17 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'pkixtestutil.cpp',
 ]
 
 LIBRARY_NAME = 'pkixtestutil'
 
 LOCAL_INCLUDES += [
     '../../include',
     '../../lib',