From ed468964b8033ceefdac8edb4841dda5fb714850 Mon Sep 17 00:00:00 2001 From: Birunthan Mohanathas Date: Tue, 19 May 2015 10:47:42 -0700 Subject: [PATCH] Bug 1164714 - Flatten security/manager/pki/src/ directory. r=keeler --HG-- rename : security/manager/pki/src/nsASN1Tree.cpp => security/manager/pki/nsASN1Tree.cpp rename : security/manager/pki/src/nsASN1Tree.h => security/manager/pki/nsASN1Tree.h rename : security/manager/pki/src/nsNSSDialogHelper.cpp => security/manager/pki/nsNSSDialogHelper.cpp rename : security/manager/pki/src/nsNSSDialogHelper.h => security/manager/pki/nsNSSDialogHelper.h rename : security/manager/pki/src/nsNSSDialogs.cpp => security/manager/pki/nsNSSDialogs.cpp rename : security/manager/pki/src/nsNSSDialogs.h => security/manager/pki/nsNSSDialogs.h rename : security/manager/pki/src/nsPKIModule.cpp => security/manager/pki/nsPKIModule.cpp rename : security/manager/pki/src/nsPKIParamBlock.cpp => security/manager/pki/nsPKIParamBlock.cpp rename : security/manager/pki/src/nsPKIParamBlock.h => security/manager/pki/nsPKIParamBlock.h --- security/manager/pki/moz.build | 18 +++++++++++++++- security/manager/pki/{src => }/nsASN1Tree.cpp | 0 security/manager/pki/{src => }/nsASN1Tree.h | 0 .../pki/{src => }/nsNSSDialogHelper.cpp | 0 .../manager/pki/{src => }/nsNSSDialogHelper.h | 0 .../manager/pki/{src => }/nsNSSDialogs.cpp | 0 security/manager/pki/{src => }/nsNSSDialogs.h | 0 .../manager/pki/{src => }/nsPKIModule.cpp | 0 .../manager/pki/{src => }/nsPKIParamBlock.cpp | 0 .../manager/pki/{src => }/nsPKIParamBlock.h | 0 security/manager/pki/src/moz.build | 21 ------------------- 11 files changed, 17 insertions(+), 22 deletions(-) rename security/manager/pki/{src => }/nsASN1Tree.cpp (100%) rename security/manager/pki/{src => }/nsASN1Tree.h (100%) rename security/manager/pki/{src => }/nsNSSDialogHelper.cpp (100%) rename security/manager/pki/{src => }/nsNSSDialogHelper.h (100%) rename security/manager/pki/{src => }/nsNSSDialogs.cpp (100%) rename security/manager/pki/{src => }/nsNSSDialogs.h (100%) rename security/manager/pki/{src => }/nsPKIModule.cpp (100%) rename security/manager/pki/{src => }/nsPKIParamBlock.cpp (100%) rename security/manager/pki/{src => }/nsPKIParamBlock.h (100%) delete mode 100644 security/manager/pki/src/moz.build diff --git a/security/manager/pki/moz.build b/security/manager/pki/moz.build index ea81820671b8..ff1a5cccea1a 100644 --- a/security/manager/pki/moz.build +++ b/security/manager/pki/moz.build @@ -4,7 +4,7 @@ # 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 += ['resources', 'src'] +DIRS += ['resources'] XPIDL_SOURCES += [ 'nsIASN1Tree.idl', @@ -12,3 +12,19 @@ XPIDL_SOURCES += [ ] XPIDL_MODULE = 'pippki' + +UNIFIED_SOURCES += [ + 'nsASN1Tree.cpp', + 'nsNSSDialogHelper.cpp', + 'nsNSSDialogs.cpp', + 'nsPKIModule.cpp', + 'nsPKIParamBlock.cpp', +] + +GENERATED_INCLUDES += [ + '/dist/public/nss', +] + +FAIL_ON_WARNINGS = True + +FINAL_LIBRARY = 'xul' diff --git a/security/manager/pki/src/nsASN1Tree.cpp b/security/manager/pki/nsASN1Tree.cpp similarity index 100% rename from security/manager/pki/src/nsASN1Tree.cpp rename to security/manager/pki/nsASN1Tree.cpp diff --git a/security/manager/pki/src/nsASN1Tree.h b/security/manager/pki/nsASN1Tree.h similarity index 100% rename from security/manager/pki/src/nsASN1Tree.h rename to security/manager/pki/nsASN1Tree.h diff --git a/security/manager/pki/src/nsNSSDialogHelper.cpp b/security/manager/pki/nsNSSDialogHelper.cpp similarity index 100% rename from security/manager/pki/src/nsNSSDialogHelper.cpp rename to security/manager/pki/nsNSSDialogHelper.cpp diff --git a/security/manager/pki/src/nsNSSDialogHelper.h b/security/manager/pki/nsNSSDialogHelper.h similarity index 100% rename from security/manager/pki/src/nsNSSDialogHelper.h rename to security/manager/pki/nsNSSDialogHelper.h diff --git a/security/manager/pki/src/nsNSSDialogs.cpp b/security/manager/pki/nsNSSDialogs.cpp similarity index 100% rename from security/manager/pki/src/nsNSSDialogs.cpp rename to security/manager/pki/nsNSSDialogs.cpp diff --git a/security/manager/pki/src/nsNSSDialogs.h b/security/manager/pki/nsNSSDialogs.h similarity index 100% rename from security/manager/pki/src/nsNSSDialogs.h rename to security/manager/pki/nsNSSDialogs.h diff --git a/security/manager/pki/src/nsPKIModule.cpp b/security/manager/pki/nsPKIModule.cpp similarity index 100% rename from security/manager/pki/src/nsPKIModule.cpp rename to security/manager/pki/nsPKIModule.cpp diff --git a/security/manager/pki/src/nsPKIParamBlock.cpp b/security/manager/pki/nsPKIParamBlock.cpp similarity index 100% rename from security/manager/pki/src/nsPKIParamBlock.cpp rename to security/manager/pki/nsPKIParamBlock.cpp diff --git a/security/manager/pki/src/nsPKIParamBlock.h b/security/manager/pki/nsPKIParamBlock.h similarity index 100% rename from security/manager/pki/src/nsPKIParamBlock.h rename to security/manager/pki/nsPKIParamBlock.h diff --git a/security/manager/pki/src/moz.build b/security/manager/pki/src/moz.build deleted file mode 100644 index b0dc3c59b2d1..000000000000 --- a/security/manager/pki/src/moz.build +++ /dev/null @@ -1,21 +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/. - -UNIFIED_SOURCES += [ - 'nsASN1Tree.cpp', - 'nsNSSDialogHelper.cpp', - 'nsNSSDialogs.cpp', - 'nsPKIModule.cpp', - 'nsPKIParamBlock.cpp', -] - -GENERATED_INCLUDES += [ - '/dist/public/nss', -] - -FAIL_ON_WARNINGS = True - -FINAL_LIBRARY = 'xul'