Bug 1164714 - Flatten security/manager/ssl/public/ directory. r=keeler
authorBirunthan Mohanathas <birunthan@mohanathas.com>
Tue, 26 May 2015 10:30:46 -0700
changeset 264019 92f57efec3059a8947bc1e9fc02dec6ab191e7dd
parent 264018 fb9275dab645dead337f919548a789c068741c5b
child 264020 ff4f7f2aabb147682823177dcfa80a12b0ecb759
push idunknown
push userunknown
push dateunknown
reviewerskeeler
bugs1164714
milestone41.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 1164714 - Flatten security/manager/ssl/public/ directory. r=keeler
security/manager/ssl/moz.build
security/manager/ssl/nsIASN1Object.idl
security/manager/ssl/nsIASN1PrintableItem.idl
security/manager/ssl/nsIASN1Sequence.idl
security/manager/ssl/nsIAssociatedContentSecurity.idl
security/manager/ssl/nsIBadCertListener2.idl
security/manager/ssl/nsICertOverrideService.idl
security/manager/ssl/nsICertPickDialogs.idl
security/manager/ssl/nsICertTree.idl
security/manager/ssl/nsICertificateDialogs.idl
security/manager/ssl/nsIClientAuthDialogs.idl
security/manager/ssl/nsIDataSignatureVerifier.idl
security/manager/ssl/nsIGenKeypairInfoDlg.idl
security/manager/ssl/nsIKeyModule.idl
security/manager/ssl/nsIKeygenThread.idl
security/manager/ssl/nsINSSVersion.idl
security/manager/ssl/nsIPK11Token.idl
security/manager/ssl/nsIPK11TokenDB.idl
security/manager/ssl/nsIPKCS11.idl
security/manager/ssl/nsIPKCS11Module.idl
security/manager/ssl/nsIPKCS11ModuleDB.idl
security/manager/ssl/nsIPKCS11Slot.idl
security/manager/ssl/nsIProtectedAuthThread.idl
security/manager/ssl/nsISSLStatus.idl
security/manager/ssl/nsITokenDialogs.idl
security/manager/ssl/nsITokenPasswordDialogs.idl
security/manager/ssl/nsIUserCertPicker.idl
security/manager/ssl/nsIX509Cert.idl
security/manager/ssl/nsIX509CertDB.idl
security/manager/ssl/nsIX509CertList.idl
security/manager/ssl/nsIX509CertValidity.idl
security/manager/ssl/public/moz.build
security/manager/ssl/public/nsIASN1Object.idl
security/manager/ssl/public/nsIASN1PrintableItem.idl
security/manager/ssl/public/nsIASN1Sequence.idl
security/manager/ssl/public/nsIAssociatedContentSecurity.idl
security/manager/ssl/public/nsIBadCertListener2.idl
security/manager/ssl/public/nsICertOverrideService.idl
security/manager/ssl/public/nsICertPickDialogs.idl
security/manager/ssl/public/nsICertTree.idl
security/manager/ssl/public/nsICertificateDialogs.idl
security/manager/ssl/public/nsIClientAuthDialogs.idl
security/manager/ssl/public/nsIDataSignatureVerifier.idl
security/manager/ssl/public/nsIGenKeypairInfoDlg.idl
security/manager/ssl/public/nsIKeyModule.idl
security/manager/ssl/public/nsIKeygenThread.idl
security/manager/ssl/public/nsINSSVersion.idl
security/manager/ssl/public/nsIPK11Token.idl
security/manager/ssl/public/nsIPK11TokenDB.idl
security/manager/ssl/public/nsIPKCS11.idl
security/manager/ssl/public/nsIPKCS11Module.idl
security/manager/ssl/public/nsIPKCS11ModuleDB.idl
security/manager/ssl/public/nsIPKCS11Slot.idl
security/manager/ssl/public/nsIProtectedAuthThread.idl
security/manager/ssl/public/nsISSLStatus.idl
security/manager/ssl/public/nsITokenDialogs.idl
security/manager/ssl/public/nsITokenPasswordDialogs.idl
security/manager/ssl/public/nsIUserCertPicker.idl
security/manager/ssl/public/nsIX509Cert.idl
security/manager/ssl/public/nsIX509CertDB.idl
security/manager/ssl/public/nsIX509CertList.idl
security/manager/ssl/public/nsIX509CertValidity.idl
--- a/security/manager/ssl/moz.build
+++ b/security/manager/ssl/moz.build
@@ -1,9 +1,48 @@
 # -*- 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/.
 
