bug 982403 - separate the compilation of certverifier and insanity::pkix r=cviecco r=briansmith
authorDavid Keeler <dkeeler@mozilla.com>
Wed, 12 Mar 2014 13:08:18 -0700
changeset 184224 599d7b0af8936efe00aee3f1292d0664fd9f97b3
parent 184223 ced81c0689269752def7f210fbe37f93b9973b16
child 184225 840df518d026f9f7b9bf896fb7ef8d0b3e9fb9da
push idunknown
push userunknown
push dateunknown
reviewerscviecco, briansmith
bugs982403
milestone30.0a1
bug 982403 - separate the compilation of certverifier and insanity::pkix r=cviecco r=briansmith
security/certverifier/moz.build
security/insanity/moz.build
security/manager/ssl/tests/unit/tlsserver/cmd/Makefile.in
--- a/security/certverifier/moz.build
+++ b/security/certverifier/moz.build
@@ -1,34 +1,29 @@
 # -*- 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 += [
-    '../insanity/lib/pkixbuild.cpp',
-    '../insanity/lib/pkixcheck.cpp',
-    '../insanity/lib/pkixder.cpp',
-    '../insanity/lib/pkixkey.cpp',
-    '../insanity/lib/pkixocsp.cpp',
     'CertVerifier.cpp',
     'NSSCertDBTrustDomain.cpp',
 ]
 
 if not CONFIG['NSS_NO_EV_CERTS']:
     UNIFIED_SOURCES += [
         'ExtendedValidation.cpp',
     ]
 
 LOCAL_INCLUDES += [
     '../insanity/include',
 ]
 
 DIRS += [
-    '../insanity/test/lib',
+    '../insanity',
 ]
 
 FAIL_ON_WARNINGS = True
 
 LIBRARY_NAME = 'certverifier'
 
 FINAL_LIBRARY = 'xul'
copy from security/certverifier/moz.build
copy to security/insanity/moz.build
--- a/security/certverifier/moz.build
+++ b/security/insanity/moz.build
@@ -1,34 +1,27 @@
 # -*- 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 += [
-    '../insanity/lib/pkixbuild.cpp',
-    '../insanity/lib/pkixcheck.cpp',
-    '../insanity/lib/pkixder.cpp',
-    '../insanity/lib/pkixkey.cpp',
-    '../insanity/lib/pkixocsp.cpp',
-    'CertVerifier.cpp',
-    'NSSCertDBTrustDomain.cpp',
+    'lib/pkixbuild.cpp',
+    'lib/pkixcheck.cpp',
+    'lib/pkixder.cpp',
+    'lib/pkixkey.cpp',
+    'lib/pkixocsp.cpp',
 ]
 
-if not CONFIG['NSS_NO_EV_CERTS']:
-    UNIFIED_SOURCES += [
-        'ExtendedValidation.cpp',
-    ]
-
 LOCAL_INCLUDES += [
-    '../insanity/include',
+    'include',
 ]
 
 DIRS += [
-    '../insanity/test/lib',
+    'test/lib',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBRARY_NAME = 'certverifier'
+LIBRARY_NAME = 'insanitypkix'
 
 FINAL_LIBRARY = 'xul'
--- a/security/manager/ssl/tests/unit/tlsserver/cmd/Makefile.in
+++ b/security/manager/ssl/tests/unit/tlsserver/cmd/Makefile.in
@@ -5,15 +5,14 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 include $(topsrcdir)/config/config.mk
 
 LIBS = \
   $(NSPR_LIBS) \
   $(NSS_LIBS) \
   $(MOZALLOC_LIB) \
-  ../../../../../../certverifier/$(LIB_PREFIX)certverifier.$(LIB_SUFFIX) \
+  ../../../../../../insanity/$(LIB_PREFIX)insanitypkix.$(LIB_SUFFIX) \
   ../../../../../../insanity/test/lib/$(LIB_PREFIX)pkixtestutil.$(LIB_SUFFIX) \
   ../lib/$(LIB_PREFIX)tlsserver.$(LIB_SUFFIX) \
   $(NULL)
 
 DEFINES += $(TK_CFLAGS)
-