-DIRS += ['src', 'public']
+DIRS += ['src']
 
 TEST_DIRS += [ 'tests' ]
+
+XPIDL_SOURCES += [
+    'nsIASN1Object.idl',
+    'nsIASN1PrintableItem.idl',
+    'nsIASN1Sequence.idl',
+    'nsIAssociatedContentSecurity.idl',
+    'nsIBadCertListener2.idl',
+    'nsICertificateDialogs.idl',
+    'nsICertOverrideService.idl',
+    'nsICertPickDialogs.idl',
+    'nsIClientAuthDialogs.idl',
+    'nsIDataSignatureVerifier.idl',
+    'nsIGenKeypairInfoDlg.idl',
+    'nsIKeygenThread.idl',
+    'nsIKeyModule.idl',
+    'nsINSSVersion.idl',
+    'nsIPK11Token.idl',
+    'nsIPK11TokenDB.idl',
+    'nsIPKCS11.idl',
+    'nsIPKCS11Module.idl',
+    'nsIPKCS11ModuleDB.idl',
+    'nsIPKCS11Slot.idl',
+    'nsIProtectedAuthThread.idl',
+    'nsISSLStatus.idl',
+    'nsITokenDialogs.idl',
+    'nsITokenPasswordDialogs.idl',
+    'nsIUserCertPicker.idl',
+    'nsIX509Cert.idl',
+    'nsIX509CertDB.idl',
+    'nsIX509CertList.idl',
+    'nsIX509CertValidity.idl',
+]
+
+if CONFIG['MOZ_XUL']:
+    XPIDL_SOURCES += [
+        'nsICertTree.idl',
+    ]
+
+XPIDL_MODULE = 'pipnss'
rename from security/manager/ssl/public/nsIASN1Object.idl
rename to security/manager/ssl/nsIASN1Object.idl
rename from security/manager/ssl/public/nsIASN1PrintableItem.idl
rename to security/manager/ssl/nsIASN1PrintableItem.idl
rename from security/manager/ssl/public/nsIASN1Sequence.idl
rename to security/manager/ssl/nsIASN1Sequence.idl
rename from security/manager/ssl/public/nsIAssociatedContentSecurity.idl
rename to security/manager/ssl/nsIAssociatedContentSecurity.idl
rename from security/manager/ssl/public/nsIBadCertListener2.idl
rename to security/manager/ssl/nsIBadCertListener2.idl
rename from security/manager/ssl/public/nsICertOverrideService.idl
rename to security/manager/ssl/nsICertOverrideService.idl
rename from security/manager/ssl/public/nsICertPickDialogs.idl
rename to security/manager/ssl/nsICertPickDialogs.idl
rename from security/manager/ssl/public/nsICertTree.idl
rename to security/manager/ssl/nsICertTree.idl
rename from security/manager/ssl/public/nsICertificateDialogs.idl
rename to security/manager/ssl/nsICertificateDialogs.idl
rename from security/manager/ssl/public/nsIClientAuthDialogs.idl
rename to security/manager/ssl/nsIClientAuthDialogs.idl
rename from security/manager/ssl/public/nsIDataSignatureVerifier.idl
rename to security/manager/ssl/nsIDataSignatureVerifier.idl
rename from security/manager/ssl/public/nsIGenKeypairInfoDlg.idl
rename to security/manager/ssl/nsIGenKeypairInfoDlg.idl
rename from security/manager/ssl/public/nsIKeyModule.idl
rename to security/manager/ssl/nsIKeyModule.idl
rename from security/manager/ssl/public/nsIKeygenThread.idl
rename to security/manager/ssl/nsIKeygenThread.idl
rename from security/manager/ssl/public/nsINSSVersion.idl
rename to security/manager/ssl/nsINSSVersion.idl
rename from security/manager/ssl/public/nsIPK11Token.idl
rename to security/manager/ssl/nsIPK11Token.idl
rename from security/manager/ssl/public/nsIPK11TokenDB.idl
rename to security/manager/ssl/nsIPK11TokenDB.idl
rename from security/manager/ssl/public/nsIPKCS11.idl
rename to security/manager/ssl/nsIPKCS11.idl
rename from security/manager/ssl/public/nsIPKCS11Module.idl
rename to security/manager/ssl/nsIPKCS11Module.idl
rename from security/manager/ssl/public/nsIPKCS11ModuleDB.idl
rename to security/manager/ssl/nsIPKCS11ModuleDB.idl
rename from security/manager/ssl/public/nsIPKCS11Slot.idl
rename to security/manager/ssl/nsIPKCS11Slot.idl
rename from security/manager/ssl/public/nsIProtectedAuthThread.idl
rename to security/manager/ssl/nsIProtectedAuthThread.idl
rename from security/manager/ssl/public/nsISSLStatus.idl
rename to security/manager/ssl/nsISSLStatus.idl
rename from security/manager/ssl/public/nsITokenDialogs.idl
rename to security/manager/ssl/nsITokenDialogs.idl
rename from security/manager/ssl/public/nsITokenPasswordDialogs.idl
rename to security/manager/ssl/nsITokenPasswordDialogs.idl
rename from security/manager/ssl/public/nsIUserCertPicker.idl
rename to security/manager/ssl/nsIUserCertPicker.idl
rename from security/manager/ssl/public/nsIX509Cert.idl
rename to security/manager/ssl/nsIX509Cert.idl
rename from security/manager/ssl/public/nsIX509CertDB.idl
rename to security/manager/ssl/nsIX509CertDB.idl
rename from security/manager/ssl/public/nsIX509CertList.idl
rename to security/manager/ssl/nsIX509CertList.idl
rename from security/manager/ssl/public/nsIX509CertValidity.idl
rename to security/manager/ssl/nsIX509CertValidity.idl
deleted file mode 100644
--- a/security/manager/ssl/public/moz.build
+++ /dev/null
@@ -1,45 +0,0 @@
-# -*- 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/.
-
-XPIDL_SOURCES += [
-    'nsIASN1Object.idl',
-    'nsIASN1PrintableItem.idl',
-    'nsIASN1Sequence.idl',
-    'nsIAssociatedContentSecurity.idl',
-    'nsIBadCertListener2.idl',
-    'nsICertificateDialogs.idl',
-    'nsICertOverrideService.idl',
-    'nsICertPickDialogs.idl',
-    'nsIClientAuthDialogs.idl',
-    'nsIDataSignatureVerifier.idl',
-    'nsIGenKeypairInfoDlg.idl',
-    'nsIKeygenThread.idl',
-    'nsIKeyModule.idl',
-    'nsINSSVersion.idl',
-    'nsIPK11Token.idl',
-    'nsIPK11TokenDB.idl',
-    'nsIPKCS11.idl',
-    'nsIPKCS11Module.idl',
-    'nsIPKCS11ModuleDB.idl',
-    'nsIPKCS11Slot.idl',
-    'nsIProtectedAuthThread.idl',
-    'nsISSLStatus.idl',
-    'nsITokenDialogs.idl',
-    'nsITokenPasswordDialogs.idl',
-    'nsIUserCertPicker.idl',
-    'nsIX509Cert.idl',
-    'nsIX509CertDB.idl',
-    'nsIX509CertList.idl',
-    'nsIX509CertValidity.idl',
-]
-
-if CONFIG['MOZ_XUL']:
-    XPIDL_SOURCES += [
-        'nsICertTree.idl',
-    ]
-
-XPIDL_MODULE = 'pipnss'
-